Simplify

Author: ldm0

cardinal/src/App.tsx

@@ -71,7 +71,6 @@ function App() {
   const {
     isShortcutSettingsOpen,
     shortcuts,
-    defaultShortcuts,
     openShortcutSettings,
     closeShortcutSettings,
     handleShortcutSettingsSave,
@@ -433,7 +432,6 @@ function App() {
         open={isShortcutSettingsOpen}
         onClose={closeShortcutSettings}
         shortcuts={shortcuts}
-        defaultShortcuts={defaultShortcuts}
         onShortcutSettingsSave={handleShortcutSettingsSave}
       />
       {showFullDiskAccessOverlay && (

cardinal/src/components/ShortcutSettingsOverlay.tsx

@@ -1,6 +1,11 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { SHORTCUT_DEFINITIONS, type ShortcutId, type ShortcutMap } from '../shortcuts';
+import {
+  DEFAULT_SHORTCUTS,
+  SHORTCUT_DEFINITIONS,
+  type ShortcutId,
+  type ShortcutMap,
+} from '../shortcuts';
 import {
   captureShortcutFromKeydown,
   formatShortcutForDisplay,
@@ -11,7 +16,6 @@ type ShortcutSettingsOverlayProps = {
   open: boolean;
   onClose: () => void;
   shortcuts: ShortcutMap;
-  defaultShortcuts: ShortcutMap;
   onShortcutSettingsSave: (shortcuts: ShortcutMap) => Promise<void>;
 };
 
@@ -25,7 +29,6 @@ export function ShortcutSettingsOverlay({
   open,
   onClose,
   shortcuts,
-  defaultShortcuts,
   onShortcutSettingsSave,
 }: ShortcutSettingsOverlayProps): React.JSX.Element | null {
   const { t } = useTranslation();
@@ -101,7 +104,7 @@ export function ShortcutSettingsOverlay({
     setCaptureError(null);
     setSubmitError(null);
     setRecordingShortcutId(null);
-    setDraftShortcuts(defaultShortcuts);
+    setDraftShortcuts(DEFAULT_SHORTCUTS);
   };
 
   const handleCaptureButtonClick = useCallback((shortcutId: ShortcutId): void => {

cardinal/src/components/__tests__/ShortcutSettingsOverlay.test.tsx

@@ -17,7 +17,6 @@ describe('ShortcutSettingsOverlay', () => {
         open
         onClose={vi.fn()}
         shortcuts={DEFAULT_SHORTCUTS}
-        defaultShortcuts={DEFAULT_SHORTCUTS}
         onShortcutSettingsSave={onShortcutSettingsSave}
       />,
     );
@@ -44,7 +43,6 @@ describe('ShortcutSettingsOverlay', () => {
         open
         onClose={vi.fn()}
         shortcuts={DEFAULT_SHORTCUTS}
-        defaultShortcuts={DEFAULT_SHORTCUTS}
         onShortcutSettingsSave={vi.fn().mockResolvedValue(undefined)}
       />,
     );

cardinal/src/hooks/useShortcutSettingsController.ts

@@ -1,18 +1,12 @@
 import { useCallback, useEffect, useState } from 'react';
 import { refreshAppMenu, setMenuShortcutsEnabled } from '../menu';
-import {
-  DEFAULT_SHORTCUTS,
-  getStoredShortcuts,
-  persistShortcuts,
-  type ShortcutMap,
-} from '../shortcuts';
+import { getStoredShortcuts, persistShortcuts, type ShortcutMap } from '../shortcuts';
 import { refreshTrayMenu } from '../tray';
 import { setGlobalShortcutsPaused, updateQuickLaunchShortcut } from '../utils/globalShortcuts';
 
 type UseShortcutSettingsControllerResult = {
   isShortcutSettingsOpen: boolean;
   shortcuts: ShortcutMap;
-  defaultShortcuts: ShortcutMap;
   openShortcutSettings: () => void;
   closeShortcutSettings: () => void;
   handleShortcutSettingsSave: (nextShortcuts: ShortcutMap) => Promise<void>;
@@ -51,7 +45,6 @@ export function useShortcutSettingsController(): UseShortcutSettingsControllerRe
   return {
     isShortcutSettingsOpen,
     shortcuts,
-    defaultShortcuts: DEFAULT_SHORTCUTS,
     openShortcutSettings,
     closeShortcutSettings,
     handleShortcutSettingsSave,

cardinal/src/shortcuts.ts

@@ -72,15 +72,17 @@ export const getStoredShortcuts = (): ShortcutMap => {
   }
 };
 
-export const getStoredShortcutAccelerators = () => {
-  const { quickLaunch, openPreferences, hideWindow } = getStoredShortcuts();
+export const getShortcutAccelerators = (shortcuts: ShortcutMap) => {
+  const { quickLaunch, openPreferences, hideWindow } = shortcuts;
   return {
     quickLaunch,
     openPreferences: toMenuAccelerator(openPreferences),
     hideWindow: toMenuAccelerator(hideWindow),
   };
 };
 
+export const getStoredShortcutAccelerators = () => getShortcutAccelerators(getStoredShortcuts());
+
 export const persistShortcuts = (shortcuts: ShortcutMap): void => {
   if (typeof window === 'undefined') {
     return;

cardinal/src/utils/globalShortcuts.ts

@@ -16,13 +16,6 @@ const registerQuickLaunchShortcut = async (shortcut: string): Promise<void> => {
   registeredQuickLaunchShortcut = shortcut;
 };
 
-const saveQuickLaunchShortcut = (shortcut: string): void => {
-  persistShortcuts({
-    ...getStoredShortcuts(),
-    quickLaunch: shortcut,
-  });
-};
-
 export async function initializeGlobalShortcuts(): Promise<void> {
   const preferredShortcut = getStoredShortcuts().quickLaunch;
 
@@ -33,7 +26,10 @@ export async function initializeGlobalShortcuts(): Promise<void> {
     if (preferredShortcut !== DEFAULT_QUICK_LAUNCH_SHORTCUT) {
       try {
         await registerQuickLaunchShortcut(DEFAULT_QUICK_LAUNCH_SHORTCUT);
-        saveQuickLaunchShortcut(DEFAULT_QUICK_LAUNCH_SHORTCUT);
+        persistShortcuts({
+          ...getStoredShortcuts(),
+          quickLaunch: DEFAULT_QUICK_LAUNCH_SHORTCUT,
+        });
       } catch (fallbackError) {
         console.error('Failed to register fallback global shortcut', fallbackError);
       }
@@ -54,7 +50,6 @@ export async function updateQuickLaunchShortcut(shortcut: string): Promise<void>
 
   if (globalShortcutsPaused) {
     registeredQuickLaunchShortcut = nextShortcut;
-    saveQuickLaunchShortcut(nextShortcut);
     return;
   }
 
@@ -64,7 +59,6 @@ export async function updateQuickLaunchShortcut(shortcut: string): Promise<void>
 
   try {
     await registerQuickLaunchShortcut(nextShortcut);
-    saveQuickLaunchShortcut(nextShortcut);
   } catch (error) {
     if (previousShortcut) {
       try {