refactor simplify

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/context/App.tsx

@@ -173,7 +173,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   useEffect(() => {
     setUseUnreadActiveIcon(settings.useUnreadActiveIcon);
     setUseAlternateIdleIcon(settings.useAlternateIdleIcon);
-    setTrayIconColorAndTitle(notifications, settings);
+    setTrayIconColorAndTitle(unreadCount, settings);
   }, [
     settings.showNotificationsCountInTray,
     settings.useUnreadActiveIcon,

src/renderer/routes/Accounts.tsx

@@ -34,7 +34,6 @@ import {
   getAccountUUID,
   refreshAccount,
 } from '../utils/auth/utils';
-import { updateTrayColor, updateTrayTitle } from '../utils/comms';
 import { getAuthMethodIcon, getPlatformIcon } from '../utils/icons';
 import {
   openAccountProfile,
@@ -57,8 +56,6 @@ export const AccountsRoute: FC = () => {
     (account: Account) => {
       logoutFromAccount(account);
       navigate(-1);
-      updateTrayColor();
-      updateTrayTitle();
     },
     [logoutFromAccount],
   );

src/renderer/utils/comms.test.ts

@@ -147,23 +147,11 @@ describe('renderer/utils/comms.ts', () => {
       expect(window.gitify.tray.updateColor).toHaveBeenCalledWith(5);
     });
 
-    it('updates tray icon color with default count', () => {
-      updateTrayColor();
-
-      expect(window.gitify.tray.updateColor).toHaveBeenCalledTimes(1);
-    });
-
     it('updates tray title with provided value', () => {
       updateTrayTitle('gitify');
 
       expect(window.gitify.tray.updateTitle).toHaveBeenCalledTimes(1);
       expect(window.gitify.tray.updateTitle).toHaveBeenCalledWith('gitify');
     });
-
-    it('updates tray title with default value', () => {
-      updateTrayTitle();
-
-      expect(window.gitify.tray.updateTitle).toHaveBeenCalledTimes(1);
-    });
   });
 });

src/renderer/utils/comms.ts

@@ -57,10 +57,21 @@ export function setKeyboardShortcut(keyboardShortcut: boolean): void {
   window.gitify.setKeyboardShortcut(keyboardShortcut);
 }
 
-export function updateTrayColor(notificationsLength = 0): void {
+/**
+ * Updates the tray icon color based on the number of unread notifications.
+ *
+ * Passing a negative number will set the error state color.
+ *
+ * @param notificationsLength The number of unread notifications
+ */
+export function updateTrayColor(notificationsLength: number): void {
   window.gitify.tray.updateColor(notificationsLength);
 }
-
-export function updateTrayTitle(title = ''): void {
+/**
+ * Updates the tray icon title.
+ *
+ * @param title The title to set on the tray icon
+ */
+export function updateTrayTitle(title: string): void {
   window.gitify.tray.updateTitle(title);
 }

src/renderer/utils/notifications/tray.test.ts

@@ -0,0 +1,56 @@
+import { mockSettings } from '../../__mocks__/state-mocks';
+import * as comms from '../comms';
+import { setTrayIconColorAndTitle } from './tray';
+
+describe('renderer/utils/notifications/tray.ts', () => {
+  const updateTrayColorSpy = jest.spyOn(comms, 'updateTrayColor');
+  const updateTrayTitleSpy = jest.spyOn(comms, 'updateTrayTitle');
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('setTrayIconColorAndTitle', () => {
+    it('should update tray color and title when showNotificationsCountInTray is true and has unread notifications', () => {
+      const settings = {
+        ...mockSettings,
+        showNotificationsCountInTray: true,
+      };
+
+      setTrayIconColorAndTitle(5, settings);
+
+      expect(updateTrayColorSpy).toHaveBeenCalledTimes(1);
+      expect(updateTrayColorSpy).toHaveBeenCalledWith(5);
+      expect(updateTrayTitleSpy).toHaveBeenCalledTimes(1);
+      expect(updateTrayTitleSpy).toHaveBeenCalledWith('5');
+    });
+
+    it('should update tray color and empty title when showNotificationsCountInTray is false and has unread notifications', () => {
+      const settings = {
+        ...mockSettings,
+        showNotificationsCountInTray: false,
+      };
+
+      setTrayIconColorAndTitle(5, settings);
+
+      expect(updateTrayColorSpy).toHaveBeenCalledTimes(1);
+      expect(updateTrayColorSpy).toHaveBeenCalledWith(5);
+      expect(updateTrayTitleSpy).toHaveBeenCalledTimes(1);
+      expect(updateTrayTitleSpy).toHaveBeenCalledWith('');
+    });
+
+    it('should update tray with empty title when no unread notifications', () => {
+      const settings = {
+        ...mockSettings,
+        showNotificationsCountInTray: true,
+      };
+
+      setTrayIconColorAndTitle(0, settings);
+
+      expect(updateTrayColorSpy).toHaveBeenCalledTimes(1);
+      expect(updateTrayColorSpy).toHaveBeenCalledWith(0);
+      expect(updateTrayTitleSpy).toHaveBeenCalledTimes(1);
+      expect(updateTrayTitleSpy).toHaveBeenCalledWith('');
+    });
+  });
+});

src/renderer/utils/notifications/tray.ts

@@ -1,24 +1,21 @@
-import type { AccountNotifications, SettingsState } from '../../types';
+import type { SettingsState } from '../../types';
 import { updateTrayColor, updateTrayTitle } from '../comms';
-import { getUnreadNotificationCount } from './notifications';
 
 /**
  * Sets the tray icon color and title based on the number of unread notifications.
  *
- * @param notifications
- * @param settings
+ * @param unreadNotifications - The number of unread notifications
+ * @param settings - The application settings
  */
 export function setTrayIconColorAndTitle(
-  notifications: AccountNotifications[],
+  unreadNotifications: number,
   settings: SettingsState,
 ) {
-  const totalUnreadNotifications = getUnreadNotificationCount(notifications);
-
   let title = '';
-  if (settings.showNotificationsCountInTray && totalUnreadNotifications > 0) {
-    title = totalUnreadNotifications.toString();
+  if (settings.showNotificationsCountInTray && unreadNotifications > 0) {
+    title = unreadNotifications.toString();
   }
 
-  updateTrayColor(totalUnreadNotifications);
+  updateTrayColor(unreadNotifications);
   updateTrayTitle(title);
 }