Remove unreadRoomId from summarized notification state

src/components/views/rooms/RoomList.tsx

@@ -68,7 +68,7 @@ interface IState {
     suggestedRooms: ISuggestedRoom[];
 }
 
-const TAG_ORDER: TagID[] = [
+export const TAG_ORDER: TagID[] = [
     DefaultTagID.Invite,
     DefaultTagID.Favourite,
     DefaultTagID.DM,

src/stores/SpaceStore.tsx

@@ -38,6 +38,7 @@ import { arrayHasDiff } from "../utils/arrays";
 import { objectDiff } from "../utils/objects";
 import { arrayHasOrderChange } from "../utils/arrays";
 import { reorderLexicographically } from "../utils/stringOrderField";
+import { TAG_ORDER } from "../components/views/rooms/RoomList";
 
 type SpaceKey = string | symbol;
 
@@ -128,16 +129,33 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         if (space && !space.isSpaceRoom()) return;
         if (space !== this.activeSpace) await this.setActiveSpace(space);
 
-        const notificationState = space
+        if (space) {
-            ? this.getNotificationState(space.roomId)
+            const notificationState = this.getNotificationState(space.roomId)
-            : RoomNotificationStateStore.instance.globalState;
-
-        if (notificationState.count) {
             const roomId = notificationState.getFirstRoomWithNotifications();
             defaultDispatcher.dispatch({
-                    action: "view_room",
+                action: "view_room",
-                    room_id: roomId,
+                room_id: roomId,
-                    context_switch: true,
+                context_switch: true,
+            });
+        } else {
+            const lists = RoomListStore.instance.unfilteredLists;
+            TAG_ORDER.every(t => {
+                const listRooms = lists[t];
+                const unreadRoom = listRooms.find((r: Room)=> {
+                    if (this.showInHomeSpace(r)) {
+                        const state = RoomNotificationStateStore.instance.getRoomState(r);
+                        return state.isUnread;
+                    }
+                });
+                if (unreadRoom) {
+                    defaultDispatcher.dispatch({
+                        action: "view_room",
+                        room_id: unreadRoom.roomId,
+                        context_switch: true,
+                    });
+                    return false;
+                }
+                return true;
             });
         }
     }

src/stores/notifications/SpaceNotificationState.ts

@@ -54,7 +54,7 @@ export class SpaceNotificationState extends NotificationState {
     }
 
     public getFirstRoomWithNotifications() {
-        return this.rooms.find((room) => room._notificationCounts.total > 0).roomId;
+        return this.rooms.find((room) => room.getUnreadNotificationCount() > 0).roomId;
     }
 
     public destroy() {

src/stores/notifications/SummarizedNotificationState.ts

@@ -32,7 +32,6 @@ export class SummarizedNotificationState extends NotificationState {
         super();
         this._symbol = null;
         this._count = 0;
-        this.unreadRoomId = null;
         this._color = NotificationColor.None;
     }
 
@@ -40,10 +39,6 @@ export class SummarizedNotificationState extends NotificationState {
         return this.totalStatesWithUnread;
     }
 
-    public getFirstRoomWithNotifications() {
-        return this.unreadRoomId;
-    }
-
     /**
      * Append a notification state to this snapshot, taking the loudest NotificationColor
      * of the two. By default this will not adopt the symbol of the other notification
@@ -63,7 +58,6 @@ export class SummarizedNotificationState extends NotificationState {
             this._color = other.color;
         }
         if (other.hasUnreadCount) {
-            this.unreadRoomId = !this.unreadRoomId ? other.room.roomId : this.unreadRoomId;
             this.totalStatesWithUnread++;
         }
     }