fix: remove account notifications on logout (#1457)

Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
gitify-app · Aug 12, 2024 · e7b843b · e7b843b
1 parent 30cb5f5
commit e7b843b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
@@ -86,7 +86,7 @@ export const Sidebar: FC = () => {
 
         <SidebarButton
           title={`${notificationsCount} Unread Notifications`}
-          metric={notificationsCount}
+          metric={isLoggedIn ? notificationsCount : null}
           icon={BellIcon}
           onClick={() => openGitHubNotifications(primaryAccountHostname)}
         />

diff --git a/src/components/__snapshots__/Sidebar.test.tsx.snap b/src/components/__snapshots__/Sidebar.test.tsx.snap
diff --git a/src/context/App.tsx b/src/context/App.tsx
@@ -101,6 +101,7 @@ interface AppContextState {
   notifications: AccountNotifications[];
   status: Status;
   globalError: GitifyError;
+  removeAccountNotifications: (account: Account) => Promise<void>;
   fetchNotifications: () => Promise<void>;
   markNotificationRead: (notification: Notification) => Promise<void>;
   markNotificationDone: (notification: Notification) => Promise<void>;
@@ -120,6 +121,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   const [auth, setAuth] = useState<AuthState>(defaultAuth);
   const [settings, setSettings] = useState<SettingsState>(defaultSettings);
   const {
+    removeAccountNotifications,
     fetchNotifications,
     notifications,
     globalError,
@@ -130,7 +132,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     markRepoNotificationsRead,
     markRepoNotificationsDone,
   } = useNotifications();
-
+  getNotificationCount;
   useEffect(() => {
     restoreSettings();
   }, []);
@@ -239,6 +241,10 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   const logoutFromAccount = useCallback(
     async (account: Account) => {
+      // Remove notifications for account
+      removeAccountNotifications(account);
+
+      // Remove from auth state
       const updatedAuth = removeAccount(auth, account);
       setAuth(updatedAuth);
       saveState({ auth: updatedAuth, settings });

diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
@@ -1,6 +1,7 @@
 import log from 'electron-log';
 import { useCallback, useState } from 'react';
 import type {
+  Account,
   AccountNotifications,
   GitifyError,
   GitifyState,
@@ -25,6 +26,7 @@ import { removeNotifications } from '../utils/remove-notifications';
 
 interface NotificationsState {
   notifications: AccountNotifications[];
+  removeAccountNotifications: (account: Account) => Promise<void>;
   fetchNotifications: (state: GitifyState) => Promise<void>;
   markNotificationRead: (
     state: GitifyState,
@@ -58,6 +60,21 @@ export const useNotifications = (): NotificationsState => {
     [],
   );
 
+  const removeAccountNotifications = useCallback(
+    async (account: Account) => {
+      setStatus('loading');
+
+      const updatedNotifications = notifications.filter(
+        (notification) => notification.account !== account,
+      );
+
+      setNotifications(updatedNotifications);
+      setTrayIconColor(updatedNotifications);
+      setStatus('success');
+    },
+    [notifications],
+  );
+
   const fetchNotifications = useCallback(
     async (state: GitifyState) => {
       setStatus('loading');
@@ -258,6 +275,7 @@ export const useNotifications = (): NotificationsState => {
     globalError,
     notifications,
 
+    removeAccountNotifications,
     fetchNotifications,
     markNotificationRead,
     markNotificationDone,