nostr/primal-web-app
1
0
Fork 0
mirror of https://github.com/PrimalHQ/primal-web-app.git synced 2024-09-29 08:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix notification sidebar stats

Browse Source
This commit is contained in:
Bojan Mojsilovic 2023-12-19 12:01:37 +01:00
parent f961112066
commit ef8d5b76a2
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pages/Notifications.tsx
View File

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