Merge pull request #75961 from daledah/fix/75184

fix: keypad from payment currency page is shown in preferences page

Author: stitesExpensify

src/pages/settings/Preferences/PaymentCurrencyPage.tsx

@@ -11,6 +11,7 @@ import {updateGeneralSettings} from '@libs/actions/Policy/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import {getPersonalPolicy} from '@libs/PolicyUtils';
 import CONST from '@src/CONST';
+import KeyboardUtils from '@src/utils/keyboard';
 
 function PaymentCurrencyPage() {
     const styles = useThemeStyles();
@@ -20,6 +21,12 @@ function PaymentCurrencyPage() {
 
     const paymentCurrency = personalPolicy?.outputCurrency ?? CONST.CURRENCY.USD;
 
+    const handleDismissKeyboardAndGoBack = () => {
+        KeyboardUtils.dismiss().then(() => {
+            Navigation.goBack();
+        });
+    };
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -30,7 +37,7 @@ function PaymentCurrencyPage() {
                     <HeaderWithBackButton
                         title={translate('billingCurrency.paymentCurrency')}
                         shouldShowBackButton
-                        onBackButtonPress={() => Navigation.goBack()}
+                        onBackButtonPress={handleDismissKeyboardAndGoBack}
                     />
 
                     <Text style={[styles.mh5, styles.mv4]}>{translate('billingCurrency.paymentCurrencyDescription')}</Text>
@@ -42,7 +49,7 @@ function PaymentCurrencyPage() {
                             if (option.currencyCode !== paymentCurrency) {
                                 updateGeneralSettings(personalPolicyID, personalPolicy?.name ?? '', option.currencyCode);
                             }
-                            Navigation.goBack();
+                            handleDismissKeyboardAndGoBack();
                         }}
                         initiallySelectedCurrencyCode={paymentCurrency}
                         didScreenTransitionEnd={didScreenTransitionEnd}