From 0924012934b16f3b123eaae4bba0f4f247c0df9b Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Wed, 16 Aug 2023 10:56:19 -0500 Subject: [PATCH 1/3] Rename Payments page to Wallet page --- src/ROUTES.js | 14 +++++----- src/components/SettlementButton.js | 2 +- src/languages/en.js | 3 +- src/languages/es.js | 3 +- .../AppNavigator/ModalStackNavigators.js | 22 +++++++-------- src/libs/Navigation/linkingConfig.js | 14 +++++----- src/libs/actions/BankAccounts.js | 4 +-- src/libs/actions/PaymentMethods.js | 6 ++-- src/libs/actions/User.js | 2 +- src/pages/AddPersonalBankAccountPage.js | 2 +- .../EnablePayments/EnablePaymentsPage.js | 2 +- src/pages/settings/InitialSettingsPage.js | 6 ++-- .../settings/Payments/PaymentsPage/index.js | 10 ------- .../Payments/PaymentsPage/index.native.js | 3 -- .../{Payments => Wallet}/AddDebitCardPage.js | 2 +- .../{Payments => Wallet}/AddPayPalMePage.js | 4 +-- .../ChooseTransferAccountPage.js | 4 +-- .../{Payments => Wallet}/PaymentMethodList.js | 0 .../TransferBalancePage.js | 6 ++-- .../WalletPage/BaseWalletPage.js} | 28 +++++++++---------- src/pages/settings/Wallet/WalletPage/index.js | 10 +++++++ .../Wallet/WalletPage/index.native.js | 3 ++ .../WalletPage/walletPagePropTypes.js} | 0 .../walletTransferPropTypes.js | 0 src/pages/workspace/WorkspacesListPage.js | 2 +- 25 files changed, 77 insertions(+), 75 deletions(-) delete mode 100644 src/pages/settings/Payments/PaymentsPage/index.js delete mode 100644 src/pages/settings/Payments/PaymentsPage/index.native.js rename src/pages/settings/{Payments => Wallet}/AddDebitCardPage.js (99%) rename src/pages/settings/{Payments => Wallet}/AddPayPalMePage.js (98%) rename src/pages/settings/{Payments => Wallet}/ChooseTransferAccountPage.js (97%) rename src/pages/settings/{Payments => Wallet}/PaymentMethodList.js (100%) rename src/pages/settings/{Payments => Wallet}/TransferBalancePage.js (99%) rename src/pages/settings/{Payments/PaymentsPage/BasePaymentsPage.js => Wallet/WalletPage/BaseWalletPage.js} (96%) create mode 100644 src/pages/settings/Wallet/WalletPage/index.js create mode 100644 src/pages/settings/Wallet/WalletPage/index.native.js rename src/pages/settings/{Payments/PaymentsPage/paymentsPagePropTypes.js => Wallet/WalletPage/walletPagePropTypes.js} (100%) rename src/pages/settings/{Payments => Wallet}/walletTransferPropTypes.js (100%) diff --git a/src/ROUTES.js b/src/ROUTES.js index 6c0365e40568..51cd5d8b4540 100644 --- a/src/ROUTES.js +++ b/src/ROUTES.js @@ -39,14 +39,14 @@ export default { SETTINGS_CLOSE: 'settings/security/closeAccount', SETTINGS_ABOUT: 'settings/about', SETTINGS_APP_DOWNLOAD_LINKS: 'settings/about/app-download-links', - SETTINGS_PAYMENTS: 'settings/payments', - SETTINGS_ADD_PAYPAL_ME: 'settings/payments/add-paypal-me', - SETTINGS_ADD_DEBIT_CARD: 'settings/payments/add-debit-card', - SETTINGS_ADD_BANK_ACCOUNT: 'settings/payments/add-bank-account', - SETTINGS_ENABLE_PAYMENTS: 'settings/payments/enable-payments', + SETTINGS_WALLET: 'settings/wallet', + SETTINGS_ADD_PAYPAL_ME: 'settings/wallet/add-paypal-me', + SETTINGS_ADD_DEBIT_CARD: 'settings/wallet/add-debit-card', + SETTINGS_ADD_BANK_ACCOUNT: 'settings/wallet/add-bank-account', + SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments', getSettingsAddLoginRoute: (type) => `settings/addlogin/${type}`, - SETTINGS_PAYMENTS_TRANSFER_BALANCE: 'settings/payments/transfer-balance', - SETTINGS_PAYMENTS_CHOOSE_TRANSFER_ACCOUNT: 'settings/payments/choose-transfer-account', + SETTINGS_WALLET_TRANSFER_BALANCE: 'settings/wallet/transfer-balance', + SETTINGS_WALLET_CHOOSE_TRANSFER_ACCOUNT: 'settings/wallet/choose-transfer-account', SETTINGS_PERSONAL_DETAILS, SETTINGS_PERSONAL_DETAILS_LEGAL_NAME: `${SETTINGS_PERSONAL_DETAILS}/legal-name`, SETTINGS_PERSONAL_DETAILS_DATE_OF_BIRTH: `${SETTINGS_PERSONAL_DETAILS}/date-of-birth`, diff --git a/src/components/SettlementButton.js b/src/components/SettlementButton.js index 78ebbce42798..628fb8681007 100644 --- a/src/components/SettlementButton.js +++ b/src/components/SettlementButton.js @@ -85,7 +85,7 @@ const defaultProps = { class SettlementButton extends React.Component { componentDidMount() { - PaymentMethods.openPaymentsPage(); + PaymentMethods.openWalletPage(); } getButtonOptionsFromProps() { diff --git a/src/languages/en.js b/src/languages/en.js index 229166a3f858..d8a0b086a9d4 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -30,6 +30,7 @@ export default { workspaces: 'Workspaces', profile: 'Profile', payments: 'Payments', + wallet: 'Wallet', preferences: 'Preferences', view: 'View', not: 'Not', @@ -646,7 +647,7 @@ export default { password: 'Please enter your Expensify password', }, }, - paymentsPage: { + walletPage: { paymentMethodsTitle: 'Payment methods', setDefaultConfirmation: 'Make default payment method', setDefaultSuccess: 'Default payment method set!', diff --git a/src/languages/es.js b/src/languages/es.js index 0e24a386cd14..8331ed267a4c 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -29,6 +29,7 @@ export default { workspaces: 'Espacios de trabajo', profile: 'Perfil', payments: 'Pagos', + wallet: 'Billetera', preferences: 'Preferencias', view: 'Ver', not: 'No', @@ -647,7 +648,7 @@ export default { password: 'Por favor, introduce tu contraseña de Expensify', }, }, - paymentsPage: { + walletPage: { paymentMethodsTitle: 'Métodos de pago', setDefaultConfirmation: 'Marcar como método de pago predeterminado', setDefaultSuccess: 'Método de pago configurado', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js index 8a489afb035e..f9f15c163555 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js @@ -85,7 +85,7 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator([ }, { getComponent: () => { - const AddDebitCardPage = require('../../../pages/settings/Payments/AddDebitCardPage').default; + const AddDebitCardPage = require('../../../pages/settings/Wallet/AddDebitCardPage').default; return AddDebitCardPage; }, name: 'IOU_Send_Add_Debit_Card', @@ -468,28 +468,28 @@ const SettingsModalStackNavigator = createModalStackNavigator([ }, { getComponent: () => { - const SettingsPaymentsPage = require('../../../pages/settings/Payments/PaymentsPage').default; - return SettingsPaymentsPage; + const SettingsWalletPage = require('../../../pages/settings/Wallet/WalletPage').default; + return SettingsWalletPage; }, - name: 'Settings_Payments', + name: 'Settings_Wallet', }, { getComponent: () => { - const TransferBalancePage = require('../../../pages/settings/Payments/TransferBalancePage').default; + const TransferBalancePage = require('../../../pages/settings/Wallet/TransferBalancePage').default; return TransferBalancePage; }, - name: 'Settings_Payments_Transfer_Balance', + name: 'Settings_Wallet_Transfer_Balance', }, { getComponent: () => { - const ChooseTransferAccountPage = require('../../../pages/settings/Payments/ChooseTransferAccountPage').default; + const ChooseTransferAccountPage = require('../../../pages/settings/Wallet/ChooseTransferAccountPage').default; return ChooseTransferAccountPage; }, - name: 'Settings_Payments_Choose_Transfer_Account', + name: 'Settings_Wallet_Choose_Transfer_Account', }, { getComponent: () => { - const SettingsAddPayPalMePage = require('../../../pages/settings/Payments/AddPayPalMePage').default; + const SettingsAddPayPalMePage = require('../../../pages/settings/Wallet/AddPayPalMePage').default; return SettingsAddPayPalMePage; }, name: 'Settings_Add_Paypal_Me', @@ -499,11 +499,11 @@ const SettingsModalStackNavigator = createModalStackNavigator([ const EnablePaymentsPage = require('../../../pages/EnablePayments/EnablePaymentsPage').default; return EnablePaymentsPage; }, - name: 'Settings_Payments_EnablePayments', + name: 'Settings_Wallet_EnablePayments', }, { getComponent: () => { - const AddDebitCardPage = require('../../../pages/settings/Payments/AddDebitCardPage').default; + const AddDebitCardPage = require('../../../pages/settings/Wallet/AddDebitCardPage').default; return AddDebitCardPage; }, name: 'Settings_Add_Debit_Card', diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js index dcc4f77fde73..8a5d82406bf1 100644 --- a/src/libs/Navigation/linkingConfig.js +++ b/src/libs/Navigation/linkingConfig.js @@ -66,20 +66,20 @@ export default { path: ROUTES.SETTINGS_SECURITY, exact: true, }, - Settings_Payments: { - path: ROUTES.SETTINGS_PAYMENTS, + Settings_Wallet: { + path: ROUTES.SETTINGS_WALLET, exact: true, }, - Settings_Payments_EnablePayments: { + Settings_Wallet_EnablePayments: { path: ROUTES.SETTINGS_ENABLE_PAYMENTS, exact: true, }, - Settings_Payments_Transfer_Balance: { - path: ROUTES.SETTINGS_PAYMENTS_TRANSFER_BALANCE, + Settings_Wallet_Transfer_Balance: { + path: ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE, exact: true, }, - Settings_Payments_Choose_Transfer_Account: { - path: ROUTES.SETTINGS_PAYMENTS_CHOOSE_TRANSFER_ACCOUNT, + Settings_Wallet_Choose_Transfer_Account: { + path: ROUTES.SETTINGS_WALLET_CHOOSE_TRANSFER_ACCOUNT, exact: true, }, Settings_Add_Paypal_Me: { diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js index 43e00c104f48..dad3afea82c5 100644 --- a/src/libs/actions/BankAccounts.js +++ b/src/libs/actions/BankAccounts.js @@ -88,7 +88,7 @@ function getVBBADataForOnyx() { key: ONYXKEYS.REIMBURSEMENT_ACCOUNT, value: { isLoading: false, - errors: ErrorUtils.getMicroSecondOnyxError('paymentsPage.addBankAccountFailure'), + errors: ErrorUtils.getMicroSecondOnyxError('walletPage.addBankAccountFailure'), }, }, ], @@ -165,7 +165,7 @@ function addPersonalBankAccount(account) { key: ONYXKEYS.PERSONAL_BANK_ACCOUNT, value: { isLoading: false, - errors: ErrorUtils.getMicroSecondOnyxError('paymentsPage.addBankAccountFailure'), + errors: ErrorUtils.getMicroSecondOnyxError('walletPage.addBankAccountFailure'), }, }, ], diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index fbde06231826..705a9cbc23d5 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -13,7 +13,7 @@ import ROUTES from '../../ROUTES'; function deletePayPalMe() { User.deletePaypalMeAddress(); - Growl.show(Localize.translateLocal('paymentsPage.deletePayPalSuccess'), CONST.GROWL.SUCCESS, 3000); + Growl.show(Localize.translateLocal('walletPage.deletePayPalSuccess'), CONST.GROWL.SUCCESS, 3000); } /** @@ -35,7 +35,7 @@ function continueSetup() { kycWallRef.current.continue(); } -function openPaymentsPage() { +function openWalletPage() { const onyxData = { optimisticData: [ { @@ -274,7 +274,7 @@ function saveWalletTransferMethodType(filterPaymentMethodType) { function dismissSuccessfulTransferBalancePage() { Onyx.merge(ONYXKEYS.WALLET_TRANSFER, {shouldShowSuccess: false}); - Navigation.goBack(ROUTES.SETTINGS_PAYMENTS); + Navigation.goBack(ROUTES.SETTINGS_WALLET); } /** diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js index 7f7078c45379..9648b77220ac 100644 --- a/src/libs/actions/User.js +++ b/src/libs/actions/User.js @@ -517,7 +517,7 @@ function deletePaypalMeAddress() { ]; API.write('DeletePaypalMeAddress', {}, {optimisticData, successData}); - Growl.show(Localize.translateLocal('paymentsPage.deletePayPalSuccess'), CONST.GROWL.SUCCESS, 3000); + Growl.show(Localize.translateLocal('walletPage.deletePayPalSuccess'), CONST.GROWL.SUCCESS, 3000); } function triggerNotifications(onyxUpdates) { diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js index 96140b33928f..8ef8b71b90d0 100644 --- a/src/pages/AddPersonalBankAccountPage.js +++ b/src/pages/AddPersonalBankAccountPage.js @@ -91,7 +91,7 @@ class AddPersonalBankAccountPage extends React.Component { if (exitReportID) { Navigation.dismissModal(exitReportID); } else { - Navigation.goBack(ROUTES.SETTINGS_PAYMENTS); + Navigation.goBack(ROUTES.SETTINGS_WALLET); } } diff --git a/src/pages/EnablePayments/EnablePaymentsPage.js b/src/pages/EnablePayments/EnablePaymentsPage.js index e0a1f5a22eee..d62099167ced 100644 --- a/src/pages/EnablePayments/EnablePaymentsPage.js +++ b/src/pages/EnablePayments/EnablePaymentsPage.js @@ -62,7 +62,7 @@ class EnablePaymentsPage extends React.Component { <> Navigation.goBack(ROUTES.SETTINGS_PAYMENTS)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)} /> diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index 825da39244d8..081fac4b34a0 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -228,10 +228,10 @@ function InitialSettingsPage(props) { }, }, { - translationKey: 'common.payments', + translationKey: 'common.wallet', icon: Expensicons.Wallet, action: () => { - Navigation.navigate(ROUTES.SETTINGS_PAYMENTS); + Navigation.navigate(ROUTES.SETTINGS_WALLET); }, brickRoadIndicator: PaymentMethods.hasPaymentMethodError(props.bankAccountList, paymentCardList) || !_.isEmpty(props.userWallet.errors) || !_.isEmpty(props.walletTerms.errors) @@ -289,7 +289,7 @@ function InitialSettingsPage(props) { <> {_.map(getDefaultMenuItems, (item, index) => { const keyTitle = item.translationKey ? translate(item.translationKey) : item.title; - const isPaymentItem = item.translationKey === 'common.payments'; + const isPaymentItem = item.translationKey === 'common.wallet'; return ( ; -} - -PaymentsPage.displayName = 'PaymentsPage'; - -export default PaymentsPage; diff --git a/src/pages/settings/Payments/PaymentsPage/index.native.js b/src/pages/settings/Payments/PaymentsPage/index.native.js deleted file mode 100644 index b0b43a8e6661..000000000000 --- a/src/pages/settings/Payments/PaymentsPage/index.native.js +++ /dev/null @@ -1,3 +0,0 @@ -import BasePaymentsPage from './BasePaymentsPage'; - -export default BasePaymentsPage; diff --git a/src/pages/settings/Payments/AddDebitCardPage.js b/src/pages/settings/Wallet/AddDebitCardPage.js similarity index 99% rename from src/pages/settings/Payments/AddDebitCardPage.js rename to src/pages/settings/Wallet/AddDebitCardPage.js index 4d9d53c98870..7a04db30abed 100644 --- a/src/pages/settings/Payments/AddDebitCardPage.js +++ b/src/pages/settings/Wallet/AddDebitCardPage.js @@ -104,7 +104,7 @@ function DebitCardPage(props) { > Navigation.goBack(ROUTES.SETTINGS_PAYMENTS)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)} />
{ User.addPaypalMeAddress(values.payPalMeUsername); Growl.show(growlMessageOnSave, CONST.GROWL.SUCCESS, 3000); - Navigation.goBack(ROUTES.SETTINGS_PAYMENTS); + Navigation.goBack(ROUTES.SETTINGS_WALLET); }, [growlMessageOnSave], ); @@ -68,7 +68,7 @@ function AddPayPalMePage(props) { payPalMeInput.current && payPalMeInput.current.focus()}> Navigation.goBack(ROUTES.SETTINGS_PAYMENTS)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)} /> { PaymentMethods.saveWalletTransferAccountTypeAndID(accountType, accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT ? account.bankAccountID : account.fundID); - Navigation.goBack(ROUTES.SETTINGS_PAYMENTS_TRANSFER_BALANCE); + Navigation.goBack(ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE); }; /** @@ -55,7 +55,7 @@ function ChooseTransferAccountPage(props) { Navigation.goBack(ROUTES.SETTINGS_PAYMENTS_TRANSFER_BALANCE)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE)} /> { @@ -181,12 +181,12 @@ function TransferBalancePage(props) { subtitleKey="transferAmountPage.notHereSubTitle" shouldShowLink linkKey="transferAmountPage.goToPayment" - onLinkPress={() => Navigation.goBack(ROUTES.SETTINGS_PAYMENTS)} + onLinkPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)} > Navigation.goBack(ROUTES.SETTINGS_PAYMENTS)} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)} /> diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js similarity index 96% rename from src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js rename to src/pages/settings/Wallet/WalletPage/BaseWalletPage.js index 359809dda0f1..ffe2d9303ed9 100644 --- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js +++ b/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js @@ -22,7 +22,7 @@ import AddPaymentMethodMenu from '../../../../components/AddPaymentMethodMenu'; import CONST from '../../../../CONST'; import * as Expensicons from '../../../../components/Icon/Expensicons'; import KYCWall from '../../../../components/KYCWall'; -import {propTypes, defaultProps} from './paymentsPagePropTypes'; +import {propTypes, defaultProps} from './walletPagePropTypes'; import {withNetwork} from '../../../../components/OnyxProvider'; import * as PaymentUtils from '../../../../libs/PaymentUtils'; import OfflineWithFeedback from '../../../../components/OfflineWithFeedback'; @@ -33,7 +33,7 @@ import variables from '../../../../styles/variables'; import useLocalize from '../../../../hooks/useLocalize'; import useWindowDimensions from '../../../../hooks/useWindowDimensions'; -function BasePaymentsPage(props) { +function BaseWalletPage(props) { const {translate} = useLocalize(); const {isSmallScreenWidth, windowWidth} = useWindowDimensions(); const [shouldShowAddPaymentMenu, setShouldShowAddPaymentMenu] = useState(false); @@ -257,7 +257,7 @@ function BasePaymentsPage(props) { }, [paymentMethod.selectedPaymentMethod.bankAccountID, paymentMethod.selectedPaymentMethod.fundID, paymentMethod.selectedPaymentMethodType, resetSelectedPaymentMethodData]); const navigateToTransferBalancePage = () => { - Navigation.navigate(ROUTES.SETTINGS_PAYMENTS_TRANSFER_BALANCE); + Navigation.navigate(ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE); }; const navigateToAddPaypalRoute = () => { @@ -310,14 +310,14 @@ function BasePaymentsPage(props) { )} )} - {translate('paymentsPage.paymentMethodsTitle')} + {translate('walletPage.paymentMethodsTitle')} ), [props.betas, props.network.isOffline, props.userWallet.currentBalance, props.walletTerms.errors, shouldShowLoadingSpinner, translate], ); useEffect(() => { - PaymentMethods.openPaymentsPage(); + PaymentMethods.openWalletPage(); }, []); useEffect(() => { @@ -333,7 +333,7 @@ function BasePaymentsPage(props) { if (props.network.isOffline) { return; } - PaymentMethods.openPaymentsPage(); + PaymentMethods.openWalletPage(); }, [props.network.isOffline]); useEffect(() => { @@ -379,7 +379,7 @@ function BasePaymentsPage(props) { return ( Navigation.goBack(ROUTES.SETTINGS)} /> @@ -439,7 +439,7 @@ function BasePaymentsPage(props) { setShouldShowDefaultDeleteMenu(false); makeDefaultPaymentMethod(); }} - text={translate('paymentsPage.setDefaultConfirmation')} + text={translate('walletPage.setDefaultConfirmation')} /> )} {isPayPalMeSelected && ( @@ -468,8 +468,8 @@ function BasePaymentsPage(props) { }} onCancel={hideDefaultDeleteMenu} contentStyles={!isSmallScreenWidth ? [styles.sidebarPopover, styles.willChangeTransform] : undefined} - title={translate('paymentsPage.deleteAccount')} - prompt={translate('paymentsPage.deleteConfirmation')} + title={translate('walletPage.deleteAccount')} + prompt={translate('walletPage.deleteConfirmation')} confirmText={translate('common.delete')} cancelText={translate('common.cancel')} anchorPosition={{ @@ -485,9 +485,9 @@ function BasePaymentsPage(props) { ); } -BasePaymentsPage.propTypes = propTypes; -BasePaymentsPage.defaultProps = defaultProps; -BasePaymentsPage.displayName = BasePaymentsPage; +BaseWalletPage.propTypes = propTypes; +BaseWalletPage.defaultProps = defaultProps; +BaseWalletPage.displayName = BaseWalletPage; export default compose( withNetwork(), @@ -520,4 +520,4 @@ export default compose( key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS, }, }), -)(BasePaymentsPage); +)(BaseWalletPage); diff --git a/src/pages/settings/Wallet/WalletPage/index.js b/src/pages/settings/Wallet/WalletPage/index.js new file mode 100644 index 000000000000..23a3b44d0801 --- /dev/null +++ b/src/pages/settings/Wallet/WalletPage/index.js @@ -0,0 +1,10 @@ +import React from 'react'; +import BaseWalletPage from './BaseWalletPage'; + +function WalletPage() { + return ; +} + +WalletPage.displayName = 'WalletPage'; + +export default WalletPage; diff --git a/src/pages/settings/Wallet/WalletPage/index.native.js b/src/pages/settings/Wallet/WalletPage/index.native.js new file mode 100644 index 000000000000..d8e291e66aa6 --- /dev/null +++ b/src/pages/settings/Wallet/WalletPage/index.native.js @@ -0,0 +1,3 @@ +import BaseWalletPage from './BaseWalletPage'; + +export default BaseWalletPage; diff --git a/src/pages/settings/Payments/PaymentsPage/paymentsPagePropTypes.js b/src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js similarity index 100% rename from src/pages/settings/Payments/PaymentsPage/paymentsPagePropTypes.js rename to src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js diff --git a/src/pages/settings/Payments/walletTransferPropTypes.js b/src/pages/settings/Wallet/walletTransferPropTypes.js similarity index 100% rename from src/pages/settings/Payments/walletTransferPropTypes.js rename to src/pages/settings/Wallet/walletTransferPropTypes.js diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js index 98ef04836f76..6ba92d8c611a 100755 --- a/src/pages/workspace/WorkspacesListPage.js +++ b/src/pages/workspace/WorkspacesListPage.js @@ -131,7 +131,7 @@ function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, u */ function getMenuItem(item, index) { const keyTitle = item.translationKey ? translate(item.translationKey) : item.title; - const isPaymentItem = item.translationKey === 'common.payments'; + const isPaymentItem = item.translationKey === 'common.wallet'; return ( Date: Wed, 16 Aug 2023 11:08:50 -0500 Subject: [PATCH 2/3] Fix export --- src/libs/actions/PaymentMethods.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/PaymentMethods.js b/src/libs/actions/PaymentMethods.js index 705a9cbc23d5..7b73ffd3862a 100644 --- a/src/libs/actions/PaymentMethods.js +++ b/src/libs/actions/PaymentMethods.js @@ -349,7 +349,7 @@ export { deletePayPalMe, deletePaymentCard, addPaymentCard, - openPaymentsPage, + openWalletPage, makeDefaultPaymentMethod, kycWallRef, continueSetup, From 5b385e188439b9f10649ac16500f8dedcbbb50db Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 17 Aug 2023 13:22:03 -0500 Subject: [PATCH 3/3] Fix page cannot be found copy --- src/languages/en.js | 4 ++-- src/languages/es.js | 4 ++-- src/pages/settings/Wallet/TransferBalancePage.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index b49072a52ab6..b9944cf5e5ac 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -674,8 +674,8 @@ export default { transferDetailBankAccount: 'Your money should arrive in the next 1-3 business days.', transferDetailDebitCard: 'Your money should arrive immediately.', failedTransfer: 'Your balance isn’t fully settled. Please transfer to a bank account.', - notHereSubTitle: 'Please transfer your balance from the payments page', - goToPayment: 'Go to Payments', + notHereSubTitle: 'Please transfer your balance from the wallet page', + goToWallet: 'Go to Wallet', }, chooseTransferAccountPage: { chooseAccount: 'Choose account', diff --git a/src/languages/es.js b/src/languages/es.js index 497cfcb1e8c9..4d366af849ca 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -675,8 +675,8 @@ export default { transferDetailBankAccount: 'Tu dinero debería llegar en 1-3 días laborables.', transferDetailDebitCard: 'Tu dinero debería llegar de inmediato.', failedTransfer: 'Tu saldo no se ha acreditado completamente. Por favor, transfiere los fondos a una cuenta bancaria.', - notHereSubTitle: 'Por favor, transfiere el saldo desde la página de pagos', - goToPayment: 'Ir a pagos', + notHereSubTitle: 'Por favor, transfiere el saldo desde la página de billetera', + goToWallet: 'Ir a billetera', }, chooseTransferAccountPage: { chooseAccount: 'Elegir cuenta', diff --git a/src/pages/settings/Wallet/TransferBalancePage.js b/src/pages/settings/Wallet/TransferBalancePage.js index f3f97e09da7b..430ca3331f47 100644 --- a/src/pages/settings/Wallet/TransferBalancePage.js +++ b/src/pages/settings/Wallet/TransferBalancePage.js @@ -180,7 +180,7 @@ function TransferBalancePage(props) { titleKey="notFound.pageNotFound" subtitleKey="transferAmountPage.notHereSubTitle" shouldShowLink - linkKey="transferAmountPage.goToPayment" + linkKey="transferAmountPage.goToWallet" onLinkPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)} >