diff --git a/src/pages/AddPersonalBankAccountPage.tsx b/src/pages/AddPersonalBankAccountPage.tsx index 58a2546f30c0..732805dde6af 100644 --- a/src/pages/AddPersonalBankAccountPage.tsx +++ b/src/pages/AddPersonalBankAccountPage.tsx @@ -26,7 +26,6 @@ function AddPersonalBankAccountPage() { const styles = useThemeStyles(); const {translate} = useLocalize(); const [selectedPlaidAccountId, setSelectedPlaidAccountId] = useState(''); - const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => account?.validated, canBeMissing: false}); const [personalBankAccount] = useOnyx(ONYXKEYS.PERSONAL_BANK_ACCOUNT, {canBeMissing: true}); const [plaidData] = useOnyx(ONYXKEYS.PLAID_DATA, {canBeMissing: true}); const shouldShowSuccess = personalBankAccount?.shouldShowSuccess ?? false; @@ -83,7 +82,7 @@ function AddPersonalBankAccountPage() { shouldShowOfflineIndicator={false} testID={AddPersonalBankAccountPage.displayName} > - + account?.validated, canBeMissing: false}); const onCountrySelected = useCallback(() => { if (currentCountry === CONST.COUNTRY.US) { - Navigation.navigate(ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT); + if (isUserValidated) { + Navigation.navigate(ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT); + } else { + Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_VERIFY_ACCOUNT.getRoute(Navigation.getActiveRoute(), ROUTES.SETTINGS_ADD_US_BANK_ACCOUNT)); + } return; } if (isEditing && formValues.bankCountry === currentCountry) { @@ -36,7 +43,7 @@ function CountrySelection({isEditing, onNext, formValues, resetScreenIndex}: Cus } fetchCorpayFields(currentCountry); resetScreenIndex?.(CONST.CORPAY_FIELDS.INDEXES.MAPPING.BANK_ACCOUNT_DETAILS); - }, [currentCountry, formValues.bankCountry, isEditing, onNext, resetScreenIndex]); + }, [currentCountry, formValues.bankCountry, isEditing, onNext, resetScreenIndex, isUserValidated]); const onSelectionChange = useCallback((country: Option) => { setCurrentCountry(country.value);