From ef8d5b76a21bbe6287a7e374c66f2a31842c7dfb Mon Sep 17 00:00:00 2001
From: Bojan Mojsilovic <bmojsilovic@itekako.com>
Date: Tue, 19 Dec 2023 12:01:37 +0100
Subject: [PATCH] Fix notification sidebar stats

---
 src/pages/Notifications.tsx | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pages/Notifications.tsx b/src/pages/Notifications.tsx
index 6f1f80c..ab2fb5a 100644
--- a/src/pages/Notifications.tsx
+++ b/src/pages/Notifications.tsx
@@ -2,7 +2,7 @@ import { useIntl } from '@cookbook/solid-intl';
 import { useSearchParams } from '@solidjs/router';
 import { nip19 } from 'nostr-tools';
 import { Component, createEffect, createMemo, createSignal, For, onCleanup, onMount, Show } from 'solid-js';
-import { createStore } from 'solid-js/store';
+import { createStore, reconcile } from 'solid-js/store';
 import { APP_ID } from '../App';
 import Loader from '../components/Loader/Loader';
 import NotificationItem from '../components/Notifications/NotificationItem';
@@ -242,6 +242,7 @@ const Notifications: Component = () => {
     const since = queryParams.ignoreLastSeen ? 0 : notifSince;
 
     newNotifs = {};
+    setSortedNotifications(reconcile({}));
     getNotifications(account?.publicKey, pk as string, subid, group, since);
 
   };
@@ -255,7 +256,7 @@ const Notifications: Component = () => {
     const notifGroup = notificationGroup();
 
     setTimeout(() => {
-      fetchNewNotifications(pk as string, notificationGroup());
+      fetchNewNotifications(pk as string, notifGroup);
     }, 10)
   });
 
@@ -1057,9 +1058,14 @@ const Notifications: Component = () => {
 
     notifications?.actions.resetNotificationCounter();
     setLastSeen(`notif_sls_${APP_ID}`, timeNow());
-    notificationGroup() !== 'all' && resetNotifContent();
-    setNotificationGroup('all');
-    fetchNewNotifications(publicKey() as string, notificationGroup());
+
+    if (notificationGroup() !== 'all') {
+      resetNotifContent();
+      setNotificationGroup('all');
+    }
+    else {
+      fetchNewNotifications(publicKey() as string, notificationGroup());
+    }
   }
 
   return (