feat(settings): make close-to-tray the default and remove the option

src/main/handlers/app.ts

@@ -5,7 +5,6 @@ import { EVENTS } from '../../shared/events';
 
 import { Paths } from '../config';
 import { handleMainEvent, onMainEvent } from '../events';
-import { setKeepRunningInTray } from '../lifecycle/window';
 
 /**
  * Register IPC handlers for general application queries and window/app control.
@@ -21,10 +20,6 @@ export function registerAppHandlers(mb: Menubar): void {
 
   onMainEvent(EVENTS.QUIT, () => mb.app.quit());
 
-  onMainEvent(EVENTS.UPDATE_KEEP_RUNNING_IN_TRAY, (_, value: boolean) => {
-    setKeepRunningInTray(value);
-  });
-
   // Path handlers for renderer queries about resource locations
   handleMainEvent(EVENTS.NOTIFICATION_SOUND_PATH, () => {
     return Paths.notificationSound;

src/main/lifecycle/window.test.ts

@@ -3,7 +3,6 @@ import type { Menubar } from 'menubar';
 import {
   __resetWindowLifecycleForTests,
   configureWindowEvents,
-  setKeepRunningInTray,
 } from './window';
 
 const appOnMock = vi.fn();
@@ -57,7 +56,6 @@ describe('main/lifecycle/window.ts', () => {
     appOnMock.mockClear();
     appQuitMock.mockClear();
     __resetWindowLifecycleForTests();
-    setKeepRunningInTray(false);
     setPlatform('linux');
 
     menubar = {
@@ -128,9 +126,8 @@ describe('main/lifecycle/window.ts', () => {
   });
 
   describe('window close handler', () => {
-    it('hides the window and restores menubar reference when keepRunningInTray is enabled', async () => {
+    it('hides the window and restores menubar reference on a WM close', async () => {
       configureWindowEvents(menubar);
-      setKeepRunningInTray(true);
 
       const closeHandler = findWindowHandler(menubar, 'close');
       const event = { preventDefault: vi.fn() };
@@ -153,7 +150,6 @@ describe('main/lifecycle/window.ts', () => {
 
     it('skips the deferred hide when the captured window is destroyed', async () => {
       configureWindowEvents(menubar);
-      setKeepRunningInTray(true);
 
       const captured = menubar.window;
       const closeHandler = findWindowHandler(menubar, 'close');
@@ -166,23 +162,9 @@ describe('main/lifecycle/window.ts', () => {
       expect(captured?.hide).not.toHaveBeenCalled();
     });
 
-    it('lets the window close normally when keepRunningInTray is disabled', async () => {
+    it('lets the window close during quit', async () => {
       configureWindowEvents(menubar);
 
-      const closeHandler = findWindowHandler(menubar, 'close');
-      const event = { preventDefault: vi.fn() };
-      closeHandler?.(event);
-
-      await flushDeferred();
-
-      expect(event.preventDefault).not.toHaveBeenCalled();
-      expect(menubar.window?.hide).not.toHaveBeenCalled();
-    });
-
-    it('lets the window close during quit even when keepRunningInTray is enabled', async () => {
-      configureWindowEvents(menubar);
-      setKeepRunningInTray(true);
-
       findAppHandler('before-quit')?.();
 
       const closeHandler = findWindowHandler(menubar, 'close');
@@ -197,37 +179,28 @@ describe('main/lifecycle/window.ts', () => {
   });
 
   describe('window-all-closed handler', () => {
-    it('keeps the app alive when keepRunningInTray is enabled', () => {
+    it('keeps the app alive when not quitting', () => {
       configureWindowEvents(menubar);
-      setKeepRunningInTray(true);
 
       findAppHandler('window-all-closed')?.();
 
       expect(appQuitMock).not.toHaveBeenCalled();
     });
 
-    it('quits when keepRunningInTray is disabled (linux)', () => {
-      configureWindowEvents(menubar);
-
-      findAppHandler('window-all-closed')?.();
-
-      expect(appQuitMock).toHaveBeenCalled();
-    });
-
-    it('quits when the user is quitting even if keepRunningInTray is enabled', () => {
+    it('quits on linux when the user is quitting', () => {
       configureWindowEvents(menubar);
-      setKeepRunningInTray(true);
 
       findAppHandler('before-quit')?.();
       findAppHandler('window-all-closed')?.();
 
       expect(appQuitMock).toHaveBeenCalled();
     });
 
-    it('does not quit on macOS when keepRunningInTray is disabled', () => {
+    it('does not quit on macOS', () => {
       setPlatform('darwin');
       configureWindowEvents(menubar);
 
+      findAppHandler('before-quit')?.();
       findAppHandler('window-all-closed')?.();
 
       expect(appQuitMock).not.toHaveBeenCalled();

src/main/lifecycle/window.ts

@@ -6,19 +6,8 @@ import { isMacOS } from '../../shared/platform';
 
 import { WindowConfig } from '../config';
 
-let keepRunningInTray = false;
 let isQuitting = false;
 
-/**
- * Update the "keep running in tray" preference. When `true`, an OS / window
- * manager close request hides the window instead of quitting the app.
- *
- * @param value - `true` to hide on window close, `false` to quit.
- */
-export function setKeepRunningInTray(value: boolean): void {
-  keepRunningInTray = value;
-}
-
 /**
  * Reset module-level lifecycle flags. Module-level state is unavoidable
  * because `app.on(...)` listeners are registered once at startup; this
@@ -27,7 +16,6 @@ export function setKeepRunningInTray(value: boolean): void {
  * @internal
  */
 export function __resetWindowLifecycleForTests(): void {
-  keepRunningInTray = false;
   isQuitting = false;
 }
 
@@ -94,7 +82,7 @@ export function configureWindowEvents(mb: Menubar): void {
    *      first.
    */
   win.on('close', (event) => {
-    if (!keepRunningInTray || isQuitting) {
+    if (isQuitting) {
       return;
     }
 
@@ -117,7 +105,7 @@ export function configureWindowEvents(mb: Menubar): void {
    * the next tray click.
    */
   app.on('window-all-closed', () => {
-    if (keepRunningInTray && !isQuitting) {
+    if (!isQuitting) {
       return;
     }
     if (!isMacOS()) {

src/preload/index.ts

@@ -55,15 +55,6 @@ export const api = {
       openAsHidden: value,
     }),
 
-  /**
-   * Enable or disable hiding the application window to the tray when the
-   * window receives a close request (e.g. from the OS / window manager).
-   *
-   * @param value - `true` to hide on close, `false` to quit on close.
-   */
-  setKeepRunningInTray: (value: boolean) =>
-    sendMainEvent(EVENTS.UPDATE_KEEP_RUNNING_IN_TRAY, value),
-
   /**
    * Apply the global keyboard shortcut for toggling the app window visibility.
    *

src/renderer/__helpers__/vitest.setup.ts

@@ -60,7 +60,6 @@ window.gitify = {
   onAuthCallback: vi.fn(),
   onResetApp: vi.fn(),
   setAutoLaunch: vi.fn(),
-  setKeepRunningInTray: vi.fn(),
   applyKeyboardShortcut: vi.fn().mockResolvedValue({ success: true }),
   raiseNativeNotification: vi.fn(),
 };

src/renderer/__mocks__/state-mocks.ts

@@ -65,7 +65,6 @@ const mockSystemSettings: SystemSettingsState = {
   playSound: true,
   notificationVolume: 20 as Percentage,
   openAtStartup: false,
-  keepRunningInTray: false,
 };
 
 export const mockSettings: SettingsState = {

src/renderer/components/settings/SystemSettings.tsx

@@ -372,28 +372,6 @@ export const SystemSettings: FC = () => {
           }
           visible={!window.gitify.platform.isLinux()}
         />
-
-        <Checkbox
-          checked={settings.keepRunningInTray}
-          label="Close to tray"
-          name="keepRunningInTray"
-          onChange={() =>
-            updateSetting('keepRunningInTray', !settings.keepRunningInTray)
-          }
-          tooltip={
-            <Stack direction="vertical" gap="condensed">
-              <Text>
-                Hide {APPLICATION.NAME} to the system tray when the window is
-                closed by the operating system or window manager, instead of
-                quitting the application.
-              </Text>
-              <Text>
-                Use the tray menu or the Quit shortcut to fully exit{' '}
-                {APPLICATION.NAME}.
-              </Text>
-            </Stack>
-          }
-        />
       </Stack>
     </fieldset>
   );

src/renderer/context/App.tsx

@@ -58,7 +58,6 @@ import {
   decryptValue,
   encryptValue,
   setAutoLaunch,
-  setKeepRunningInTray,
   setUseAlternateIdleIcon,
   setUseUnreadActiveIcon,
 } from '../utils/system/comms';
@@ -401,10 +400,6 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     setAutoLaunch(settings.openAtStartup);
   }, [settings.openAtStartup]);
 
-  useEffect(() => {
-    setKeepRunningInTray(settings.keepRunningInTray);
-  }, [settings.keepRunningInTray]);
-
   useEffect(() => {
     window.gitify.onResetApp(() => {
       clearState();

src/renderer/context/defaults.ts

@@ -56,7 +56,6 @@ const defaultSystemSettings: SystemSettingsState = {
   playSound: true,
   notificationVolume: 20 as Percentage,
   openAtStartup: false,
-  keepRunningInTray: false,
 };
 
 export const defaultSettings: SettingsState = {

src/renderer/types.ts

@@ -146,7 +146,6 @@ export interface SystemSettingsState {
   playSound: boolean;
   notificationVolume: Percentage;
   openAtStartup: boolean;
-  keepRunningInTray: boolean;
 }
 
 export interface AuthState {

src/renderer/utils/system/comms.ts

@@ -93,16 +93,6 @@ export function setAutoLaunch(value: boolean): void {
   window.gitify.setAutoLaunch(value);
 }
 
-/**
- * Enable or disable hiding the application window to the tray when the
- * window receives a close request (e.g. from the OS / window manager).
- *
- * @param value - `true` to hide on close, `false` to quit on close.
- */
-export function setKeepRunningInTray(value: boolean): void {
-  window.gitify.setKeepRunningInTray(value);
-}
-
 /**
  * Switch the tray icon to an alternate idle icon variant.
  *