From 5a49005e7961ed254667f62cdba5deba2c792fa7 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Sun, 28 Jan 2024 22:32:32 +0530
Subject: [PATCH] fix: The shortcut for displaying the keyboard shortcut help
 dialog has been changed to `Ctrl + /`

---
 packages/ui-services/src/Keyboard/KeyboardService.ts         | 4 ++++
 packages/ui-services/src/Keyboard/KeyboardShortcut.ts        | 1 +
 packages/ui-services/src/Keyboard/getKeyboardShortcuts.ts    | 5 ++---
 .../KeyboardShortcutsHelpModal.tsx                           | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/ui-services/src/Keyboard/KeyboardService.ts b/packages/ui-services/src/Keyboard/KeyboardService.ts
index 860612c83..e3bed5f09 100644
--- a/packages/ui-services/src/Keyboard/KeyboardService.ts
+++ b/packages/ui-services/src/Keyboard/KeyboardService.ts
@@ -194,6 +194,10 @@ export class KeyboardService {
 
     const helpItem = this.getKeyboardShortcutHelpItemForHandler(observer)
     if (helpItem) {
+      const existingItem = Array.from(this.keyboardShortcutHelpItems).find((item) => item.command === helpItem.command)
+      if (existingItem) {
+        this.keyboardShortcutHelpItems.delete(existingItem)
+      }
       this.keyboardShortcutHelpItems.add(helpItem)
     }
 
diff --git a/packages/ui-services/src/Keyboard/KeyboardShortcut.ts b/packages/ui-services/src/Keyboard/KeyboardShortcut.ts
index c04925a0d..baf28819d 100644
--- a/packages/ui-services/src/Keyboard/KeyboardShortcut.ts
+++ b/packages/ui-services/src/Keyboard/KeyboardShortcut.ts
@@ -22,6 +22,7 @@ export type PlatformedKeyboardShortcut = KeyboardShortcut & {
 export type KeyboardShortcutCategory = 'General' | 'Notes list' | 'Current note' | 'Super notes' | 'Formatting'
 
 export type KeyboardShortcutHelpItem = Omit<PlatformedKeyboardShortcut, 'command'> & {
+  command?: KeyboardCommand
   category: KeyboardShortcutCategory
   description: string
 }
diff --git a/packages/ui-services/src/Keyboard/getKeyboardShortcuts.ts b/packages/ui-services/src/Keyboard/getKeyboardShortcuts.ts
index ee3bd27e1..ac90a9e37 100644
--- a/packages/ui-services/src/Keyboard/getKeyboardShortcuts.ts
+++ b/packages/ui-services/src/Keyboard/getKeyboardShortcuts.ts
@@ -195,9 +195,8 @@ export function getKeyboardShortcuts(platform: Platform, _environment: Environme
     },
     {
       command: TOGGLE_KEYBOARD_SHORTCUTS_MODAL,
-      key: '?',
-      preventDefault: true,
-      modifiers: [KeyboardModifier.Shift],
+      key: '/',
+      modifiers: [primaryModifier],
     },
   ]
 }
diff --git a/packages/web/src/javascripts/Components/KeyboardShortcutsHelpModal/KeyboardShortcutsHelpModal.tsx b/packages/web/src/javascripts/Components/KeyboardShortcutsHelpModal/KeyboardShortcutsHelpModal.tsx
index a4ed42cb4..7f9725acc 100644
--- a/packages/web/src/javascripts/Components/KeyboardShortcutsHelpModal/KeyboardShortcutsHelpModal.tsx
+++ b/packages/web/src/javascripts/Components/KeyboardShortcutsHelpModal/KeyboardShortcutsHelpModal.tsx
@@ -48,6 +48,7 @@ const KeyboardShortcutsModal = ({ keyboardService }: { keyboardService: Keyboard
   useEffect(() => {
     return keyboardService.addCommandHandler({
       command: TOGGLE_KEYBOARD_SHORTCUTS_MODAL,
+      category: 'General',
       description: 'Toggle keyboard shortcuts help',
       onKeyDown: () => {
         setItems(createGroupedItems(keyboardService.getRegisteredKeyboardShorcutHelpItems()))