fix: updates notifications store only after closing the dropdown

bloomwalletio · May 23, 2024 · 418ccde · 418ccde
1 parent b245987
commit 418ccde
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/packages/desktop/views/dashboard/components/NotificationsButton.svelte b/packages/desktop/views/dashboard/components/NotificationsButton.svelte
@@ -85,6 +85,8 @@
     function onVisibilityChange({ detail }: CustomEvent): void {
         if (detail.visible) {
             toggleObserve()
+        } else {
+            notificationsManager.updateAllSubscriptionsAndNotifications()
         }
     }
 </script>

diff --git a/...ared/src/lib/auxiliary/wallet-connect/notifications/classes/notificationsManager.class.ts b/...ared/src/lib/auxiliary/wallet-connect/notifications/classes/notificationsManager.class.ts
@@ -257,16 +257,18 @@ export class NotificationsManager {
     }
 
     markAsRead(notificationIds: string[], topic: string): void {
-        this.notifyClient?.markNotificationsAsRead({ notificationIds, topic })
-        this.notificationsPerSubscription.update((state) => {
-            state[topic] = state[topic].map((notification) => {
-                if (notificationIds.includes(notification.id)) {
-                    notification.isRead = true
-                }
-                return notification
-            })
-            return state
-        })
+        void this.notifyClient?.markNotificationsAsRead({ notificationIds, topic })
+    }
+
+    async updateAllSubscriptionsAndNotifications(): Promise<void> {
+        if (!this.notifyClient) {
+            return
+        }
+
+        const activeSubscriptions = Object.values(this.notifyClient.getActiveSubscriptions())
+        this.updateSubscriptionsPerAddress(activeSubscriptions)
+
+        await this.updateNotificationsForSubscriptions(activeSubscriptions)
     }
 }