diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx index a5bd73347e57..0acb48e1561c 100644 --- a/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx +++ b/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx @@ -3,6 +3,7 @@ import type {OnyxEntry} from 'react-native-onyx'; import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; +import useHandleBackButton from '@hooks/useHandleBackButton'; import useLocalize from '@hooks/useLocalize'; import useRootNavigationState from '@hooks/useRootNavigationState'; import useSubStep from '@hooks/useSubStep'; @@ -102,25 +103,28 @@ function InternationalDepositAccountContent({privatePersonalDetails, corpayField const handleBackButtonPress = () => { if (isEditing) { resetScreenIndex(CONST.CORPAY_FIELDS.INDEXES.MAPPING.CONFIRMATION); - return; + return true; } // Clicking back on the first screen should dismiss the modal if (screenIndex === CONST.CORPAY_FIELDS.INDEXES.MAPPING.COUNTRY_SELECTOR) { clearDraftValues(ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM); goBack(); - return; + return true; } // Clicking back on the success screen should dismiss the modal if (screenIndex === CONST.CORPAY_FIELDS.INDEXES.MAPPING.SUCCESS) { clearDraftValues(ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM); goBack(); - return; + return true; } prevScreen(); + return true; }; + useHandleBackButton(handleBackButtonPress); + const handleNextScreen = useCallback(() => { if (isEditing) { resetScreenIndex(CONST.CORPAY_FIELDS.INDEXES.MAPPING.CONFIRMATION);