From acecb9c0c4bdb4e853959e69ef9706ccda9f355c Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Thu, 2 Dec 2021 15:47:57 -0800 Subject: [PATCH 1/9] bancorp copy updates --- src/languages/en.js | 10 +++++----- src/languages/es.js | 12 ++++++------ src/pages/EnablePayments/TermsPage/LongTermsForm.js | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 85f944a7380d..1c6fab0ceec5 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -527,7 +527,7 @@ export default { instant: 'Instant', standard: 'Standard', shortTermsForm: { - expensifyPaymentsAccount: 'The Expensify Payments Account is issues by The Bancorp Bank.', + expensifyPaymentsAccount: 'The Expensify Wallet is issued by The Bancorp Bank.', perPurchase: 'Per purchase', atmWithdrawal: 'ATM withdrawal', cashReload: 'Cash reload', @@ -545,13 +545,13 @@ export default { conditionsPhone: 'or calling +1 833-400-0904.', }, longTermsForm: { - listOfAllFees: 'All Expensify Payments account fees:', + listOfAllFees: 'A list of all Expensify Wallet fees', typeOfFeeHeader: 'Type of fee', feeAmountHeader: 'Fee amount', moreDetailsHeader: 'More details', openingAccountTitle: 'Opening an account', - openingAccountDetails: 'There is no fee to create an account.', - monthlyFeeDetails: 'There is no monthly fee', + openingAccountDetails: 'There is no fee to open an account.', + monthlyFeeDetails: 'There is no monthly fee.', customerServiceTitle: 'Customer service', customerServiceDetails: 'There are no customer service fees.', inactivityDetails: 'There is no inactivity fee.', @@ -562,7 +562,7 @@ export default { + 'to your bank account using the standard option. This transfer usually completes within 1-3 business' + ' days.', electronicFundsInstantDetails: 'There is a fee to transfer funds from your Expensify Payments Account to ' - + 'your linked debit card using the instant transfer option. This transfer usually completes within' + + 'your linked debit card using the instant transfer option. This transfer usually completes within ' + '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 ' diff --git a/src/languages/es.js b/src/languages/es.js index db90ccfbec0c..f30463b41112 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -527,7 +527,7 @@ export default { instant: 'Instantáneo', standard: 'Estándar', shortTermsForm: { - expensifyPaymentsAccount: 'La cuenta Expensify Payments es emitida por The Bancorp Bank.', + expensifyPaymentsAccount: 'La billetera Expensify es emitida por The Bancorp Bank.', perPurchase: 'Por compra', atmWithdrawal: 'Retiro de cajero automático', cashReload: 'Recarga de efectivo', @@ -545,13 +545,13 @@ export default { conditionsPhone: 'o llamando al +1 833-400-0904.', }, longTermsForm: { - listOfAllFees: 'Todas las tarifas de la cuenta Expensify Payments:', + listOfAllFees: 'Una lista de todas las tarifas de la billetera Expensify', typeOfFeeHeader: 'Tipo de tarifa', feeAmountHeader: 'Importe de la tarifa', moreDetailsHeader: 'Más detalles', openingAccountTitle: 'Abrir una cuenta', - openingAccountDetails: 'No hay tarifa para crear una cuenta.', - monthlyFeeDetails: 'No hay tarifa mensual', + openingAccountDetails: 'No hay tarifa para abrir una cuenta.', + monthlyFeeDetails: 'No hay tarifa mensual.', customerServiceTitle: 'Servicio al cliente', customerServiceDetails: 'No hay tarifas de servicio al cliente.', inactivityDetails: 'No hay tarifa de inactividad.', @@ -562,8 +562,8 @@ export default { + 'a su cuenta bancaria utilizando la opción estándar. Esta transferencia generalmente se completa en' + '1-3 negocios días.', electronicFundsInstantDetails: 'Hay una tarifa para transferir fondos desde su cuenta Expensify Payments a ' - + 'su tarjeta de débito vinculada utilizando la opción de transferencia instantánea. Esta transferencia' - + ' generalmente se completa dentro de varios minutos. La tarifa es el 1.5% del monto de la ' + + 'su tarjeta de débito vinculada utilizando la opción de transferencia instantánea. Esta transferencia ' + + 'generalmente se completa dentro de varios minutos. La tarifa es el 1.5% del monto de la ' + '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 ' diff --git a/src/pages/EnablePayments/TermsPage/LongTermsForm.js b/src/pages/EnablePayments/TermsPage/LongTermsForm.js index 9ecfe78c690e..f47c9390ab18 100644 --- a/src/pages/EnablePayments/TermsPage/LongTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/LongTermsForm.js @@ -54,7 +54,7 @@ const termsData = [ subTitle: Localize.translateLocal('termsStep.instant'), rightText: Localize.translateLocal('termsStep.electronicFundsInstantFee'), subRightText: Localize.translateLocal('termsStep.electronicFundsInstantFeeMin'), - details: Localize.translateLocal('termsStep.longTermsForm.electronicFundsStandardDetails'), + details: Localize.translateLocal('termsStep.longTermsForm.electronicFundsInstantDetails'), }, ]; From 4e6cd3af9d2476566995ee491efb0fdd23f7a14d Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Thu, 2 Dec 2021 16:19:46 -0800 Subject: [PATCH 2/9] add horizontal rules and update styles --- src/languages/en.js | 2 +- src/languages/es.js | 2 +- .../TermsPage/ShortTermsForm.js | 5 ++++- src/styles/styles.js | 20 ++++++++++++++++++- src/styles/utilities/spacing.js | 4 ++++ 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 1c6fab0ceec5..ced2be7ccfdd 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -538,7 +538,7 @@ export default { customerService: 'Customer service', automatedOrLive: 'Automated or live agent', afterTwelveMonths: 'After 12 months with no transactions', - weChargeOneFee: 'We charge 1 type of fee.', + weChargeOneFee: 'We charge one type of fee.', fdicInsurance: 'Your funds are eligible for FDIC insurance.', generalInfo: 'For general information about prepaid accounts, visit', conditionsDetails: 'Find details and conditions for all fees and services by visiting', diff --git a/src/languages/es.js b/src/languages/es.js index f30463b41112..b7d741340b9a 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -538,7 +538,7 @@ export default { customerService: 'Servicio al cliente', automatedOrLive: 'Agente automatizado o en vivo', afterTwelveMonths: 'Después de 12 meses sin transacciones', - weChargeOneFee: 'Cobramos 1 tipo de tarifa.', + weChargeOneFee: 'Cobramos un tipo de tarifa.', fdicInsurance: 'Sus fondos son elegibles para el seguro de la FDIC.', generalInfo: 'Para obtener información general sobre cuentas prepagas, visite', conditionsDetails: 'Encuentra detalles y condiciones para todas las tarifas y servicios visitando', diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js index de3b6d6b3829..56724e492c79 100644 --- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js @@ -68,14 +68,17 @@ const ShortTermsForm = () => ( {Localize.translateLocal('termsStep.shortTermsForm.expensifyPaymentsAccount')} - + {getShortTermsSections()} + + {Localize.translateLocal('termsStep.shortTermsForm.weChargeOneFee')} + {Localize.translateLocal('termsStep.electronicFundsWithdrawal')} diff --git a/src/styles/styles.js b/src/styles/styles.js index de454e262c72..d3862714bbda 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2142,6 +2142,24 @@ const styles = { bottom: 0, }, + shortTermsBorder: { + borderWidth: 1, + borderColor: themeColors.shadow, + }, + + shortTermsHorizontalRule: { + borderBottomWidth: 1, + borderColor: themeColors.shadow, + ...spacing.mh3, + marginTop: 12, + }, + + shortTermsLargeHorizontalRule: { + borderWidth: 1, + borderColor: themeColors.shadow, + ...spacing.mh3, + }, + shortTermsRow: { flexDirection: 'row', padding: 12, @@ -2155,7 +2173,7 @@ const styles = { shortTermsBoldHeadingSection: { paddingRight: 12, paddingLeft: 12, - marginTop: 16, + marginTop: 12, }, longTermsRow: { diff --git a/src/styles/utilities/spacing.js b/src/styles/utilities/spacing.js index 9696cc0e7afe..97a75613ff83 100644 --- a/src/styles/utilities/spacing.js +++ b/src/styles/utilities/spacing.js @@ -25,6 +25,10 @@ export default { marginHorizontal: 4, }, + mh3: { + marginHorizontal: 12, + }, + mh5: { marginHorizontal: 20, }, From 346f9131538d14f939c290bc1751c12f2e7ea81c Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Thu, 2 Dec 2021 16:56:12 -0800 Subject: [PATCH 3/9] update electronic funds row --- src/languages/en.js | 8 +++++--- src/languages/es.js | 6 ++++-- .../EnablePayments/TermsPage/LongTermsForm.js | 4 ++-- .../EnablePayments/TermsPage/ShortTermsForm.js | 14 ++++++++------ 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index ced2be7ccfdd..05cafa0803c8 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -521,10 +521,8 @@ export default { monthlyFee: 'Monthly fee', inactivity: 'Inactivity', electronicFundsInstantFee: '1.5%', - electronicFundsInstantFeeMin: 'Min $0.25', noOverdraftOrCredit: 'No overdraft/credit feature.', - electronicFundsWithdrawal: 'Electronic Funds Withdrawal', - instant: 'Instant', + electronicFundsWithdrawal: 'Electronic funds withdrawal', standard: 'Standard', shortTermsForm: { expensifyPaymentsAccount: 'The Expensify Wallet is issued by The Bancorp Bank.', @@ -543,6 +541,8 @@ export default { generalInfo: 'For general information about prepaid accounts, visit', conditionsDetails: 'Find details and conditions for all fees and services by visiting', conditionsPhone: 'or calling +1 833-400-0904.', + instant: '(instant)', + electronicFundsInstantFeeMin: '(min $0.25)', }, longTermsForm: { listOfAllFees: 'A list of all Expensify Wallet fees', @@ -576,6 +576,8 @@ export default { printerFriendlyView: 'View printer-friendly version', automated: 'Automated', liveAgent: 'Live Agent', + instant: 'Instant', + electronicFundsInstantFeeMin: 'Min $0.25', }, }, activateStep: { diff --git a/src/languages/es.js b/src/languages/es.js index b7d741340b9a..d24b83741f0a 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -521,10 +521,8 @@ export default { monthlyFee: 'Cuota mensual', inactivity: 'Inactividad', electronicFundsInstantFee: '1.5%', - electronicFundsInstantFeeMin: 'Mínimo $0.25', noOverdraftOrCredit: 'Sin función de sobregiro / crédito', electronicFundsWithdrawal: 'Retiro electrónico de fondos', - instant: 'Instantáneo', standard: 'Estándar', shortTermsForm: { expensifyPaymentsAccount: 'La billetera Expensify es emitida por The Bancorp Bank.', @@ -543,6 +541,8 @@ export default { generalInfo: 'Para obtener información general sobre cuentas prepagas, visite', conditionsDetails: 'Encuentra detalles y condiciones para todas las tarifas y servicios visitando', conditionsPhone: 'o llamando al +1 833-400-0904.', + instant: '(instantáneo)', + electronicFundsInstantFeeMin: '(mínimo $0.25)', }, longTermsForm: { listOfAllFees: 'Una lista de todas las tarifas de la billetera Expensify', @@ -578,6 +578,8 @@ export default { printerFriendlyView: 'Ver versión para imprimir', automated: 'Automatizado', liveAgent: 'Agente en vivo', + instant: 'Instantáneo', + electronicFundsInstantFeeMin: 'Mínimo $0.25', }, }, activateStep: { diff --git a/src/pages/EnablePayments/TermsPage/LongTermsForm.js b/src/pages/EnablePayments/TermsPage/LongTermsForm.js index f47c9390ab18..3af64bd33636 100644 --- a/src/pages/EnablePayments/TermsPage/LongTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/LongTermsForm.js @@ -51,9 +51,9 @@ const termsData = [ }, { title: Localize.translateLocal('termsStep.electronicFundsWithdrawal'), - subTitle: Localize.translateLocal('termsStep.instant'), + subTitle: Localize.translateLocal('termsStep.longTermsForm.instant'), rightText: Localize.translateLocal('termsStep.electronicFundsInstantFee'), - subRightText: Localize.translateLocal('termsStep.electronicFundsInstantFeeMin'), + subRightText: Localize.translateLocal('termsStep.longTermsForm.electronicFundsInstantFeeMin'), details: Localize.translateLocal('termsStep.longTermsForm.electronicFundsInstantDetails'), }, ]; diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js index 56724e492c79..b074fdb8c7e2 100644 --- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js @@ -81,17 +81,19 @@ const ShortTermsForm = () => ( - {Localize.translateLocal('termsStep.electronicFundsWithdrawal')} - - {Localize.translateLocal('termsStep.instant')} + + {Localize.translateLocal('termsStep.electronicFundsWithdrawal')} + {' '} + {Localize.translateLocal('termsStep.shortTermsForm.instant')} - + {Localize.translateLocal('termsStep.electronicFundsInstantFee')} + {' '} - - {Localize.translateLocal('termsStep.electronicFundsInstantFeeMin')} + + {Localize.translateLocal('termsStep.shortTermsForm.electronicFundsInstantFeeMin')} From 6fe890dbbab6beade8e2fb12fa0a843c0ea45356 Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Thu, 2 Dec 2021 17:28:39 -0800 Subject: [PATCH 4/9] re-style more rows --- src/languages/en.js | 6 +- src/languages/es.js | 6 +- .../TermsPage/ShortTermsForm.js | 69 ++++++++++++++----- src/styles/styles.js | 1 - src/styles/utilities/flex.js | 4 ++ src/styles/utilities/spacing.js | 4 ++ 6 files changed, 65 insertions(+), 25 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 05cafa0803c8..41623f37c9bf 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -532,10 +532,10 @@ export default { inNetwork: 'In-network', outOfNetwork: 'out-of-network', atmBalanceInquiry: 'ATM balance inquiry', - inOrOutOfNetwork: 'In-network or out-of-network', + inOrOutOfNetwork: '(in-network or out-of-network)', customerService: 'Customer service', - automatedOrLive: 'Automated or live agent', - afterTwelveMonths: 'After 12 months with no transactions', + automatedOrLive: '(automated or live agent)', + afterTwelveMonths: '(after 12 months with no transactions)', weChargeOneFee: 'We charge one type of fee.', fdicInsurance: 'Your funds are eligible for FDIC insurance.', generalInfo: 'For general information about prepaid accounts, visit', diff --git a/src/languages/es.js b/src/languages/es.js index d24b83741f0a..b2f2b8dd7216 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -532,10 +532,10 @@ export default { inNetwork: 'En la red', outOfNetwork: 'fuera de la red', atmBalanceInquiry: 'Consulta de saldo de cajero automático', - inOrOutOfNetwork: 'Dentro o fuera de la red', + inOrOutOfNetwork: '(dentro o fuera de la red)', customerService: 'Servicio al cliente', - automatedOrLive: 'Agente automatizado o en vivo', - afterTwelveMonths: 'Después de 12 meses sin transacciones', + automatedOrLive: '(agente automatizado o en vivo)', + afterTwelveMonths: '(después de 12 meses sin transacciones)', weChargeOneFee: 'Cobramos un tipo de tarifa.', fdicInsurance: 'Sus fondos son elegibles para el seguro de la FDIC.', generalInfo: 'Para obtener información general sobre cuentas prepagas, visite', diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js index b074fdb8c7e2..18dd063cf483 100644 --- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js @@ -25,21 +25,6 @@ const termsData = [ title: Localize.translateLocal('termsStep.shortTermsForm.cashReload'), rightText: Localize.translateLocal('common.na'), }, - { - title: Localize.translateLocal('termsStep.shortTermsForm.atmBalanceInquiry'), - subTitle: Localize.translateLocal('termsStep.shortTermsForm.inOrOutOfNetwork'), - rightText: Localize.translateLocal('common.na'), - }, - { - title: Localize.translateLocal('termsStep.shortTermsForm.customerService'), - subTitle: Localize.translateLocal('termsStep.shortTermsForm.automatedOrLive'), - rightText: Localize.translateLocal('termsStep.feeAmountZero'), - }, - { - title: Localize.translateLocal('termsStep.inactivity'), - subTitle: Localize.translateLocal('termsStep.shortTermsForm.afterTwelveMonths'), - rightText: Localize.translateLocal('termsStep.feeAmountZero'), - }, ]; const getShortTermsSections = () => _.map(termsData, section => ( @@ -71,16 +56,64 @@ const ShortTermsForm = () => ( {getShortTermsSections()} - + + + + + {Localize.translateLocal('termsStep.shortTermsForm.atmBalanceInquiry')} + {' '} + {Localize.translateLocal('termsStep.shortTermsForm.inOrOutOfNetwork')} + + + + + {Localize.translateLocal('common.na')} + + + - + + + + + {Localize.translateLocal('termsStep.shortTermsForm.customerService')} + {' '} + {Localize.translateLocal('termsStep.shortTermsForm.automatedOrLive')} + + + + + {Localize.translateLocal('termsStep.feeAmountZero')} + + + + + + + + + {Localize.translateLocal('termsStep.inactivity')} + {' '} + {Localize.translateLocal('termsStep.shortTermsForm.afterTwelveMonths')} + + + + + {Localize.translateLocal('termsStep.feeAmountZero')} + + + + + + {Localize.translateLocal('termsStep.shortTermsForm.weChargeOneFee')} + - + {Localize.translateLocal('termsStep.electronicFundsWithdrawal')} {' '} diff --git a/src/styles/styles.js b/src/styles/styles.js index d3862714bbda..2a2fe293fd35 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2151,7 +2151,6 @@ const styles = { borderBottomWidth: 1, borderColor: themeColors.shadow, ...spacing.mh3, - marginTop: 12, }, shortTermsLargeHorizontalRule: { diff --git a/src/styles/utilities/flex.js b/src/styles/utilities/flex.js index c87e0d6a1205..22acb5cba4ff 100644 --- a/src/styles/utilities/flex.js +++ b/src/styles/utilities/flex.js @@ -20,6 +20,10 @@ export default { flex: 2, }, + flex3: { + flex: 3, + }, + flex4: { flex: 4, }, diff --git a/src/styles/utilities/spacing.js b/src/styles/utilities/spacing.js index 97a75613ff83..41ee572ffca4 100644 --- a/src/styles/utilities/spacing.js +++ b/src/styles/utilities/spacing.js @@ -260,6 +260,10 @@ export default { paddingRight: 8, }, + pr4: { + paddingRight: 16, + }, + pr5: { paddingRight: 20, }, From 9f2c0a818112f2266c3b185bc46d74a470ed68fb Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Thu, 2 Dec 2021 17:44:12 -0800 Subject: [PATCH 5/9] update styles for monthly fee and purchase --- .../TermsPage/ShortTermsForm.js | 29 ++++++++++++++----- src/styles/styles.js | 5 ++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js index 18dd063cf483..2102b7ea8ce4 100644 --- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js @@ -8,14 +8,6 @@ import CONST from '../../../CONST'; import * as Link from '../../../libs/actions/Link'; const termsData = [ - { - title: Localize.translateLocal('termsStep.monthlyFee'), - rightText: Localize.translateLocal('termsStep.feeAmountZero'), - }, - { - title: Localize.translateLocal('termsStep.shortTermsForm.perPurchase'), - rightText: Localize.translateLocal('termsStep.feeAmountZero'), - }, { title: Localize.translateLocal('termsStep.shortTermsForm.atmWithdrawal'), subTitle: Localize.translateLocal('termsStep.shortTermsForm.inOrOutOfNetwork'), @@ -56,6 +48,27 @@ const ShortTermsForm = () => ( {getShortTermsSections()} + + + + {Localize.translateLocal('termsStep.monthlyFee')} + + + {Localize.translateLocal('termsStep.feeAmountZero')} + + + + + + {Localize.translateLocal('termsStep.shortTermsForm.perPurchase')} + + + {Localize.translateLocal('termsStep.feeAmountZero')} + + + + + diff --git a/src/styles/styles.js b/src/styles/styles.js index 2a2fe293fd35..8f730568ca5c 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2159,6 +2159,11 @@ const styles = { ...spacing.mh3, }, + shortTermsBoldText: { + fontSize: variables.fontSizeHero, + fontWeight: fontWeightBold, + }, + shortTermsRow: { flexDirection: 'row', padding: 12, From dd691b56db17b994640f67faee7eb225cde78a9a Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Thu, 2 Dec 2021 18:07:32 -0800 Subject: [PATCH 6/9] style last row --- src/languages/en.js | 2 +- src/languages/es.js | 2 +- .../TermsPage/ShortTermsForm.js | 79 +++++++++---------- src/styles/styles.js | 5 -- 4 files changed, 41 insertions(+), 47 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 41623f37c9bf..23c5029b2dab 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -529,7 +529,7 @@ export default { perPurchase: 'Per purchase', atmWithdrawal: 'ATM withdrawal', cashReload: 'Cash reload', - inNetwork: 'In-network', + inNetwork: 'in-network', outOfNetwork: 'out-of-network', atmBalanceInquiry: 'ATM balance inquiry', inOrOutOfNetwork: '(in-network or out-of-network)', diff --git a/src/languages/es.js b/src/languages/es.js index b2f2b8dd7216..3ce7f2a9bd35 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -529,7 +529,7 @@ export default { perPurchase: 'Por compra', atmWithdrawal: 'Retiro de cajero automático', cashReload: 'Recarga de efectivo', - inNetwork: 'En la red', + inNetwork: 'en la red', outOfNetwork: 'fuera de la red', atmBalanceInquiry: 'Consulta de saldo de cajero automático', inOrOutOfNetwork: '(dentro o fuera de la red)', diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js index 2102b7ea8ce4..b4c9848e4c42 100644 --- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js @@ -7,63 +7,62 @@ import * as Localize from '../../../libs/Localize'; import CONST from '../../../CONST'; import * as Link from '../../../libs/actions/Link'; -const termsData = [ - { - title: Localize.translateLocal('termsStep.shortTermsForm.atmWithdrawal'), - subTitle: Localize.translateLocal('termsStep.shortTermsForm.inOrOutOfNetwork'), - rightText: Localize.translateLocal('common.na'), - }, - { - title: Localize.translateLocal('termsStep.shortTermsForm.cashReload'), - rightText: Localize.translateLocal('common.na'), - }, -]; - -const getShortTermsSections = () => _.map(termsData, section => ( - - - {section.title} - { - section.subTitle - && ( - - {section.subTitle} - - ) - } - - - - {section.rightText} - - - -)); - const ShortTermsForm = () => ( <> {Localize.translateLocal('termsStep.shortTermsForm.expensifyPaymentsAccount')} - {getShortTermsSections()} + + + + {Localize.translateLocal('termsStep.monthlyFee')} + + + {Localize.translateLocal('termsStep.feeAmountZero')} + + + + + + {Localize.translateLocal('termsStep.shortTermsForm.perPurchase')} + + + {Localize.translateLocal('termsStep.feeAmountZero')} + + + + + + {Localize.translateLocal('termsStep.shortTermsForm.atmWithdrawal')} + + + {Localize.translateLocal('common.na')} + - {Localize.translateLocal('termsStep.monthlyFee')} + + {Localize.translateLocal('termsStep.shortTermsForm.inNetwork')} + + + + {Localize.translateLocal('common.na')} - {Localize.translateLocal('termsStep.feeAmountZero')} + + {Localize.translateLocal('termsStep.shortTermsForm.outOfNetwork')} + - - {Localize.translateLocal('termsStep.shortTermsForm.perPurchase')} + + {Localize.translateLocal('termsStep.shortTermsForm.cashReload')} - {Localize.translateLocal('termsStep.feeAmountZero')} + {Localize.translateLocal('common.na')} @@ -102,7 +101,7 @@ const ShortTermsForm = () => ( - + {Localize.translateLocal('termsStep.inactivity')} diff --git a/src/styles/styles.js b/src/styles/styles.js index 8f730568ca5c..2a2fe293fd35 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2159,11 +2159,6 @@ const styles = { ...spacing.mh3, }, - shortTermsBoldText: { - fontSize: variables.fontSizeHero, - fontWeight: fontWeightBold, - }, - shortTermsRow: { flexDirection: 'row', padding: 12, From 7d5e5b5de6fb1352915d019c071ab64381c4158c Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Thu, 2 Dec 2021 18:19:02 -0800 Subject: [PATCH 7/9] update text component to use expensifyText --- .../TermsPage/ShortTermsForm.js | 97 +++++++++---------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js index b4c9848e4c42..677a9442462c 100644 --- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js @@ -1,34 +1,33 @@ -import _ from 'underscore'; import React from 'react'; import {View} from 'react-native'; import styles from '../../../styles/styles'; -import Text from '../../../components/Text'; +import ExpensifyText from '../../../components/ExpensifyText'; import * as Localize from '../../../libs/Localize'; import CONST from '../../../CONST'; import * as Link from '../../../libs/actions/Link'; const ShortTermsForm = () => ( <> - + {Localize.translateLocal('termsStep.shortTermsForm.expensifyPaymentsAccount')} - + - {Localize.translateLocal('termsStep.monthlyFee')} + {Localize.translateLocal('termsStep.monthlyFee')} - {Localize.translateLocal('termsStep.feeAmountZero')} + {Localize.translateLocal('termsStep.feeAmountZero')} - {Localize.translateLocal('termsStep.shortTermsForm.perPurchase')} + {Localize.translateLocal('termsStep.shortTermsForm.perPurchase')} - {Localize.translateLocal('termsStep.feeAmountZero')} + {Localize.translateLocal('termsStep.feeAmountZero')} @@ -37,32 +36,32 @@ const ShortTermsForm = () => ( - {Localize.translateLocal('termsStep.shortTermsForm.atmWithdrawal')} + {Localize.translateLocal('termsStep.shortTermsForm.atmWithdrawal')} - {Localize.translateLocal('common.na')} + {Localize.translateLocal('common.na')} - + {Localize.translateLocal('termsStep.shortTermsForm.inNetwork')} - + - {Localize.translateLocal('common.na')} + {Localize.translateLocal('common.na')} - + {Localize.translateLocal('termsStep.shortTermsForm.outOfNetwork')} - + - {Localize.translateLocal('termsStep.shortTermsForm.cashReload')} + {Localize.translateLocal('termsStep.shortTermsForm.cashReload')} - {Localize.translateLocal('common.na')} + {Localize.translateLocal('common.na')} @@ -71,107 +70,107 @@ const ShortTermsForm = () => ( - + {Localize.translateLocal('termsStep.shortTermsForm.atmBalanceInquiry')} {' '} {Localize.translateLocal('termsStep.shortTermsForm.inOrOutOfNetwork')} - + - + {Localize.translateLocal('common.na')} - + - + {Localize.translateLocal('termsStep.shortTermsForm.customerService')} {' '} {Localize.translateLocal('termsStep.shortTermsForm.automatedOrLive')} - + - + {Localize.translateLocal('termsStep.feeAmountZero')} - + - + {Localize.translateLocal('termsStep.inactivity')} {' '} {Localize.translateLocal('termsStep.shortTermsForm.afterTwelveMonths')} - + - + {Localize.translateLocal('termsStep.feeAmountZero')} - + - + {Localize.translateLocal('termsStep.shortTermsForm.weChargeOneFee')} - + - + {Localize.translateLocal('termsStep.electronicFundsWithdrawal')} {' '} {Localize.translateLocal('termsStep.shortTermsForm.instant')} - + - + {Localize.translateLocal('termsStep.electronicFundsInstantFee')} {' '} - - + + {Localize.translateLocal('termsStep.shortTermsForm.electronicFundsInstantFeeMin')} - + - + {Localize.translateLocal('termsStep.noOverdraftOrCredit')} - - + + {Localize.translateLocal('termsStep.shortTermsForm.fdicInsurance')} - - + + {Localize.translateLocal('termsStep.shortTermsForm.generalInfo')} {' '} - Link.openExternalLink(CONST.CFPB_PREPAID_URL)} > {CONST.TERMS.CFPB_PREPAID} - + . - - + + {Localize.translateLocal('termsStep.shortTermsForm.conditionsDetails')} {' '} - Link.openExternalLink(CONST.FEES_URL)} > {CONST.TERMS.USE_EXPENSIFY_FEES} - + {' '} {Localize.translateLocal('termsStep.shortTermsForm.conditionsPhone')} - + From c40fa2cd1608cd52916fa64b54c31775fb87868c Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Mon, 6 Dec 2021 14:21:55 -0800 Subject: [PATCH 8/9] remove fixed footer and fix error message --- src/pages/EnablePayments/TermsStep.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.js index 4aecfcff7dbd..e923c62cb118 100644 --- a/src/pages/EnablePayments/TermsStep.js +++ b/src/pages/EnablePayments/TermsStep.js @@ -16,7 +16,6 @@ import CheckboxWithLabel from '../../components/CheckboxWithLabel'; import ExpensifyText from '../../components/ExpensifyText'; import ShortTermsForm from './TermsPage/ShortTermsForm'; import LongTermsForm from './TermsPage/LongTermsForm'; -import FixedFooter from '../../components/FixedFooter'; const propTypes = { /** Comes from Onyx. Information about the terms for the wallet */ @@ -102,13 +101,11 @@ class TermsStep extends React.Component { )} /> - - {this.state.error && ( - - {this.props.translate('termsStep.termsMustBeAccepted')} - - )} - + {this.state.error && ( + + {this.props.translate('termsStep.termsMustBeAccepted')} + + )} - + ); } From 2cb1b2c9f025ef5d34aec3e8ec29b58d2075543a Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Mon, 6 Dec 2021 14:26:11 -0800 Subject: [PATCH 9/9] add spacing below button --- src/pages/EnablePayments/TermsStep.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.js index e923c62cb118..612de4f4caad 100644 --- a/src/pages/EnablePayments/TermsStep.js +++ b/src/pages/EnablePayments/TermsStep.js @@ -108,6 +108,7 @@ class TermsStep extends React.Component { )} {