diff --git a/src/languages/en.js b/src/languages/en.js index ad9310d9dcd1..ab6fcf0d5283 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -85,7 +85,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', + acceptTerms: 'You must accept the Terms of Service to continue', phoneNumber: `Please enter a valid phone number, with the country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER})`, fieldRequired: 'This field is required.', characterLimit: ({limit}) => `Exceeds the maximum length of ${limit} characters`, diff --git a/src/languages/es.js b/src/languages/es.js index e299f3a7db0f..cfcb0e707a0f 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -85,7 +85,7 @@ export default { genericErrorMessage: 'Ups... algo no ha ido bien y la acción no se pudo completar. Por favor inténtalo más tarde.', error: { invalidAmount: 'Monto no válido', - acceptedTerms: 'Debes aceptar los Términos de servicio para continuar', + acceptTerms: 'Debes aceptar los Términos de servicio para continuar', phoneNumber: `Ingresa un teléfono válido, incluyendo el código de país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`, fieldRequired: 'Este campo es obligatorio.', characterLimit: ({limit}) => `Supera el límite de ${limit} caracteres`, diff --git a/src/libs/ReimbursementAccountUtils.js b/src/libs/ReimbursementAccountUtils.js index 59f3cd4810d2..e8d3f3b66cf4 100644 --- a/src/libs/ReimbursementAccountUtils.js +++ b/src/libs/ReimbursementAccountUtils.js @@ -11,8 +11,7 @@ import lodashGet from 'lodash/get'; * @returns {*} */ function getDefaultStateForField(reimbursementAccountDraft, reimbursementAccount, fieldName, defaultValue = '') { - return lodashGet(reimbursementAccountDraft, fieldName) - || lodashGet(reimbursementAccount, ['achData', fieldName], defaultValue); + return lodashGet(reimbursementAccountDraft, fieldName, lodashGet(reimbursementAccount, ['achData', fieldName], defaultValue)); } export { diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.js index 2fcd7ad61ac8..58dd5a93ae5a 100644 --- a/src/pages/EnablePayments/TermsStep.js +++ b/src/pages/EnablePayments/TermsStep.js @@ -60,7 +60,7 @@ class TermsStep extends React.Component { } render() { - const errorMessage = this.state.error ? this.props.translate('common.error.acceptedTerms') : (ErrorUtils.getLatestErrorMessage(this.props.walletTerms) || ''); + const errorMessage = this.state.error ? this.props.translate('common.error.acceptTerms') : (ErrorUtils.getLatestErrorMessage(this.props.walletTerms) || ''); return ( <> ( {this.props.translate('common.iAcceptThe')} diff --git a/src/pages/settings/Payments/AddDebitCardPage.js b/src/pages/settings/Payments/AddDebitCardPage.js index 542979a2b279..c15686ac5bae 100644 --- a/src/pages/settings/Payments/AddDebitCardPage.js +++ b/src/pages/settings/Payments/AddDebitCardPage.js @@ -99,8 +99,8 @@ class DebitCardPage extends Component { errors.password = this.props.translate('addDebitCardPage.error.password'); } - if (!values.acceptedTerms) { - errors.acceptedTerms = this.props.translate('common.error.acceptedTerms'); + if (!values.acceptTerms) { + errors.acceptTerms = this.props.translate('common.error.acceptTerms'); } return errors; @@ -186,7 +186,7 @@ class DebitCardPage extends Component { /> ( {`${this.props.translate('common.iAcceptThe')}`}