Merge pull request Expensify#63755 from bernhardoj/fix/63669-currency-can-be-changed-after-add-ba

Fix user can change currency after adding a bank account

Author: JS00001

src/libs/actions/ReimbursementAccount/navigation.ts

@@ -1,4 +1,5 @@
 import Onyx from 'react-native-onyx';
+import type {LinkToOptions} from '@libs/Navigation/helpers/linkTo/types';
 import Navigation from '@libs/Navigation/Navigation';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -17,8 +18,8 @@ function goToWithdrawalAccountSetupStep(stepID: BankAccountStep) {
  * @param policyID - The policy ID associated with the bank account.
  * @param [backTo] - An optional return path. If provided, it will be URL-encoded and appended to the resulting URL.
  */
-function navigateToBankAccountRoute(policyID: string | undefined, backTo?: string) {
-    Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(policyID, '', backTo));
+function navigateToBankAccountRoute(policyID: string | undefined, backTo?: string, navigationOptions?: LinkToOptions) {
+    Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(policyID, '', backTo), navigationOptions);
 }
 
 export {goToWithdrawalAccountSetupStep, navigateToBankAccountRoute};

src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx

@@ -7,6 +7,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import BankAccount from '@libs/models/BankAccount';
 import Navigation from '@libs/Navigation/Navigation';
 import {goBackFromInvalidPolicy} from '@libs/PolicyUtils';
 import mapCurrencyToCountry from '@pages/ReimbursementAccount/utils/mapCurrencyToCountry';
@@ -32,7 +33,7 @@ function WorkspaceOverviewCurrencyPage({policy}: WorkspaceOverviewCurrencyPagePr
     const {translate} = useLocalize();
     const {isBetaEnabled} = usePermissions();
     const [isForcedToChangeCurrency] = useOnyx(ONYXKEYS.IS_FORCED_TO_CHANGE_CURRENCY, {canBeMissing: true});
-
+    const [hasVBA = false] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {selector: (value) => value?.achData?.state === BankAccount.STATE.OPEN, canBeMissing: true});
     const onSelectCurrency = (item: CurrencyListItem) => {
         if (!policy) {
             return;
@@ -46,7 +47,7 @@ function WorkspaceOverviewCurrencyPage({policy}: WorkspaceOverviewCurrencyPagePr
             setIsForcedToChangeCurrency(false);
 
             if (isCurrencySupportedForGlobalReimbursement(item.currencyCode as CurrencyType, isBetaEnabled(CONST.BETAS.GLOBAL_REIMBURSEMENTS_ON_ND) ?? false)) {
-                navigateToBankAccountRoute(policy.id, ROUTES.WORKSPACE_WORKFLOWS.getRoute(policy.id));
+                navigateToBankAccountRoute(policy.id, ROUTES.WORKSPACE_WORKFLOWS.getRoute(policy.id), {forceReplace: true});
                 return;
             }
         }
@@ -57,7 +58,11 @@ function WorkspaceOverviewCurrencyPage({policy}: WorkspaceOverviewCurrencyPagePr
         <AccessOrNotFoundWrapper
             policyID={policy?.id}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
-            fullPageNotFoundViewProps={{onLinkPress: goBackFromInvalidPolicy, subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}}
+            shouldBeBlocked={hasVBA}
+            fullPageNotFoundViewProps={{
+                onLinkPress: hasVBA ? () => Navigation.goBack() : goBackFromInvalidPolicy,
+                subtitleKey: hasVBA || isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized',
+            }}
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding