Merge pull request Expensify#76072 from nyomanjyotisa/issue-74809

Author: mjasikowski

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

@@ -130,6 +130,7 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy, navigation}:
     const currentStep = getInitialCurrentStep();
     const [nonUSDBankAccountStep, setNonUSDBankAccountStep] = useState<string | null>(subStepParam ?? null);
     const [USDBankAccountStep, setUSDBankAccountStep] = useState<string | null>(subStepParam ?? null);
+    const [isResettingBankAccount, setIsResettingBankAccount] = useState(false);
 
     function getBankAccountFields(fieldNames: InputID[]): Partial<ACHDataReimbursementAccount> {
         return {
@@ -498,7 +499,7 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy, navigation}:
         );
     }
 
-    if (isNonUSDWorkspace && nonUSDBankAccountStep !== null) {
+    if (isNonUSDWorkspace && nonUSDBankAccountStep !== null && !isResettingBankAccount) {
         return (
             <NonUSDVerifiedBankAccountFlow
                 nonUSDBankAccountStep={nonUSDBankAccountStep}
@@ -538,6 +539,7 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy, navigation}:
             setNonUSDBankAccountStep={setNonUSDBankAccountStep}
             setUSDBankAccountStep={setUSDBankAccountStep}
             policyID={policyIDParam}
+            setIsResettingBankAccount={setIsResettingBankAccount}
         />
     );
 }

src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx

@@ -67,6 +67,9 @@ type VerifiedBankAccountFlowEntryPointProps = {
 
     /** Method to set the state of shouldShowContinueSetupButton */
     setShouldShowContinueSetupButton?: (shouldShowContinueSetupButton: boolean) => void;
+
+    /** Method to set the state of isResettingBankAccount */
+    setIsResettingBankAccount?: (isResetting: boolean) => void;
 };
 
 const bankInfoStepKeys = INPUT_IDS.BANK_INFO_STEP;
@@ -82,6 +85,7 @@ function VerifiedBankAccountFlowEntryPoint({
     setNonUSDBankAccountStep,
     setUSDBankAccountStep,
     setShouldShowContinueSetupButton,
+    setIsResettingBankAccount,
 }: VerifiedBankAccountFlowEntryPointProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -303,6 +307,7 @@ function VerifiedBankAccountFlowEntryPoint({
                     setUSDBankAccountStep={setUSDBankAccountStep}
                     setNonUSDBankAccountStep={setNonUSDBankAccountStep}
                     setShouldShowContinueSetupButton={setShouldShowContinueSetupButton}
+                    setIsResettingBankAccount={setIsResettingBankAccount}
                 />
             )}
         </ScreenWrapper>

src/pages/workspace/WorkspaceResetBankAccountModal.tsx

@@ -29,6 +29,9 @@ type WorkspaceResetBankAccountModalProps = {
 
     /** Whether the workspace currency is set to non USD currency */
     isNonUSDWorkspace: boolean;
+
+    /** Method to set the state of isResettingBankAccount */
+    setIsResettingBankAccount?: (isResetting: boolean) => void;
 };
 
 function WorkspaceResetBankAccountModal({
@@ -38,6 +41,7 @@ function WorkspaceResetBankAccountModal({
     setNonUSDBankAccountStep,
     isNonUSDWorkspace,
     setShouldShowContinueSetupButton,
+    setIsResettingBankAccount,
 }: WorkspaceResetBankAccountModalProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -64,6 +68,10 @@ function WorkspaceResetBankAccountModal({
 
     const handleConfirm = () => {
         if (isNonUSDWorkspace) {
+            if (setIsResettingBankAccount) {
+                setIsResettingBankAccount(true);
+            }
+
             resetNonUSDBankAccount(policyID, policy?.achAccount, !achData?.bankAccountID);
 
             if (setShouldShowConnectedVerifiedBankAccount) {
@@ -75,8 +83,12 @@ function WorkspaceResetBankAccountModal({
             }
 
             if (setNonUSDBankAccountStep) {
-                setNonUSDBankAccountStep(null);
+                setNonUSDBankAccountStep(CONST.NON_USD_BANK_ACCOUNT.STEP.COUNTRY);
             }
+
+            requestAnimationFrame(() => {
+                setIsResettingBankAccount?.(false);
+            });
         } else {
             resetUSDBankAccount(bankAccountID, session, policyID, policy?.achAccount, lastPaymentMethod);