Merge pull request #9672 from Expensify/Rory-CMDEnter

Make CMD+Enter work for single-selection pages (cherry picked from commit 7c2c5db)
Expensify · Jul 1, 2022 · e92939f · e92939f
1 parent b698671
commit e92939f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/components/OptionsSelector.js b/src/components/OptionsSelector.js
@@ -190,12 +190,17 @@ class OptionsSelector extends Component {
         this.unsubscribeCTRLEnter = KeyboardShortcut.subscribe(
             CTRLEnterConfig.shortcutKey,
             () => {
+                if (this.props.canSelectMultipleOptions) {
+                    this.props.onConfirmSelection();
+                    return;
+                }
+
                 const focusedOption = this.state.allOptions[this.state.focusedIndex];
-                if (!this.canSelectMultipleOptions && !focusedOption) {
+                if (!focusedOption) {
                     return;
                 }
 
-                this.props.onConfirmSelection(focusedOption);
+                this.selectRow(focusedOption);
             },
             CTRLEnterConfig.descriptionKey,
             CTRLEnterConfig.modifiers,

diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
@@ -255,7 +255,7 @@ class NewChatPage extends Component {
                                     shouldFocusOnSelectRow={this.props.isGroupChat}
                                     shouldShowConfirmButton={this.props.isGroupChat}
                                     confirmButtonText={this.props.translate('newChatPage.createGroup')}
-                                    onConfirmSelection={this.props.isGroupChat ? this.createGroup : this.createChat}
+                                    onConfirmSelection={this.props.isGroupChat ? this.createGroup : () => {}}
                                 />
                             )}
                         </View>