Fill viewRoomOpts in viewRoom

src/components/structures/RoomView.tsx

@@ -1409,8 +1409,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             tombstone: this.getRoomTombstone(room),
             liveTimeline: room.getLiveTimeline(),
         });
-
-        dis.dispatch<ActionPayload>({ action: Action.RoomLoaded });
     };
 
     private onRoomTimelineReset = (room?: Room): void => {
@@ -1672,6 +1670,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             this.state.initialEventId === eventId
         ) {
             debuglog("Removing scroll_into_view flag from initial event");
+            debugger;
             dis.dispatch<ViewRoomPayload>({
                 action: Action.ViewRoom,
                 room_id: this.getRoomId(),

src/dispatcher/actions.ts

@@ -372,11 +372,6 @@ export enum Action {
      */
     OpenSpotlight = "open_spotlight",
 
-    /**
-     * Fired when the room loaded.
-     */
-    RoomLoaded = "room_loaded",
-
     /**
      * Opens right panel with 3pid invite information
      */

src/stores/RoomViewStore.tsx

@@ -375,10 +375,6 @@ export class RoomViewStore extends EventEmitter {
                 this.cancelAskToJoin(payload as CancelAskToJoinPayload);
                 break;
             }
-            case Action.RoomLoaded: {
-                this.setViewRoomOpts();
-                break;
-            }
         }
     }
 
@@ -443,6 +439,9 @@ export class RoomViewStore extends EventEmitter {
                 return;
             }
 
+            const viewRoomOpts: ViewRoomOpts = { buttons: [] };
+            ModuleRunner.instance.invoke(RoomViewLifecycle.ViewRoom, viewRoomOpts, this.getRoomId());
+
             const newState: Partial<State> = {
                 roomId: payload.room_id,
                 roomAlias: payload.room_alias ?? null,
@@ -464,6 +463,7 @@ export class RoomViewStore extends EventEmitter {
                     (payload.room_id === this.state.roomId
                         ? this.state.viewingCall
                         : CallStore.instance.getActiveCall(payload.room_id) !== null),
+                viewRoomOpts,
             };
 
             // Allow being given an event to be replied to when switching rooms but sanity check its for this room
@@ -823,15 +823,4 @@ export class RoomViewStore extends EventEmitter {
     public getViewRoomOpts(): ViewRoomOpts {
         return this.state.viewRoomOpts;
     }
-
-    /**
-     * Invokes the view room lifecycle to set the view room options.
-     *
-     * @returns {void}
-     */
-    private setViewRoomOpts(): void {
-        const viewRoomOpts: ViewRoomOpts = { buttons: [] };
-        ModuleRunner.instance.invoke(RoomViewLifecycle.ViewRoom, viewRoomOpts, this.getRoomId());
-        this.setState({ viewRoomOpts });
-    }
 }

test/components/structures/RoomView-test.tsx

@@ -585,10 +585,4 @@ describe("RoomView", () => {
             expect(dis.dispatch).toHaveBeenCalledWith({ action: "cancel_ask_to_join", roomId: room.roomId });
         });
     });
-
-    it("fires Action.RoomLoaded", async () => {
-        jest.spyOn(dis, "dispatch");
-        await mountRoomView();
-        expect(dis.dispatch).toHaveBeenCalledWith({ action: Action.RoomLoaded });
-    });
 });

test/stores/RoomViewStore-test.ts

@@ -134,11 +134,6 @@ describe("RoomViewStore", function () {
         await untilDispatch(Action.CancelAskToJoin, dis);
     };
 
-    const dispatchRoomLoaded = async () => {
-        dis.dispatch({ action: Action.RoomLoaded });
-        await untilDispatch(Action.RoomLoaded, dis);
-    };
-
     let roomViewStore: RoomViewStore;
     let slidingSyncManager: SlidingSyncManager;
     let dis: MatrixDispatcher;
@@ -598,7 +593,10 @@ describe("RoomViewStore", function () {
                     opts.buttons = buttons;
                 }
             });
-            await dispatchRoomLoaded();
+
+            dis.dispatch({ action: Action.ViewRoom, room_id: roomId });
+            await untilDispatch(Action.ViewRoom, dis);
+
             expect(roomViewStore.getViewRoomOpts()).toEqual({ buttons });
         });
     });