Merge pull request #36472 from MrMuzyk/fix/followup-fixes-for-vbba-re…

…factor [CP Staging] fix: followup fixes for vbba refactor (cherry picked from commit 4021904)
Expensify · Feb 14, 2024 · cf005ea · cf005ea
1 parent 7550cf3
commit cf005ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/components/InteractiveStepSubHeader.tsx b/src/components/InteractiveStepSubHeader.tsx
@@ -78,7 +78,7 @@ function InteractiveStepSubHeader({stepNames, startStepIndex = 0, onStepSelected
                                 isLockedStep && styles.interactiveStepHeaderLockedStepButton,
                                 isCompletedStep && styles.interactiveStepHeaderCompletedStepButton,
                             ]}
-                            disabled={isLockedStep}
+                            disabled={isLockedStep || !onStepSelected}
                             onPress={moveToStep}
                             accessible
                             accessibilityLabel={stepName[index]}

diff --git a/src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx b/src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx
@@ -5,6 +5,7 @@ import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -30,6 +31,7 @@ const STEP_FIELDS = [BANK_INFO_STEP_KEYS.ROUTING_NUMBER, BANK_INFO_STEP_KEYS.ACC
 function Manual({reimbursementAccount, onNext}: ManualProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const {inputCallbackRef} = useAutoFocusInput();
 
     const defaultValues: FormValues = {
         [BANK_INFO_STEP_KEYS.ROUTING_NUMBER]: reimbursementAccount?.achData?.[BANK_INFO_STEP_KEYS.ROUTING_NUMBER] ?? '',
@@ -78,6 +80,7 @@ function Manual({reimbursementAccount, onNext}: ManualProps) {
             <ExampleCheckImage />
             <InputWrapper
                 InputComponent={TextInput}
+                ref={inputCallbackRef}
                 inputID={BANK_INFO_STEP_KEYS.ROUTING_NUMBER}
                 label={translate('bankAccount.routingNumber')}
                 aria-label={translate('bankAccount.routingNumber')}

diff --git a/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx b/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx
@@ -67,7 +67,6 @@ function VerifyIdentity({reimbursementAccount, onBackButtonPress, onfidoApplican
             />
             <View style={[styles.ph5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
                 <InteractiveStepSubHeader
-                    onStepSelected={() => {}}
                     startStepIndex={2}
                     stepNames={CONST.BANK_ACCOUNT.STEP_NAMES}
                 />