From bbc245dedc5924e6bdc0bd30a7da4c30f0af0bb5 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Mon, 26 Jul 2021 17:17:49 -0600 Subject: [PATCH 1/6] Don't get paypal address in user details --- src/libs/actions/User.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js index 6e7c895b6552..e2428a124d04 100644 --- a/src/libs/actions/User.js +++ b/src/libs/actions/User.js @@ -69,7 +69,7 @@ function getBetas() { function getUserDetails() { API.Get({ returnValueList: 'account, loginList, nameValuePairs', - nvpNames: [CONST.NVP.BLOCKED_FROM_CONCIERGE, CONST.NVP.PAYPAL_ME_ADDRESS].join(','), + nvpNames: CONST.NVP.PAYPAL_ME_ADDRESS, }) .then((response) => { // Update the User onyx key From d77e5d84b2fcf51b24c1692f87c602a2319defee Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Mon, 26 Jul 2021 17:53:18 -0600 Subject: [PATCH 2/6] Don't hide add payment button --- .../settings/Payments/PaymentMethodList.js | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js index c76ac9024f4e..4b1de753a7fd 100644 --- a/src/pages/settings/Payments/PaymentMethodList.js +++ b/src/pages/settings/Payments/PaymentMethodList.js @@ -130,19 +130,14 @@ class PaymentMethodList extends Component { }); } - // Don't show Add Payment Method button if user provided details for all possible payment methods. - // Right now only available method is Paypal.me - // When there is a new payment method, it needs to be added to following if condition. - if (!this.props.payPalMeUsername) { - combinedPaymentMethods.push({ - type: MENU_ITEM, - title: this.props.translate('paymentMethodList.addPaymentMethod'), - icon: Plus, - onPress: e => this.props.onPress(e), - key: 'addPaymentMethodButton', - disabled: this.props.isLoadingPayments, - }); - } + combinedPaymentMethods.push({ + type: MENU_ITEM, + title: this.props.translate('paymentMethodList.addPaymentMethod'), + icon: Plus, + onPress: e => this.props.onPress(e), + key: 'addPaymentMethodButton', + disabled: this.props.isLoadingPayments, + }); return combinedPaymentMethods; } From fa67efba11b5d0080c9714d9c852cb15516b27b9 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Mon, 26 Jul 2021 17:56:55 -0600 Subject: [PATCH 3/6] Return to payments page after setting paypal username --- src/pages/settings/Payments/AddPayPalMePage.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/Payments/AddPayPalMePage.js b/src/pages/settings/Payments/AddPayPalMePage.js index 46928e99cd7b..8034b3801fa2 100644 --- a/src/pages/settings/Payments/AddPayPalMePage.js +++ b/src/pages/settings/Payments/AddPayPalMePage.js @@ -9,7 +9,7 @@ import HeaderWithCloseButton from '../../../components/HeaderWithCloseButton'; import Text from '../../../components/Text'; import ScreenWrapper from '../../../components/ScreenWrapper'; import NameValuePair from '../../../libs/actions/NameValuePair'; -import {getUserDetails} from '../../../libs/actions/User'; +import getPaymentMethods from '../../../libs/actions/PaymentMethods'; import Navigation from '../../../libs/Navigation/Navigation'; import styles from '../../../styles/styles'; import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; @@ -42,7 +42,7 @@ class AddPayPalMePage extends React.Component { } componentDidMount() { - getUserDetails(); + getPaymentMethods(); } componentDidUpdate(prevProps) { @@ -59,6 +59,7 @@ class AddPayPalMePage extends React.Component { setPayPalMeUsername() { NameValuePair.set(CONST.NVP.PAYPAL_ME_ADDRESS, this.state.payPalMeUsername, ONYXKEYS.NVP_PAYPAL_ME_ADDRESS); Growl.show(this.props.translate('addPayPalMePage.growlMessageOnSave'), CONST.GROWL.SUCCESS, 3000); + Navigation.navigate(ROUTES.SETTINGS_PAYMENTS); } render() { From be75beb9507caca162db897ff933e62b45ed1e34 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Mon, 26 Jul 2021 19:36:22 -0600 Subject: [PATCH 4/6] Always show add paypal.me button --- src/pages/settings/Payments/PaymentsPage.js | 23 +++++---------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/pages/settings/Payments/PaymentsPage.js b/src/pages/settings/Payments/PaymentsPage.js index 3d266d1cfa48..70296695c111 100644 --- a/src/pages/settings/Payments/PaymentsPage.js +++ b/src/pages/settings/Payments/PaymentsPage.js @@ -1,8 +1,5 @@ import React from 'react'; import {View} from 'react-native'; -import PropTypes from 'prop-types'; -import {withOnyx} from 'react-native-onyx'; -import ONYXKEYS from '../../../ONYXKEYS'; import PaymentMethodList from './PaymentMethodList'; import ROUTES from '../../../ROUTES'; import HeaderWithCloseButton from '../../../components/HeaderWithCloseButton'; @@ -23,9 +20,6 @@ import CurrentWalletBalance from '../../../components/CurrentWalletBalance'; const PAYPAL = 'payPalMe'; const propTypes = { - /** User's paypal.me username if they have one */ - payPalMeUsername: PropTypes.string, - ...withLocalizePropTypes, }; @@ -129,13 +123,11 @@ class PaymentsPage extends React.Component { left: this.state.anchorPositionLeft, }} > - {!this.props.payPalMeUsername && ( - this.addPaymentMethodTypePressed(PAYPAL)} - /> - )} + this.addPaymentMethodTypePressed(PAYPAL)} + /> @@ -149,9 +141,4 @@ PaymentsPage.displayName = 'PaymentsPage'; export default compose( withLocalize, - withOnyx({ - payPalMeUsername: { - key: ONYXKEYS.NVP_PAYPAL_ME_ADDRESS, - }, - }), )(PaymentsPage); From d1286e98cb5927274e901ecc288fb4a92d7d61c9 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Tue, 27 Jul 2021 11:33:52 -0600 Subject: [PATCH 5/6] Change button to make more sense when editing paypal.me username --- src/languages/en.js | 1 + src/languages/es.js | 3 ++- src/pages/settings/Payments/AddPayPalMePage.js | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 0d38c1bcf102..b21ec2fe5094 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -240,6 +240,7 @@ export default { payPalMe: 'PayPal.me/', yourPayPalUsername: 'Your PayPal username', addPayPalAccount: 'Add PayPal Account', + editPayPalAccount: 'Update PayPal Account', growlMessageOnSave: 'Your PayPal username was successfully added', }, paymentsPage: { diff --git a/src/languages/es.js b/src/languages/es.js index 674258988066..f64ab3df8e51 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -231,7 +231,8 @@ export default { enterYourUsernameToGetPaidViaPayPal: 'Escribe tu nombre de usuario para que otros puedan pagarte a través de PayPal.', payPalMe: 'PayPal.me/', yourPayPalUsername: 'Tu usuario de PayPal', - addPayPalAccount: 'Agregar Cuenta de Paypal', + addPayPalAccount: 'Agregar Cuenta de PayPal', + editPayPalAccount: 'Actualizar Cuenta de PayPal', }, paymentsPage: { paymentMethodsTitle: 'Métodos de pago', diff --git a/src/pages/settings/Payments/AddPayPalMePage.js b/src/pages/settings/Payments/AddPayPalMePage.js index 8034b3801fa2..97edbe423773 100644 --- a/src/pages/settings/Payments/AddPayPalMePage.js +++ b/src/pages/settings/Payments/AddPayPalMePage.js @@ -103,7 +103,9 @@ class AddPayPalMePage extends React.Component { onPress={this.setPayPalMeUsername} pressOnEnter style={[styles.mt3]} - text={this.props.translate('addPayPalMePage.addPayPalAccount')} + text={this.props.payPalMeUsername + ? this.props.translate('addPayPalMePage.editPayPalAccount') + : this.props.translate('addPayPalMePage.addPayPalAccount')} /> From 0f61e964f86179e01738281ae4095eac806496fb Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Wed, 28 Jul 2021 12:36:52 -0600 Subject: [PATCH 6/6] Un-capitalize --- src/languages/es.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/es.js b/src/languages/es.js index f64ab3df8e51..6f34b545cbc4 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -231,8 +231,8 @@ export default { enterYourUsernameToGetPaidViaPayPal: 'Escribe tu nombre de usuario para que otros puedan pagarte a través de PayPal.', payPalMe: 'PayPal.me/', yourPayPalUsername: 'Tu usuario de PayPal', - addPayPalAccount: 'Agregar Cuenta de PayPal', - editPayPalAccount: 'Actualizar Cuenta de PayPal', + addPayPalAccount: 'Agregar cuenta de PayPal', + editPayPalAccount: 'Actualizar cuenta de PayPal', }, paymentsPage: { paymentMethodsTitle: 'Métodos de pago',