fix: unread active toggle

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

Author: setchy

src/main/index.ts

@@ -75,7 +75,7 @@ app.setAsDefaultProtocolClient(protocol);
 const appUpdater = new AppUpdater(mb, menuBuilder);
 
 let shouldUseAlternateIdleIcon = false;
-let shouldUseUnreadActiveIcon = false;
+let shouldUseUnreadActiveIcon = true;
 
 app.whenReady().then(async () => {
   await onFirstRunMaybe();
@@ -166,7 +166,9 @@ app.whenReady().then(async () => {
     (_, useUnreadActiveIcon: boolean) => {
       shouldUseUnreadActiveIcon = useUnreadActiveIcon;
 
-      if (!shouldUseUnreadActiveIcon) {
+      if (shouldUseUnreadActiveIcon) {
+        setActiveIcon();
+      } else {
         setIdleIcon();
       }
     },
@@ -180,11 +182,6 @@ app.whenReady().then(async () => {
 
   onMainEvent(EVENTS.ICON_ACTIVE, () => {
     if (!mb.tray.isDestroyed() && shouldUseUnreadActiveIcon) {
-      mb.tray.setImage(
-        menuBuilder.isUpdateAvailable()
-          ? TrayIcons.activeWithUpdate
-          : TrayIcons.active,
-      );
     }
   });
 
@@ -259,6 +256,14 @@ const handleURL = (url: string) => {
   }
 };
 
+function setActiveIcon() {
+  mb.tray.setImage(
+    menuBuilder.isUpdateAvailable()
+      ? TrayIcons.activeWithUpdate
+      : TrayIcons.active,
+  );
+}
+
 function setIdleIcon() {
   if (shouldUseAlternateIdleIcon) {
     mb.tray.setImage(

src/renderer/context/App.tsx

@@ -45,7 +45,6 @@ import {
   setKeyboardShortcut,
   setUseAlternateIdleIcon,
   setUseUnreadActiveIcon,
-  updateTrayIcon,
   updateTrayTitle,
 } from '../utils/comms';
 import { getNotificationCount } from '../utils/notifications/notifications';
@@ -69,11 +68,13 @@ interface AppContextState {
   ) => Promise<void>;
   logoutFromAccount: (account: Account) => Promise<void>;
 
-  notifications: AccountNotifications[];
   status: Status;
   globalError: GitifyError;
-  removeAccountNotifications: (account: Account) => Promise<void>;
+
+  notifications: AccountNotifications[];
   fetchNotifications: () => Promise<void>;
+  removeAccountNotifications: (account: Account) => Promise<void>;
+
   markNotificationsAsRead: (notifications: Notification[]) => Promise<void>;
   markNotificationsAsDone: (notifications: Notification[]) => Promise<void>;
   unsubscribeNotification: (notification: Notification) => Promise<void>;
@@ -106,6 +107,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     unsubscribeNotification,
   } = useNotifications();
 
+  // biome-ignore lint/correctness/useExhaustiveDependencies: restoreSettings is stable and should run only once
   useEffect(() => {
     restoreSettings();
   }, []);
@@ -164,13 +166,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
     setUseUnreadActiveIcon(settings.useUnreadActiveIcon);
 
-    updateTrayIcon(count);
+    updateTrayTitle(count.toString());
   }, [settings.useUnreadActiveIcon, notifications]);
 
-  useEffect(() => {
-    setAutoLaunch(settings.openAtStartup);
-  }, [settings.openAtStartup]);
-
   useEffect(() => {
     setUseAlternateIdleIcon(settings.useAlternateIdleIcon);
   }, [settings.useAlternateIdleIcon]);
@@ -179,6 +177,10 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     setKeyboardShortcut(settings.keyboardShortcut);
   }, [settings.keyboardShortcut]);
 
+  useEffect(() => {
+    setAutoLaunch(settings.openAtStartup);
+  }, [settings.openAtStartup]);
+
   useEffect(() => {
     window.gitify.onResetApp(() => {
       clearState();
@@ -277,9 +279,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
     // Restore settings before accounts to ensure filters are available before fetching notifications
     if (existing.settings) {
-      setKeyboardShortcut(existing.settings.keyboardShortcut);
       setUseUnreadActiveIcon(existing.settings.useUnreadActiveIcon);
       setUseAlternateIdleIcon(existing.settings.useAlternateIdleIcon);
+      setKeyboardShortcut(existing.settings.keyboardShortcut);
       setSettings({ ...defaultSettings, ...existing.settings });
       window.gitify.zoom.setLevel(
         zoomPercentageToLevel(existing.settings.zoomPercentage),