From 4170e30fd76133e8cace880574a36058103c5706 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 17 Feb 2022 00:18:37 +0530 Subject: [PATCH 1/3] Update label for Close account login field --- src/languages/en.js | 2 +- src/languages/es.js | 2 +- src/pages/settings/Security/CloseAccountPage.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index cc56939abce1..bfb72650a5a4 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -303,7 +303,7 @@ export default { closeAccountSuccess: 'Account closed successfully', closeAccountActionRequired: 'Looks like you need to complete some actions before closing your account. Check out the guide', closeAccountTryAgainAfter: 'and try again after.', - typeToConfirm: ({emailOrPhone}) => `Enter ${emailOrPhone} to confirm`, + enterPrimaryLogin: 'Enter your primary login', okayGotIt: 'Okay, Got it', }, passwordPage: { diff --git a/src/languages/es.js b/src/languages/es.js index c203dd4df45c..53abb0de027f 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -303,7 +303,7 @@ export default { closeAccountSuccess: 'Cuenta cerrada exitosamente', closeAccountActionRequired: 'Parece que necesitas completar algunas acciones antes de cerrar tu cuenta. Mira la guía', closeAccountTryAgainAfter: 'e intenta nuevamente', - typeToConfirm: ({emailOrPhone}) => `Ingresa ${emailOrPhone} para confirmar`, + enterPrimaryLogin: 'Enter your primary login', okayGotIt: 'Ok, entendido', }, passwordPage: { diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js index 37df0e095396..ff270f1f2fc7 100644 --- a/src/pages/settings/Security/CloseAccountPage.js +++ b/src/pages/settings/Security/CloseAccountPage.js @@ -90,7 +90,7 @@ class CloseAccountPage extends Component { autoCapitalize="none" value={this.state.phoneOrEmail} onChangeText={phoneOrEmail => this.setState({phoneOrEmail: phoneOrEmail.toLowerCase()})} - label={this.props.translate('closeAccountPage.typeToConfirm', {emailOrPhone: userEmailOrPhone})} + label={this.props.translate('closeAccountPage.enterPrimaryLogin')} containerStyles={[styles.mt5]} /> From ea5df9beb7d5652a0a4bd205512c6b1f1a620e38 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 17 Feb 2022 00:24:10 +0530 Subject: [PATCH 2/3] Add primary login above the input field --- src/languages/en.js | 1 + src/languages/es.js | 1 + src/pages/settings/Security/CloseAccountPage.js | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/src/languages/en.js b/src/languages/en.js index bfb72650a5a4..de794168e55d 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -304,6 +304,7 @@ export default { closeAccountActionRequired: 'Looks like you need to complete some actions before closing your account. Check out the guide', closeAccountTryAgainAfter: 'and try again after.', enterPrimaryLogin: 'Enter your primary login', + primaryLogin: 'Primary login:', okayGotIt: 'Okay, Got it', }, passwordPage: { diff --git a/src/languages/es.js b/src/languages/es.js index 53abb0de027f..4cff90eb1342 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -304,6 +304,7 @@ export default { closeAccountActionRequired: 'Parece que necesitas completar algunas acciones antes de cerrar tu cuenta. Mira la guía', closeAccountTryAgainAfter: 'e intenta nuevamente', enterPrimaryLogin: 'Enter your primary login', + primaryLogin: 'Primary login:', okayGotIt: 'Ok, entendido', }, passwordPage: { diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js index ff270f1f2fc7..7f157fc41b7e 100644 --- a/src/pages/settings/Security/CloseAccountPage.js +++ b/src/pages/settings/Security/CloseAccountPage.js @@ -86,6 +86,13 @@ class CloseAccountPage extends Component { {' '} {this.props.translate('closeAccountPage.closeAccountPermanentlyDeleteData')} + + + {this.props.translate('closeAccountPage.primaryLogin')} + + {' '} + {userEmailOrPhone} + Date: Fri, 25 Feb 2022 02:47:29 +0530 Subject: [PATCH 3/3] Change copy text --- src/languages/en.js | 4 ++-- src/languages/es.js | 4 ++-- src/pages/settings/Security/CloseAccountPage.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index de794168e55d..01c8022a4ac0 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -303,8 +303,8 @@ export default { closeAccountSuccess: 'Account closed successfully', closeAccountActionRequired: 'Looks like you need to complete some actions before closing your account. Check out the guide', closeAccountTryAgainAfter: 'and try again after.', - enterPrimaryLogin: 'Enter your primary login', - primaryLogin: 'Primary login:', + enterDefaultContact: 'Enter your default contact method', + defaultContact: 'Default contact method:', okayGotIt: 'Okay, Got it', }, passwordPage: { diff --git a/src/languages/es.js b/src/languages/es.js index 4cff90eb1342..448d2dd38532 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -303,8 +303,8 @@ export default { closeAccountSuccess: 'Cuenta cerrada exitosamente', closeAccountActionRequired: 'Parece que necesitas completar algunas acciones antes de cerrar tu cuenta. Mira la guía', closeAccountTryAgainAfter: 'e intenta nuevamente', - enterPrimaryLogin: 'Enter your primary login', - primaryLogin: 'Primary login:', + enterDefaultContact: 'Introduce tu método de contacto predeterminado', + defaultContact: 'Método de contacto predeterminado:', okayGotIt: 'Ok, entendido', }, passwordPage: { diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js index 7f157fc41b7e..0dc86b86cd15 100644 --- a/src/pages/settings/Security/CloseAccountPage.js +++ b/src/pages/settings/Security/CloseAccountPage.js @@ -88,7 +88,7 @@ class CloseAccountPage extends Component { - {this.props.translate('closeAccountPage.primaryLogin')} + {this.props.translate('closeAccountPage.defaultContact')} {' '} {userEmailOrPhone} @@ -97,7 +97,7 @@ class CloseAccountPage extends Component { autoCapitalize="none" value={this.state.phoneOrEmail} onChangeText={phoneOrEmail => this.setState({phoneOrEmail: phoneOrEmail.toLowerCase()})} - label={this.props.translate('closeAccountPage.enterPrimaryLogin')} + label={this.props.translate('closeAccountPage.enterDefaultContact')} containerStyles={[styles.mt5]} />