Merge pull request Expensify#31225 from BhuvaneshPatil/30508-double-t…

…ap-issue fix: double tap on currency selects AFN
bernhardoj · Nov 16, 2023 · 1deced4 · 1deced4
2 parents d220f6c + 3fbdf32
commit 1deced4
Showing 1 changed file with 23 additions and 14 deletions.
diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js
@@ -157,20 +157,29 @@ function IOUCurrencySelection(props) {
             onEntryTransitionEnd={() => optionsSelectorRef.current && optionsSelectorRef.current.focus()}
             testID={IOUCurrencySelection.displayName}
         >
-            <HeaderWithBackButton
-                title={translate('common.selectCurrency')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType, reportID))}
-            />
-            <SelectionList
-                sections={sections}
-                textInputLabel={translate('common.search')}
-                textInputValue={searchValue}
-                onChangeText={setSearchValue}
-                onSelectRow={confirmCurrencySelection}
-                headerMessage={headerMessage}
-                initiallyFocusedOptionKey={initiallyFocusedOptionKey}
-                showScrollIndicator
-            />
+            {({didScreenTransitionEnd}) => (
+                <>
+                    <HeaderWithBackButton
+                        title={translate('common.selectCurrency')}
+                        onBackButtonPress={() => Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType, reportID))}
+                    />
+                    <SelectionList
+                        sections={sections}
+                        textInputLabel={translate('common.search')}
+                        textInputValue={searchValue}
+                        onChangeText={setSearchValue}
+                        onSelectRow={(option) => {
+                            if (!didScreenTransitionEnd) {
+                                return;
+                            }
+                            confirmCurrencySelection(option);
+                        }}
+                        headerMessage={headerMessage}
+                        initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+                        showScrollIndicator
+                    />
+                </>
+            )}
         </ScreenWrapper>
     );
 }