fix: revert some changes to substep and setup type

Author: MrMuzyk

src/CONST/index.ts

@@ -486,6 +486,10 @@ const CONST = {
             ENABLE: 'EnableStep',
         },
         STEP_NAMES: ['1', '2', '3', '4', '5', '6'],
+        SUBSTEP: {
+            MANUAL: 'manual',
+            PLAID: 'plaid',
+        },
         STEPS_HEADER_HEIGHT: 40,
         VERIFICATIONS: {
             ERROR_MESSAGE: 'verifications.errorMessage',

src/libs/actions/ReimbursementAccount/index.ts

@@ -3,7 +3,7 @@ import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {ReimbursementAccountForm} from '@src/types/form';
-import type {BankAccountSubStep} from '@src/types/onyx/ReimbursementAccount';
+import type {ReimbursementAccountSubStep} from '@src/types/onyx/ReimbursementAccount';
 import resetNonUSDBankAccount from './resetNonUSDBankAccount';
 import resetUSDBankAccount from './resetUSDBankAccount';
 
@@ -16,7 +16,7 @@ export {setBankAccountFormValidationErrors, resetReimbursementAccount} from './e
  * - CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL to ask them to enter their accountNumber and routingNumber
  * - CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID to ask them to login to their bank via Plaid
  */
-function setBankAccountSubStep(subStep: BankAccountSubStep | null): Promise<void | void[]> {
+function setBankAccountSubStep(subStep: ReimbursementAccountSubStep | null): Promise<void | void[]> {
     return Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {achData: {subStep}});
 }
 

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

@@ -255,13 +255,13 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen
     );
 
     const continueUSDVBBASetup = useCallback(() => {
-        const subStep = achData?.subStep !== undefined ? achData.subStep : CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL;
-
-        setBankAccountSubStep(subStep).then(() => {
+        // If user comes back to the flow we never want to allow him to go through plaid again
+        // so we're always showing manual setup with locked numbers he can not change
+        setBankAccountSubStep(CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL).then(() => {
             setShouldShowContinueSetupButton(false);
             setUSDBankAccountStep(currentStep);
         });
-    }, [achData?.subStep, currentStep]);
+    }, [currentStep]);
 
     const continueNonUSDVBBASetup = () => {
         const isPastSignerStep = achData?.corpay?.signerFullName && achData?.corpay?.authorizedToBindClientToAgreement === undefined;

src/pages/ReimbursementAccount/USD/BankInfo/BankInfo.tsx

@@ -44,7 +44,7 @@ function BankInfo({onBackButtonPress, policyID, setUSDBankAccountStep}: BankInfo
     const [redirectedFromPlaidToManual, setRedirectedFromPlaidToManual] = React.useState(false);
     const values = useMemo(() => getSubStepValues(BANK_INFO_STEP_KEYS, reimbursementAccountDraft, reimbursementAccount ?? {}), [reimbursementAccount, reimbursementAccountDraft]);
 
-    let setupType = reimbursementAccount?.achData?.setupType ?? reimbursementAccount?.achData?.subStep ?? '';
+    let setupType = reimbursementAccount?.achData?.subStep ?? '';
 
     const shouldReinitializePlaidLink = plaidLinkToken && receivedRedirectURI && setupType !== CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL;
     if (shouldReinitializePlaidLink) {

src/types/onyx/ReimbursementAccount.ts

@@ -11,7 +11,7 @@ import type * as OnyxCommon from './OnyxCommon';
 type BankAccountStep = ValueOf<typeof CONST.BANK_ACCOUNT.STEP>;
 
 /** Substeps to setup a reimbursement bank account */
-type BankAccountSubStep = ValueOf<typeof CONST.BANK_ACCOUNT.SETUP_TYPE>;
+type BankAccountSubStep = ValueOf<typeof CONST.BANK_ACCOUNT.SUBSTEP>;
 
 /** Model of Corpay data */
 type Corpay = {
@@ -190,7 +190,7 @@ type ACHData = Partial<BeneficialOwnersStepProps & CompanyStepProps & RequestorS
 type ReimbursementAccountStep = BankAccountStep | '';
 
 /** The sub step in an reimbursement account's ach data */
-type ReimbursementAccountSubStep = BankAccountSubStep;
+type ReimbursementAccountSubStep = BankAccountSubStep | '';
 
 /** The ACHData for an reimbursement account */
 type ACHDataReimbursementAccount = Omit<ACHData, 'subStep' | 'currentStep'> & {