From aa37ffe3d57162b3d7beb6f53ef51a7c5fb33746 Mon Sep 17 00:00:00 2001
From: Rodrigo Lino da Costa <5201282+rlinoz@users.noreply.github.com>
Date: Mon, 22 Jul 2024 17:34:58 -0300
Subject: [PATCH] Revert "fix: Web - Split - Enter and CMD+Enter open user
 profile instead of splitting expense."

---
 .../ButtonWithDropdownMenu/index.tsx          | 26 +++----------------
 .../ButtonWithDropdownMenu/types.ts           |  3 ---
 .../MoneyRequestConfirmationList.tsx          |  3 ---
 src/components/SettlementButton.tsx           |  9 +------
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/src/components/ButtonWithDropdownMenu/index.tsx b/src/components/ButtonWithDropdownMenu/index.tsx
index d1e36327a1a3..094c26a2b387 100644
--- a/src/components/ButtonWithDropdownMenu/index.tsx
+++ b/src/components/ButtonWithDropdownMenu/index.tsx
@@ -4,7 +4,6 @@ import Button from '@components/Button';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import PopoverMenu from '@components/PopoverMenu';
-import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -34,7 +33,6 @@ function ButtonWithDropdownMenu<IValueType>({
     onOptionSelected,
     enterKeyEventListenerPriority = 0,
     wrapperStyle,
-    useKeyboardShortcuts = false,
 }: ButtonWithDropdownMenuProps<IValueType>) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -67,26 +65,6 @@ function ButtonWithDropdownMenu<IValueType>({
             });
         }
     }, [windowWidth, windowHeight, isMenuVisible, anchorAlignment.vertical]);
-
-    useKeyboardShortcut(
-        CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER,
-        (e) => {
-            onPress(e, selectedItem.value);
-        },
-        {
-            captureOnInputs: true,
-            shouldBubble: false,
-            isActive: useKeyboardShortcuts,
-        },
-    );
-
-    useEffect(() => {
-        if (!!caretButton.current || !buttonRef?.current || !(shouldAlwaysShowDropdownMenu || options.length > 1)) {
-            return;
-        }
-        caretButton.current = buttonRef.current;
-    }, [buttonRef, options.length, shouldAlwaysShowDropdownMenu]);
-
     return (
         <View style={wrapperStyle}>
             {shouldAlwaysShowDropdownMenu || options.length > 1 ? (
@@ -94,7 +72,9 @@ function ButtonWithDropdownMenu<IValueType>({
                     <Button
                         success={success}
                         pressOnEnter={pressOnEnter}
-                        ref={buttonRef}
+                        ref={(ref) => {
+                            caretButton.current = ref;
+                        }}
                         onPress={(event) => (!isSplitButton ? setIsMenuVisible(!isMenuVisible) : onPress(event, selectedItem.value))}
                         text={customText ?? selectedItem.text}
                         isDisabled={isDisabled || !!selectedItem.disabled}
diff --git a/src/components/ButtonWithDropdownMenu/types.ts b/src/components/ButtonWithDropdownMenu/types.ts
index bf9cdc33cb81..baac60190ce5 100644
--- a/src/components/ButtonWithDropdownMenu/types.ts
+++ b/src/components/ButtonWithDropdownMenu/types.ts
@@ -84,9 +84,6 @@ type ButtonWithDropdownMenuProps<TValueType> = {
 
     /** Whether the button should use split style or not */
     isSplitButton?: boolean;
-
-    /** Whether to use keyboard shortcuts for confirmation or not */
-    useKeyboardShortcuts?: boolean;
 };
 
 export type {
diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index ab62febbf950..ae8cbe4298f2 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -778,7 +778,6 @@ function MoneyRequestConfirmationList({
                     vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
                 }}
                 enterKeyEventListenerPriority={1}
-                useKeyboardShortcuts
             />
         ) : (
             <ButtonWithDropdownMenu
@@ -790,7 +789,6 @@ function MoneyRequestConfirmationList({
                 options={splitOrRequestOptions}
                 buttonSize={CONST.DROPDOWN_BUTTON_SIZE.LARGE}
                 enterKeyEventListenerPriority={1}
-                useKeyboardShortcuts
             />
         );
 
@@ -885,7 +883,6 @@ function MoneyRequestConfirmationList({
                 footerContent={footerContent}
                 listFooterContent={listFooterContent}
                 containerStyle={[styles.flexBasisAuto]}
-                disableKeyboardShortcuts
                 removeClippedSubviews={false}
             />
         </MouseProvider>
diff --git a/src/components/SettlementButton.tsx b/src/components/SettlementButton.tsx
index 294752a3a0d7..7c3c021a08eb 100644
--- a/src/components/SettlementButton.tsx
+++ b/src/components/SettlementButton.tsx
@@ -105,9 +105,6 @@ type SettlementButtonProps = SettlementButtonOnyxProps & {
 
     /** Callback to open confirmation modal if any of the transactions is on HOLD */
     confirmApproval?: () => void;
-
-    /** Whether to use keyboard shortcuts for confirmation or not */
-    useKeyboardShortcuts?: boolean;
 };
 
 function SettlementButton({
@@ -143,7 +140,6 @@ function SettlementButton({
     enterKeyEventListenerPriority = 0,
     confirmApproval,
     policy,
-    useKeyboardShortcuts = false,
 }: SettlementButtonProps) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
@@ -287,14 +283,11 @@ function SettlementButton({
                     onPress={(event, iouPaymentType) => selectPaymentType(event, iouPaymentType, triggerKYCFlow)}
                     pressOnEnter={pressOnEnter}
                     options={paymentButtonOptions}
-                    onOptionSelected={(option) => {
-                        savePreferredPaymentMethod(policyID, option.value);
-                    }}
+                    onOptionSelected={(option) => savePreferredPaymentMethod(policyID, option.value)}
                     style={style}
                     buttonSize={buttonSize}
                     anchorAlignment={paymentMethodDropdownAnchorAlignment}
                     enterKeyEventListenerPriority={enterKeyEventListenerPriority}
-                    useKeyboardShortcuts={useKeyboardShortcuts}
                 />
             )}
         </KYCWall>