Fix default thread notification of the new RoomHeader (#12194)

matrix-org · Jan 31, 2024 · a3a387a · a3a387a
1 parent a5f9df5
commit a3a387a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/hooks/room/useRoomThreadNotifications.ts b/src/hooks/room/useRoomThreadNotifications.ts
@@ -44,9 +44,12 @@ export const useRoomThreadNotifications = (room: Room): NotificationLevel => {
             // If the current thread has unread messages, we're done.
             if (doesRoomOrThreadHaveUnreadMessages(thread)) {
                 setNotificationLevel(NotificationLevel.Activity);
-                break;
+                return;
             }
         }
+
+        // default case
+        setNotificationLevel(NotificationLevel.None);
     }, [room]);
 
     useEventEmitter(room, RoomEvent.UnreadNotifications, updateNotification);

diff --git a/test/hooks/room/useRoomThreadNotifications-test.tsx b/test/hooks/room/useRoomThreadNotifications-test.tsx
@@ -44,6 +44,13 @@ describe("useRoomThreadNotifications", () => {
         expect(result.current).toBe(NotificationLevel.None);
     });
 
+    it("returns none if the thread hasn't a notification anymore", async () => {
+        room.setThreadUnreadNotificationCount("flooble", NotificationCountType.Highlight, 0);
+        const { result } = render(room);
+
+        expect(result.current).toBe(NotificationLevel.None);
+    });
+
     it("returns red if a thread in the room has a highlight notification", async () => {
         room.setThreadUnreadNotificationCount("flooble", NotificationCountType.Highlight, 1);
         const { result } = render(room);
@@ -58,7 +65,7 @@ describe("useRoomThreadNotifications", () => {
         expect(result.current).toBe(NotificationLevel.Notification);
     });
 
-    it("returns bold if a thread in the room unread messages", async () => {
+    it("returns activity if a thread in the room unread messages", async () => {
         await populateThread({
             room,
             client: cli,