Merge pull request #47244 from Krishna2323/krishna2323/issue/47230

[CP Staging] fix: Report fields - App crashes when disabling/enabling list values via checkbox & dropdown button.
Expensify · Aug 13, 2024 · 8cf898d · 8cf898d
2 parents 4483c6f + a43e886
commit 8cf898d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/components/ButtonWithDropdownMenu/index.tsx b/src/components/ButtonWithDropdownMenu/index.tsx
@@ -78,7 +78,15 @@ function ButtonWithDropdownMenu<IValueType>({
     useKeyboardShortcut(
         CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER,
         (e) => {
-            onPress(e, selectedItem.value);
+            if (shouldAlwaysShowDropdownMenu || options.length) {
+                if (!isSplitButton) {
+                    setIsMenuVisible(!isMenuVisible);
+                    return;
+                }
+                onPress(e, selectedItem?.value);
+            } else {
+                onPress(e, options[0]?.value);
+            }
         },
         {
             captureOnInputs: true,