Merge branch 'staging'

1 files changed, 40 insertions, 40 deletions

diff --git a/apps/web/src/hooks/use-keybinding-conflicts.ts b/apps/web/src/hooks/use-keybinding-conflicts.ts
index 0720982e..cc5dd340 100644
--- a/apps/web/src/hooks/use-keybinding-conflicts.ts
+++ b/apps/web/src/hooks/use-keybinding-conflicts.ts
@@ -5,55 +5,55 @@ import { useKeybindingsStore } from "@/stores/keybindings-store";
 import { ActionWithOptionalArgs } from "@/constants/actions";
 
 export interface KeybindingConflictInfo {
-	key: string;
-	actions: ActionWithOptionalArgs[];
-	isConflict: boolean;
+  key: string;
+  actions: ActionWithOptionalArgs[];
+  isConflict: boolean;
 }
 
 export const useKeybindingConflicts = () => {
-	const { keybindings } = useKeybindingsStore();
+  const { keybindings } = useKeybindingsStore();
 
-	const conflicts = useMemo(() => {
-		const keyToActions: Record<string, ActionWithOptionalArgs[]> = {};
-		const conflictList: KeybindingConflictInfo[] = [];
+  const conflicts = useMemo(() => {
+    const keyToActions: Record<string, ActionWithOptionalArgs[]> = {};
+    const conflictList: KeybindingConflictInfo[] = [];
 
-		// Group actions by key
-		Object.entries(keybindings).forEach(([key, action]) => {
-			if (!keyToActions[key]) {
-				keyToActions[key] = [];
-			}
-			keyToActions[key].push(action);
-		});
+    // Group actions by key
+    Object.entries(keybindings).forEach(([key, action]) => {
+      if (!keyToActions[key]) {
+        keyToActions[key] = [];
+      }
+      keyToActions[key].push(action);
+    });
 
-		// Find conflicts
-		Object.entries(keyToActions).forEach(([key, actions]) => {
-			const uniqueActions = [...new Set(actions)];
-			conflictList.push({
-				key,
-				actions: uniqueActions,
-				isConflict: uniqueActions.length > 1,
-			});
-		});
+    // Find conflicts
+    Object.entries(keyToActions).forEach(([key, actions]) => {
+      const uniqueActions = [...new Set(actions)];
+      conflictList.push({
+        key,
+        actions: uniqueActions,
+        isConflict: uniqueActions.length > 1,
+      });
+    });
 
-		return conflictList.filter((item) => item.isConflict);
-	}, [keybindings]);
+    return conflictList.filter((item) => item.isConflict);
+  }, [keybindings]);
 
-	const hasConflicts = conflicts.length > 0;
+  const hasConflicts = conflicts.length > 0;
 
-	const getConflictsForKey = (key: string): KeybindingConflictInfo | null => {
-		return conflicts.find((conflict) => conflict.key === key) || null;
-	};
+  const getConflictsForKey = (key: string): KeybindingConflictInfo | null => {
+    return conflicts.find((conflict) => conflict.key === key) || null;
+  };
 
-	const getConflictsForAction = (
-		action: ActionWithOptionalArgs,
-	): KeybindingConflictInfo[] => {
-		return conflicts.filter((conflict) => conflict.actions.includes(action));
-	};
+  const getConflictsForAction = (
+    action: ActionWithOptionalArgs
+  ): KeybindingConflictInfo[] => {
+    return conflicts.filter((conflict) => conflict.actions.includes(action));
+  };
 
-	return {
-		conflicts,
-		hasConflicts,
-		getConflictsForKey,
-		getConflictsForAction,
-	};
+  return {
+    conflicts,
+    hasConflicts,
+    getConflictsForKey,
+    getConflictsForAction,
+  };
 };