Remove IOUCurrencySelection and update IOURequestStepCurrency PART-5

Expensify · Jan 28, 2024 · 680e555 · 680e555
1 parent 42b31bb
commit 680e555
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/pages/EditRequestAmountPage.js b/src/pages/EditRequestAmountPage.js
@@ -7,6 +7,7 @@ import useLocalize from '@hooks/useLocalize';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
 import MoneyRequestAmountForm from './iou/steps/MoneyRequestAmountForm';
 
 const propTypes = {
@@ -41,6 +42,10 @@ function EditRequestAmountPage({defaultAmount, defaultCurrency, onNavigateToCurr
         }, []),
     );
 
+    const navigateBack = () => {
+        Navigation.goBack(ROUTES.HOME);
+    };
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -50,7 +55,7 @@ function EditRequestAmountPage({defaultAmount, defaultCurrency, onNavigateToCurr
         >
             <HeaderWithBackButton
                 title={translate('iou.amount')}
-                onBackButtonPress={Navigation.dismissModal}
+                onBackButtonPress={navigateBack}
             />
             <MoneyRequestAmountForm
                 currency={defaultCurrency}

diff --git a/src/pages/iou/request/step/IOURequestStepCurrency.js b/src/pages/iou/request/step/IOURequestStepCurrency.js
@@ -102,7 +102,7 @@ function IOURequestStepCurrency({
             if (selectedCurrency) {
                 Navigation.navigate(`${backTo}?currency=${selectedCurrency}`);
             } else {
-                Navigation.navigate(backTo);
+                Navigation.goBack(backTo || ROUTES.HOME);
             }
             return;
         }