Merge pull request Expensify#67391 from allgandalf/fix/65760

fix screen transition issue on payment currency selector

Author: rlinoz

src/components/CurrencySelectionList/index.tsx

@@ -15,6 +15,7 @@ function CurrencySelectionList({
     searchInputLabel,
     initiallySelectedCurrencyCode,
     onSelect,
+    didScreenTransitionEnd = true,
     selectedCurrencies = [],
     canSelectMultiple = false,
     recentlyUsedCurrencies,
@@ -109,6 +110,7 @@ function CurrencySelectionList({
             initiallyFocusedOptionKey={initiallySelectedCurrencyCode}
             showScrollIndicator
             canSelectMultiple={canSelectMultiple}
+            showLoadingPlaceholder={!didScreenTransitionEnd}
         />
     );
 }

src/components/CurrencySelectionList/types.ts

@@ -26,6 +26,9 @@ type CurrencySelectionListProps = Partial<SelectionListProps<CurrencyListItem>>
 
     /** List of excluded currency codes */
     excludedCurrencies?: string[];
+
+    /** Whether the screen transition has ended */
+    didScreenTransitionEnd?: boolean;
 };
 
 export type {CurrencyListItem, CurrencySelectionListProps};

src/pages/settings/Preferences/PaymentCurrencyPage.tsx

@@ -39,15 +39,13 @@ function PaymentCurrencyPage() {
                         recentlyUsedCurrencies={[]}
                         searchInputLabel={translate('common.search')}
                         onSelect={(option: CurrencyListItem) => {
-                            if (!didScreenTransitionEnd) {
-                                return;
-                            }
                             if (option.currencyCode !== paymentCurrency) {
                                 updateGeneralSettings(personalPolicyID, personalPolicy?.name ?? '', option.currencyCode);
                             }
                             Navigation.goBack();
                         }}
                         initiallySelectedCurrencyCode={paymentCurrency}
+                        didScreenTransitionEnd={didScreenTransitionEnd}
                     />
                 </>
             )}