From a0083f6e5000467901b4b00bdda58943886c0ef8 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Mon, 7 Feb 2022 11:46:41 -1000 Subject: [PATCH 1/3] Do not show select screens when there are only a single payment method to choose from --- .../settings/Payments/TransferBalancePage.js | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js index 644d5f3f1409..7badb808c80a 100644 --- a/src/pages/settings/Payments/TransferBalancePage.js +++ b/src/pages/settings/Payments/TransferBalancePage.js @@ -146,6 +146,27 @@ class TransferBalancePage extends React.Component { */ navigateToChooseTransferAccount(filterPaymentMethodType) { PaymentMethods.saveWalletTransferMethodType(filterPaymentMethodType); + + // If we only have a single option for the given paymentMethodType do not force the user to make a selection + const combinedPaymentMethods = PaymentUtils.formatPaymentMethods( + this.props.bankAccountList, + this.props.cardList, + this.props.payPalMeUsername, + this.props.userWallet, + ); + + const filteredMethods = _.filter(combinedPaymentMethods, paymentMethod => paymentMethod.accountType === filterPaymentMethodType); + if (filteredMethods.length === 1) { + const account = _.first(filteredMethods); + PaymentMethods.saveWalletTransferAccountTypeAndID( + filterPaymentMethodType, + filterPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT + ? account.bankAccountID + : account.fundID, + ); + return; + } + Navigation.navigate(ROUTES.SETTINGS_PAYMENTS_CHOOSE_TRANSFER_ACCOUNT); } @@ -273,6 +294,9 @@ export default compose( bankAccountList: { key: ONYXKEYS.BANK_ACCOUNT_LIST, }, + payPalMeUsername: { + key: ONYXKEYS.NVP_PAYPAL_ME_ADDRESS, + }, cardList: { key: ONYXKEYS.CARD_LIST, }, From 0e30dc2db3c48510e0fe9ce9c7c30b4a39aa0867 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Mon, 7 Feb 2022 12:42:06 -1000 Subject: [PATCH 2/3] Use methodID to select account --- src/pages/settings/Payments/TransferBalancePage.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js index 7badb808c80a..4144e174bd9e 100644 --- a/src/pages/settings/Payments/TransferBalancePage.js +++ b/src/pages/settings/Payments/TransferBalancePage.js @@ -160,9 +160,7 @@ class TransferBalancePage extends React.Component { const account = _.first(filteredMethods); PaymentMethods.saveWalletTransferAccountTypeAndID( filterPaymentMethodType, - filterPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT - ? account.bankAccountID - : account.fundID, + account.methodID, ); return; } From a4f9d4b0aea47996c90f0bdc022ed5cc333f781e Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Mon, 7 Feb 2022 12:46:58 -1000 Subject: [PATCH 3/3] Dont connect to paypalme --- src/pages/settings/Payments/TransferBalancePage.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js index 4144e174bd9e..1face1c3e3e5 100644 --- a/src/pages/settings/Payments/TransferBalancePage.js +++ b/src/pages/settings/Payments/TransferBalancePage.js @@ -151,7 +151,7 @@ class TransferBalancePage extends React.Component { const combinedPaymentMethods = PaymentUtils.formatPaymentMethods( this.props.bankAccountList, this.props.cardList, - this.props.payPalMeUsername, + '', this.props.userWallet, ); @@ -292,9 +292,6 @@ export default compose( bankAccountList: { key: ONYXKEYS.BANK_ACCOUNT_LIST, }, - payPalMeUsername: { - key: ONYXKEYS.NVP_PAYPAL_ME_ADDRESS, - }, cardList: { key: ONYXKEYS.CARD_LIST, },