Merge pull request #18484 from azimgd/shortcut-modal-check

prevent closing shortcut modal by triggering open shortcut
Expensify · May 8, 2023 · d4ed233 · d4ed233
2 parents 8f9c7be + d280007
commit d4ed233
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/components/KeyboardShortcutsModal.js b/src/components/KeyboardShortcutsModal.js
@@ -38,6 +38,10 @@ class KeyboardShortcutsModal extends React.Component {
 
         const openShortcutModalConfig = CONST.KEYBOARD_SHORTCUTS.SHORTCUT_MODAL;
         this.unsubscribeShortcutModal = KeyboardShortcut.subscribe(openShortcutModalConfig.shortcutKey, () => {
+            if (this.props.isShortcutsModalOpen) {
+                return;
+            }
+
             ModalActions.close();
             KeyboardShortcutsActions.showKeyboardShortcutModal();
         }, openShortcutModalConfig.descriptionKey, openShortcutModalConfig.modifiers, true);