diff --git a/src/components/AddPlaidBankAccount.tsx b/src/components/AddPlaidBankAccount.tsx
index e4efbc3e13ab..366f14ec9780 100644
--- a/src/components/AddPlaidBankAccount.tsx
+++ b/src/components/AddPlaidBankAccount.tsx
@@ -63,7 +63,7 @@ type AddPlaidBankAccountProps = AddPlaidBankAccountOnyxProps & {
isDisplayedInNewVBBA?: boolean;
/** Is displayed in new enable wallet flow */
- isNewWalletFlow?: boolean;
+ isDisplayedInWalletFlow?: boolean;
/** Text to display on error message */
errorText?: string;
@@ -87,7 +87,7 @@ function AddPlaidBankAccount({
isDisplayedInNewVBBA = false,
errorText = '',
onInputChange = () => {},
- isNewWalletFlow = false,
+ isDisplayedInWalletFlow = false,
}: AddPlaidBankAccountProps) {
const theme = useTheme();
const styles = useThemeStyles();
@@ -259,10 +259,10 @@ function AddPlaidBankAccount({
return {renderPlaidLink()};
}
- if (isDisplayedInNewVBBA || isNewWalletFlow) {
+ if (isDisplayedInNewVBBA || isDisplayedInWalletFlow) {
return (
- {translate(isNewWalletFlow ? 'walletPage.chooseYourBankAccount' : 'bankAccount.chooseAnAccount')}
+ {translate(isDisplayedInWalletFlow ? 'walletPage.chooseYourBankAccount' : 'bankAccount.chooseAnAccount')}
{!!text && {text}}
{translate('walletPage.addBankAccountBody')}
diff --git a/src/pages/EnablePayments/AddBankAccount/substeps/PlaidStep.tsx b/src/pages/EnablePayments/AddBankAccount/substeps/PlaidStep.tsx
index 1f397a73651d..c64c6356ba5b 100644
--- a/src/pages/EnablePayments/AddBankAccount/substeps/PlaidStep.tsx
+++ b/src/pages/EnablePayments/AddBankAccount/substeps/PlaidStep.tsx
@@ -80,7 +80,7 @@ function PlaidStep({personalBankAccountDraft, onNext, plaidData}: PlaidStepProps
plaidData={plaidData}
onExitPlaid={BankAccounts.clearPersonalBankAccountSetupType}
allowDebit
- isNewWalletFlow
+ isDisplayedInWalletFlow
selectedPlaidAccountID={selectedPlaidAccountID}
inputID={BANK_INFO_STEP_KEYS.SELECTED_PLAID_ACCOUNT_ID}
defaultValue={selectedPlaidAccountID}
diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
index 8eea5b3f3a34..c28a0f6649e4 100644
--- a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
+++ b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
@@ -397,7 +397,13 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
navigateToWalletOrTransferBalancePage(source)}
- onSelectPaymentMethod={() => Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT)}
+ onSelectPaymentMethod={(selectedPaymentMethod: string) => {
+ if (hasActivatedWallet || selectedPaymentMethod !== CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT) {
+ return;
+ }
+ // To allow upgrading to a gold wallet, continue with the KYC flow after adding a bank account
+ BankAccounts.setPersonalBankAccountContinueKYCOnSuccess(ROUTES.SETTINGS_WALLET);
+ }}
enablePaymentsRoute={ROUTES.SETTINGS_ENABLE_PAYMENTS}
addBankAccountRoute={ROUTES.SETTINGS_ADD_BANK_ACCOUNT}
addDebitCardRoute={ROUTES.SETTINGS_ADD_DEBIT_CARD}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index b6838ea4c09c..a736bc537fa6 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -418,11 +418,6 @@ const styles = (theme: ThemeColors) =>
fontSize: variables.fontSizeLarge,
},
- textXLarge: {
- fontSize: variables.fontSizeXLarge,
- lineHeight: variables.lineHeightXXLarge,
- },
-
textXXLarge: {
fontSize: variables.fontSizeXXLarge,
},