From a7bdd4b6a6fd48a852a3313da5f4838ba4077ebb Mon Sep 17 00:00:00 2001 From: Sofiya Tepikin Date: Mon, 8 Aug 2022 12:37:20 +0200 Subject: [PATCH 1/3] Prettify enter-new-password --- .../settings/password/enter-new-password.js | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/components/settings/password/enter-new-password.js b/components/settings/password/enter-new-password.js index 15f5d08..7ce4733 100644 --- a/components/settings/password/enter-new-password.js +++ b/components/settings/password/enter-new-password.js @@ -13,7 +13,6 @@ import settings from '../../../i18n/en/settings' const LISTENER_TYPE = 'create-or-change-pw' export default class EnterNewPassword extends Component { - constructor() { super() this.state = { @@ -52,15 +51,12 @@ export default class EnterNewPassword extends Component { this.setState({ passwordConfirmation }) } - render () { - const { - password, - passwordConfirmation, - shouldShowErrorMessage - } = this.state + render() { + const { password, passwordConfirmation, shouldShowErrorMessage } = + this.state const labels = settings.passwordSettings const isButtonActive = - (password.length > 0) && (passwordConfirmation.length > 0) + password.length > 0 && passwordConfirmation.length > 0 return ( @@ -80,9 +76,9 @@ export default class EnterNewPassword extends Component { value={passwordConfirmation} secureTextEntry={true} /> - {shouldShowErrorMessage && + {shouldShowErrorMessage && ( {labels.passwordsDontMatch} - } + )} @@ -94,6 +90,6 @@ export default class EnterNewPassword extends Component { const styles = StyleSheet.create({ error: { color: Colors.orange, - marginTop: Spacing.base - } -}) \ No newline at end of file + marginTop: Spacing.base, + }, +}) From 33dba03c47d27ea9a1d5f5a5695146cf16682778 Mon Sep 17 00:00:00 2001 From: Sofiya Tepikin Date: Mon, 8 Aug 2022 12:38:20 +0200 Subject: [PATCH 2/3] Disable button when no input --- components/settings/password/enter-new-password.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/settings/password/enter-new-password.js b/components/settings/password/enter-new-password.js index 7ce4733..33c4c28 100644 --- a/components/settings/password/enter-new-password.js +++ b/components/settings/password/enter-new-password.js @@ -79,7 +79,11 @@ export default class EnterNewPassword extends Component { {shouldShowErrorMessage && ( {labels.passwordsDontMatch} )} - From e37d44c506eae3f09b4bdee4e87eb6ad3293fa8f Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Mon, 8 Aug 2022 13:31:17 +0200 Subject: [PATCH 3/3] Bump version number 1.2208.8 --- ios/drip.xcodeproj/project.pbxproj | 4 ++-- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/drip.xcodeproj/project.pbxproj b/ios/drip.xcodeproj/project.pbxproj index 0b516a8..d4d8c34 100644 --- a/ios/drip.xcodeproj/project.pbxproj +++ b/ios/drip.xcodeproj/project.pbxproj @@ -857,7 +857,7 @@ "\"${PODS_ROOT}/../../node_modules/realm/vendor/realm-ios\"", "$(inherited)", ); - MARKETING_VERSION = 1.2208.2; + MARKETING_VERSION = 1.2208.8; OTHER_LDFLAGS = ( "-ObjC", "-lc++", @@ -936,7 +936,7 @@ "\"${PODS_ROOT}/../../node_modules/realm/vendor/realm-ios\"", "$(inherited)", ); - MARKETING_VERSION = 1.2208.2; + MARKETING_VERSION = 1.2208.8; OTHER_LDFLAGS = ( "-ObjC", "-lc++", diff --git a/package-lock.json b/package-lock.json index 41d742b..8fdacfc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "drip.", - "version": "1.2208.2", + "version": "1.2208.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0c8b718..de4d2d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "drip.", - "version": "1.2208.2", + "version": "1.2208.8", "contributors": [ "Julia Friesel ", "Marie Kochsiek",