fix: cr fixes

Author: MrMuzyk

src/CONST/index.ts

@@ -505,7 +505,7 @@ const CONST = {
         SETUP_TYPE: {
             MANUAL: 'manual',
             PLAID: 'plaid',
-            EMPTY: '',
+            NONE: '',
         },
         REGEX: {
             US_ACCOUNT_NUMBER: /^[0-9]{4,17}$/,

src/ONYXKEYS.ts

@@ -304,7 +304,7 @@ const ONYXKEYS = {
     /** Stores Workspace ID that will be tied to reimbursement account during setup */
     REIMBURSEMENT_ACCOUNT_WORKSPACE_ID: 'reimbursementAccountWorkspaceID',
 
-    /** Stores information about type of connection user wants to perform before showing him validation code modal */
+    /** Stores the bank connection type user wants to set up before validation code modal */
     REIMBURSEMENT_ACCOUNT_OPTION_PRESSED: 'reimbursementAccountOptionPressed',
 
     /** Set when we are loading payment methods */

…orms/CountryFullStep/CountryFullStep.tsx …s/SubStepForms/CountryFullStep/index.tsxsrc/components/SubStepForms/CountryFullStep/CountryFullStep.tsx renamed to src/components/SubStepForms/CountryFullStep/index.tsx src/components/SubStepForms/CountryFullStep/CountryFullStep.tsx renamed to src/components/SubStepForms/CountryFullStep/index.tsx

@@ -96,8 +96,9 @@ function Confirmation({onNext, policyID}: ConfirmationStepProps) {
                     style={[styles.label]}
                     onPress={handleSettingsPress}
                 >
-                    {translate('common.settings').toLowerCase()}.
+                    {translate('common.settings').toLowerCase()}
                 </TextLink>
+                .
             </Text>
             <InputWrapper
                 InputComponent={PushRowWithModal}

src/components/SubStepForms/CountryFullStep/subSteps/Confirmation.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import CountryFullStep from '@components/SubStepForms/CountryFullStep/CountryFullStep';
+import CountryFullStep from '@components/SubStepForms/CountryFullStep';
 
 type CountryProps = {
     /** Handles back button press */

…sementAccount/NonUSD/Country/Country.tsx …ursementAccount/NonUSD/Country/index.tsxsrc/pages/ReimbursementAccount/NonUSD/Country/Country.tsx renamed to src/pages/ReimbursementAccount/NonUSD/Country/index.tsx src/pages/ReimbursementAccount/NonUSD/Country/Country.tsx renamed to src/pages/ReimbursementAccount/NonUSD/Country/index.tsx

@@ -6,7 +6,7 @@ import Agreements from './Agreements';
 import BankInfo from './BankInfo/BankInfo';
 import BeneficialOwnerInfo from './BeneficialOwnerInfo/BeneficialOwnerInfo';
 import BusinessInfo from './BusinessInfo/BusinessInfo';
-import Country from './Country/Country';
+import Country from './Country';
 import Docusign from './Docusign/Docusign';
 import Finish from './Finish';
 import SignerInfo from './SignerInfo';

src/pages/ReimbursementAccount/NonUSD/NonUSDVerifiedBankAccountFlow.tsx

@@ -98,10 +98,10 @@ function ReimbursementAccountPage({route, policy, isLoadingPolicy}: Reimbursemen
     const hasConfirmedUSDCurrency = (reimbursementAccountDraft?.[INPUT_IDS.ADDITIONAL_DATA.COUNTRY] ?? '') !== '' || (achData?.accountNumber ?? '') !== '';
 
     /**
-     currentStep determines the step that is displayed in the USD flow. In the majority of the cases it is based on the
-     achData?.current step with one exception - the beginning of the flow. There is a step where user confirms the currency
-     and the country, and it exists purely from FE perspective. We return early in getInitialCurrentStep and ignore
-     achData?.currentStep value to display very first step.
+     We main rely on `achData.currentStep` to determine the step to display in USD flow.
+     This data is synchronized with the BE to know which step to resume/start from.
+     Except for the CountryStep which exists purely in the FE.
+     This function is to decide if we should start from the CountryStep.
      */
     const getInitialCurrentStep = () => {
         if (!hasConfirmedUSDCurrency) {

src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import CountryFullStep from '@components/SubStepForms/CountryFullStep/CountryFullStep';
+import CountryFullStep from '@components/SubStepForms/CountryFullStep';
 import {goToWithdrawalAccountSetupStep} from '@userActions/ReimbursementAccount';
 import CONST from '@src/CONST';
 

…bursementAccount/USD/Country/Country.tsx …imbursementAccount/USD/Country/index.tsxsrc/pages/ReimbursementAccount/USD/Country/Country.tsx renamed to src/pages/ReimbursementAccount/USD/Country/index.tsx src/pages/ReimbursementAccount/USD/Country/Country.tsx renamed to src/pages/ReimbursementAccount/USD/Country/index.tsx

@@ -8,7 +8,7 @@ import BeneficialOwnersStep from './BeneficialOwnerInfo/BeneficialOwnersStep';
 import BusinessInfo from './BusinessInfo/BusinessInfo';
 import CompleteVerification from './CompleteVerification/CompleteVerification';
 import ConnectBankAccount from './ConnectBankAccount/ConnectBankAccount';
-import Country from './Country/Country';
+import Country from './Country';
 import RequestorStep from './Requestor/RequestorStep';
 
 type USDVerifiedBankAccountFlowProps = {

src/pages/ReimbursementAccount/USD/USDVerifiedBankAccountFlow.tsx

@@ -145,16 +145,16 @@ function VerifiedBankAccountFlowEntryPoint({
         if (reimbursementAccountOptionPressed === CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL) {
             if (isNonUSDWorkspace) {
                 setNonUSDBankAccountStep(CONST.NON_USD_BANK_ACCOUNT.STEP.COUNTRY);
-                setReimbursementAccountOptionPressed(CONST.BANK_ACCOUNT.SETUP_TYPE.EMPTY);
+                setReimbursementAccountOptionPressed(CONST.BANK_ACCOUNT.SETUP_TYPE.NONE);
                 return;
             }
 
             prepareNextStep(CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL);
-            setReimbursementAccountOptionPressed(CONST.BANK_ACCOUNT.SETUP_TYPE.EMPTY);
+            setReimbursementAccountOptionPressed(CONST.BANK_ACCOUNT.SETUP_TYPE.NONE);
         } else if (reimbursementAccountOptionPressed === CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID) {
             openPlaidView();
             prepareNextStep(CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID);
-            setReimbursementAccountOptionPressed(CONST.BANK_ACCOUNT.SETUP_TYPE.EMPTY);
+            setReimbursementAccountOptionPressed(CONST.BANK_ACCOUNT.SETUP_TYPE.NONE);
         }
     }, [isAccountValidated, isNonUSDWorkspace, prepareNextStep, reimbursementAccountOptionPressed, setNonUSDBankAccountStep]);