From 3e79914afb4f50d7033b969e263406e27319cbb0 Mon Sep 17 00:00:00 2001 From: Muhammad Adeel Nawaz Date: Wed, 2 Mar 2022 13:05:30 +0500 Subject: [PATCH 1/3] add ToS error in connect manual bank account page --- src/pages/ReimbursementAccount/BankAccountStep.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/ReimbursementAccount/BankAccountStep.js b/src/pages/ReimbursementAccount/BankAccountStep.js index ba988e41a557..789772b5cfaf 100644 --- a/src/pages/ReimbursementAccount/BankAccountStep.js +++ b/src/pages/ReimbursementAccount/BankAccountStep.js @@ -68,6 +68,7 @@ class BankAccountStep extends React.Component { this.errorTranslationKeys = { routingNumber: 'bankAccount.error.routingNumber', accountNumber: 'bankAccount.error.accountNumber', + hasAcceptedTerms: 'addDebitCardPage.error.acceptedTerms', }; this.getErrorText = inputKey => ReimbursementAccountUtils.getErrorText(this.props, this.errorTranslationKeys, inputKey); @@ -312,6 +313,7 @@ class BankAccountStep extends React.Component { )} + errorText={this.getErrorText('hasAcceptedTerms')} hasError={this.getErrors().hasAcceptedTerms} /> From 48b52d0227ab564a17c7af145f92b0e064ce65a3 Mon Sep 17 00:00:00 2001 From: Muhammad Adeel Nawaz Date: Wed, 2 Mar 2022 17:23:14 +0500 Subject: [PATCH 2/3] move accept terms error to common --- src/languages/en.js | 2 +- src/languages/es.js | 2 +- src/pages/ReimbursementAccount/BankAccountStep.js | 2 +- src/pages/settings/Payments/AddDebitCardPage.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 2c0ea7c5b7e4..c39c80b4ded2 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -77,6 +77,7 @@ export default { genericErrorMessage: 'Oops... something went wrong and your request could not be completed. Please try again later.', error: { invalidAmount: 'Invalid amount', + acceptedTerms: 'You must accept the Terms of Service to continue', }, please: 'Please', contactUs: 'contact us', @@ -348,7 +349,6 @@ export default { addressStreet: 'Please enter a valid billing address that is not a PO Box', addressState: 'Please select a state', addressCity: 'Please enter a city', - acceptedTerms: 'You must accept the Terms of Service to continue', genericFailureMessage: 'An error occurred while adding your card, please try again', password: 'Please enter your Expensify password', }, diff --git a/src/languages/es.js b/src/languages/es.js index 03ca676965f7..89d0093c050d 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -77,6 +77,7 @@ export default { genericErrorMessage: 'Ups... algo no ha ido bien y la acción no se ha podido completar. Por favor inténtalo más tarde.', error: { invalidAmount: 'Monto no válido', + acceptedTerms: 'Debes aceptar los Términos de servicio para continuar', }, please: 'Por favor', contactUs: 'contáctenos', @@ -348,7 +349,6 @@ export default { addressStreet: 'Ingrese una dirección de facturación válida que no sea un apartado postal', addressState: 'Por favor seleccione un estado', addressCity: 'Por favor ingrese una ciudad', - acceptedTerms: 'Debes aceptar los Términos de servicio para continuar', genericFailureMessage: 'Se produjo un error al agregar su tarjeta. Vuelva a intentarlo', password: 'Por favor ingrese tu contraseña de Expensify', }, diff --git a/src/pages/ReimbursementAccount/BankAccountStep.js b/src/pages/ReimbursementAccount/BankAccountStep.js index 789772b5cfaf..53e2a96cb174 100644 --- a/src/pages/ReimbursementAccount/BankAccountStep.js +++ b/src/pages/ReimbursementAccount/BankAccountStep.js @@ -68,7 +68,7 @@ class BankAccountStep extends React.Component { this.errorTranslationKeys = { routingNumber: 'bankAccount.error.routingNumber', accountNumber: 'bankAccount.error.accountNumber', - hasAcceptedTerms: 'addDebitCardPage.error.acceptedTerms', + hasAcceptedTerms: 'common.error.acceptedTerms', }; this.getErrorText = inputKey => ReimbursementAccountUtils.getErrorText(this.props, this.errorTranslationKeys, inputKey); diff --git a/src/pages/settings/Payments/AddDebitCardPage.js b/src/pages/settings/Payments/AddDebitCardPage.js index dc0f308b5526..ef883c5d327a 100644 --- a/src/pages/settings/Payments/AddDebitCardPage.js +++ b/src/pages/settings/Payments/AddDebitCardPage.js @@ -84,7 +84,7 @@ class DebitCardPage extends Component { addressStreet: 'addDebitCardPage.error.addressStreet', addressState: 'addDebitCardPage.error.addressState', addressZipCode: 'addDebitCardPage.error.addressZipCode', - acceptedTerms: 'addDebitCardPage.error.acceptedTerms', + acceptedTerms: 'common.error.acceptedTerms', password: 'addDebitCardPage.error.password', }; From 61ad6c9f7144edaad5701fe1229c732d28856832 Mon Sep 17 00:00:00 2001 From: Muhammad Adeel Nawaz Date: Wed, 2 Mar 2022 21:41:01 +0500 Subject: [PATCH 3/3] use common terms error --- src/languages/en.js | 2 -- src/languages/es.js | 2 -- src/pages/EnablePayments/TermsStep.js | 2 +- src/pages/ReimbursementAccount/ACHContractStep.js | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index c39c80b4ded2..8efcc9c5d10b 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -574,7 +574,6 @@ export default { agreeToThe: 'I agree to the', walletAgreement: 'Wallet agreement', enablePayments: 'Enable payments', - termsMustBeAccepted: 'Terms must be accepted', feeAmountZero: '$0', monthlyFee: 'Monthly fee', inactivity: 'Inactivity', @@ -701,7 +700,6 @@ export default { termsAndConditions: 'terms and conditions', certifyTrueAndAccurate: 'I certify that the information provided is true and accurate', error: { - termsAndConditions: 'Must accept terms and conditions', certify: 'Must certify information is true and accurate', }, }, diff --git a/src/languages/es.js b/src/languages/es.js index 89d0093c050d..1361d5e07251 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -574,7 +574,6 @@ export default { agreeToThe: 'Estoy de acuerdo con la ', walletAgreement: 'Acuerdo de billetera', enablePayments: 'Habilitar pagos', - termsMustBeAccepted: 'Se deben aceptar los términos', feeAmountZero: '$0', monthlyFee: 'Cuota mensual', inactivity: 'Inactividad', @@ -703,7 +702,6 @@ export default { termsAndConditions: 'Términos y condiciones', certifyTrueAndAccurate: 'Certifico que la información dada es correcta', error: { - termsAndConditions: 'Debe aceptar términos y condiciones', certify: 'Debe certificar que la información es verdadera y precisa', }, }, diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.js index 8d83a3ed9419..8796487b7e0d 100644 --- a/src/pages/EnablePayments/TermsStep.js +++ b/src/pages/EnablePayments/TermsStep.js @@ -102,7 +102,7 @@ class TermsStep extends React.Component { /> {this.state.error && ( - {this.props.translate('termsStep.termsMustBeAccepted')} + {this.props.translate('common.error.acceptedTerms')} )}