From 945dab6b1fee1f2e94f0dff70bd1f0afb5c61d0a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 14 Jul 2020 12:49:29 -0600
Subject: [PATCH] Revert "Turn previews on for DMs and ensure they get
 rendered"

This reverts commit b19ae3ac93465400c6ea04114b240126d3775426.
---
 src/components/views/rooms/RoomTile2.tsx |  7 -------
 src/stores/room-list/ListLayout.ts       | 12 +++---------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/components/views/rooms/RoomTile2.tsx b/src/components/views/rooms/RoomTile2.tsx
index 6a76e6788e..fe6a19f2ed 100644
--- a/src/components/views/rooms/RoomTile2.tsx
+++ b/src/components/views/rooms/RoomTile2.tsx
@@ -54,7 +54,6 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
 import {ActionPayload} from "../../../dispatcher/payloads";
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
 import { NotificationState } from "../../../stores/notifications/NotificationState";
-import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 
 // TODO: Rename on launch: https://github.com/vector-im/riot-web/issues/14367
 
@@ -129,7 +128,6 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         };
 
         ActiveRoomObserver.addListener(this.props.room.roomId, this.onActiveRoomUpdate);
-        MessagePreviewStore.instance.on(UPDATE_EVENT, this.onPreviewUpdated);
         this.dispatcherRef = defaultDispatcher.register(this.onAction);
     }
 
@@ -152,14 +150,9 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
         if (this.props.room) {
             ActiveRoomObserver.removeListener(this.props.room.roomId, this.onActiveRoomUpdate);
         }
-        MessagePreviewStore.instance.off(UPDATE_EVENT, this.onPreviewUpdated);
         defaultDispatcher.unregister(this.dispatcherRef);
     }
 
-    private onPreviewUpdated = () => {
-        this.forceUpdate(); // we don't track the preview in state, so just re-render
-    };
-
     private onAction = (payload: ActionPayload) => {
         if (payload.action === "view_room" && payload.room_id === this.props.room.roomId && payload.show_room_tile) {
             setImmediate(() => {
diff --git a/src/stores/room-list/ListLayout.ts b/src/stores/room-list/ListLayout.ts
index 2bbf7f471c..caf2e92bd1 100644
--- a/src/stores/room-list/ListLayout.ts
+++ b/src/stores/room-list/ListLayout.ts
@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { DefaultTagID, TagID } from "./models";
-import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
+import { TagID } from "./models";
 
 const TILE_HEIGHT_PX = 44;
 
@@ -27,7 +26,7 @@ interface ISerializedListLayout {
 
 export class ListLayout {
     private _n = 0;
-    private _previews: boolean | null = null;
+    private _previews = false;
     private _collapsed = false;
 
     constructor(public readonly tagId: TagID) {
@@ -51,12 +50,7 @@ export class ListLayout {
     }
 
     public get showPreviews(): boolean {
-        if (!isNullOrUndefined(this._previews)) {
-            return this._previews;
-        }
-
-        // Turn it on for DMs by default, but not for other rooms
-        return this.tagId === DefaultTagID.DM;
+        return this._previews;
     }
 
     public set showPreviews(v: boolean) {