diff --git a/src/CONST.ts b/src/CONST.ts index dbe47c6ed1a7..bd91137ae946 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -992,6 +992,11 @@ const CONST = { STATEMENT: 'STATEMENT_NAVIGATE', CONCIERGE: 'CONCIERGE_NAVIGATE', }, + MTL_WALLET_PROGRAM_ID: '760', + PROGRAM_ISSUERS: { + EXPENSIFY_PAYMENTS: 'Expensify Payments LLC', + BANCORP_BANK: 'The Bancorp Bank', + }, }, PLAID: { diff --git a/src/languages/en.ts b/src/languages/en.ts index 9c49e2907702..f16097aa03d1 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -73,6 +73,7 @@ import type { RequestedAmountMessageParams, TagSelectionParams, TranslationBase, + WalletProgramParams, } from './types'; import * as ReportActionsUtils from '../libs/ReportActionsUtils'; @@ -909,7 +910,7 @@ export default { phrase2: 'Terms of Service', phrase3: 'and', phrase4: 'Privacy', - phrase5: 'Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its', + phrase5: `Money transmission is provided by ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) pursuant to its`, phrase6: 'licenses', }, validateCodeForm: { @@ -1170,7 +1171,7 @@ export default { electronicFundsWithdrawal: 'Electronic funds withdrawal', standard: 'Standard', shortTermsForm: { - expensifyPaymentsAccount: 'The Expensify Wallet is issued by The Bancorp Bank.', + expensifyPaymentsAccount: ({walletProgram}: WalletProgramParams) => `The Expensify Wallet is issued by ${walletProgram}.`, perPurchase: 'Per purchase', atmWithdrawal: 'ATM withdrawal', cashReload: 'Cash reload', @@ -1212,10 +1213,10 @@ export default { 'several minutes. The fee is 1.5% of the transfer amount (with a minimum fee of $0.25).', fdicInsuranceBancorp: 'Your funds are eligible for FDIC insurance. Your funds will be held at or ' + - 'transferred to The Bancorp Bank, an FDIC-insured institution. Once there, your funds are insured up ' + - 'to $250,000 by the FDIC in the event The Bancorp Bank fails. See', + `transferred to ${CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK}, an FDIC-insured institution. Once there, your funds are insured up ` + + `to $250,000 by the FDIC in the event ${CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK} fails. See`, fdicInsuranceBancorp2: 'for details.', - contactExpensifyPayments: 'Contact Expensify Payments by calling +1 833-400-0904, by email at', + contactExpensifyPayments: `Contact ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} by calling +1 833-400-0904, by email at`, contactExpensifyPayments2: 'or sign in at', generalInformation: 'For general information about prepaid accounts, visit', generalInformation2: 'If you have a complaint about a prepaid account, call the Consumer Financial Protection Bureau at 1-855-411-2372 or visit', diff --git a/src/languages/es.ts b/src/languages/es.ts index 2be3f9e96265..3860c34f6ef1 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -73,6 +73,7 @@ import type { RequestedAmountMessageParams, TagSelectionParams, EnglishTranslation, + WalletProgramParams, } from './types'; /* eslint-disable max-len */ @@ -905,7 +906,7 @@ export default { phrase2: 'Términos de Servicio', phrase3: 'y', phrase4: 'Privacidad', - phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus', + phrase5: `El envío de dinero es brindado por ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) de conformidad con sus`, phrase6: 'licencias', }, validateCodeForm: { @@ -1187,7 +1188,7 @@ export default { electronicFundsWithdrawal: 'Retiro electrónico de fondos', standard: 'Estándar', shortTermsForm: { - expensifyPaymentsAccount: 'La billetera Expensify es emitida por The Bancorp Bank.', + expensifyPaymentsAccount: ({walletProgram}: WalletProgramParams) => `La billetera Expensify es emitida por ${walletProgram}.`, perPurchase: 'Por compra', atmWithdrawal: 'Retiro de cajero automático', cashReload: 'Recarga de efectivo', @@ -1230,10 +1231,10 @@ export default { 'transferencia (con una tarifa mínima de $ 0.25). ', fdicInsuranceBancorp: 'Sus fondos son elegibles para el seguro de la FDIC. Sus fondos se mantendrán en o ' + - 'transferido a The Bancorp Bank, una institución asegurada por la FDIC. Una vez allí, sus fondos ' + - 'están asegurados a $ 250,000 por la FDIC en caso de que The Bancorp Bank quiebre. Ver', + `transferido a ${CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK}, una institución asegurada por la FDIC. Una vez allí, sus fondos ` + + `están asegurados a $ 250,000 por la FDIC en caso de que ${CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK} quiebre. Ver`, fdicInsuranceBancorp2: 'para detalles.', - contactExpensifyPayments: 'Comuníquese con Expensify Payments llamando al + 1833-400-0904, por correoelectrónico a', + contactExpensifyPayments: `Comuníquese con ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} llamando al + 1833-400-0904, por correoelectrónico a`, contactExpensifyPayments2: 'o inicie sesión en', generalInformation: 'Para obtener información general sobre cuentas prepagas, visite', generalInformation2: 'Si tiene una queja sobre una cuenta prepaga, llame al Consumer Financial Oficina de Protección al 1-855-411-2372 o visite', diff --git a/src/languages/types.ts b/src/languages/types.ts index 70bf2e4cae3d..52f2df8b3765 100644 --- a/src/languages/types.ts +++ b/src/languages/types.ts @@ -194,6 +194,8 @@ type FormattedMaxLengthParams = {formattedMaxLength: string}; type TagSelectionParams = {tagName: string}; +type WalletProgramParams = {walletProgram: string}; + /* Translation Object types */ // eslint-disable-next-line @typescript-eslint/no-explicit-any type TranslationBaseValue = string | string[] | ((...args: any[]) => string); @@ -307,4 +309,5 @@ export type { RemovedTheRequestParams, FormattedMaxLengthParams, TagSelectionParams, + WalletProgramParams, }; diff --git a/src/pages/EnablePayments/EnablePaymentsPage.js b/src/pages/EnablePayments/EnablePaymentsPage.js index 064f9371e46a..903ec0c520b9 100644 --- a/src/pages/EnablePayments/EnablePaymentsPage.js +++ b/src/pages/EnablePayments/EnablePaymentsPage.js @@ -86,10 +86,37 @@ class EnablePaymentsPage extends React.Component { {currentStep === CONST.WALLET.STEP.ACTIVATE && } ); +<<<<<<< HEAD }} ); } +======= + } + + if (userWallet.shouldShowWalletActivationSuccess) { + return ; + } + + const currentStep = userWallet.currentStep || CONST.WALLET.STEP.ADDITIONAL_DETAILS; + + switch (currentStep) { + case CONST.WALLET.STEP.ADDITIONAL_DETAILS: + case CONST.WALLET.STEP.ADDITIONAL_DETAILS_KBA: + return ; + case CONST.WALLET.STEP.ONFIDO: + return ; + case CONST.WALLET.STEP.TERMS: + return ; + case CONST.WALLET.STEP.ACTIVATE: + return ; + default: + return null; + } + }} + + ); +>>>>>>> bcc8a63 (Merge pull request #28433 from Expensify/cole_wallet_terms) } EnablePaymentsPage.propTypes = propTypes; diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js index a6f685fcb562..1b693add95b7 100644 --- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js @@ -5,11 +5,26 @@ import Text from '../../../components/Text'; import * as Localize from '../../../libs/Localize'; import CONST from '../../../CONST'; import TextLink from '../../../components/TextLink'; +import userWalletPropTypes from '../userWalletPropTypes'; -function ShortTermsForm() { +const propTypes = { + /** The user's wallet */ + userWallet: userWalletPropTypes, +}; + +const defaultProps = { + userWallet: {}, +}; + +function ShortTermsForm(props) { return ( <> - {Localize.translateLocal('termsStep.shortTermsForm.expensifyPaymentsAccount')} + + {Localize.translateLocal('termsStep.shortTermsForm.expensifyPaymentsAccount', { + walletProgram: + props.userWallet.walletProgramID === CONST.WALLET.MTL_WALLET_PROGRAM_ID ? CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS : CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK, + })} + @@ -132,6 +147,8 @@ function ShortTermsForm() { ); } +ShortTermsForm.propTypes = propTypes; +ShortTermsForm.defaultProps = defaultProps; ShortTermsForm.displayName = 'ShortTermsForm'; export default ShortTermsForm; diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.js index e96d93dc4de9..39f4826ec0b2 100644 --- a/src/pages/EnablePayments/TermsStep.js +++ b/src/pages/EnablePayments/TermsStep.js @@ -15,8 +15,12 @@ import LongTermsForm from './TermsPage/LongTermsForm'; import FormAlertWithSubmitButton from '../../components/FormAlertWithSubmitButton'; import walletTermsPropTypes from './walletTermsPropTypes'; import * as ErrorUtils from '../../libs/ErrorUtils'; +import userWalletPropTypes from './userWalletPropTypes'; const propTypes = { + /** The user's wallet */ + userWallet: userWalletPropTypes, + /** Comes from Onyx. Information about the terms for the wallet */ walletTerms: walletTermsPropTypes, @@ -24,6 +28,7 @@ const propTypes = { }; const defaultProps = { + userWallet: {}, walletTerms: {}, }; @@ -59,7 +64,7 @@ function TermsStep(props) { style={styles.flex1} contentContainerStyle={styles.ph5} > - +