Merge branch 'fix/empty-password' into 'release'

Fix/empty password

See merge request bloodyhealth/drip!456

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 () {
+  render() {
-    const {
+    const { password, passwordConfirmation, shouldShowErrorMessage } =
-      password,
+      this.state
-      passwordConfirmation,
-      shouldShowErrorMessage
-    } = this.state
     const labels = settings.passwordSettings
     const isButtonActive =
-      (password.length > 0) && (passwordConfirmation.length > 0)
+      password.length > 0 && passwordConfirmation.length > 0
 
     return (
       <React.Fragment>
@@ -80,10 +76,14 @@ export default class EnterNewPassword extends Component {
           value={passwordConfirmation}
           secureTextEntry={true}
         />
-        {shouldShowErrorMessage &&
+        {shouldShowErrorMessage && (
           <AppText style={styles.error}>{labels.passwordsDontMatch}</AppText>
-        }
+        )}
-        <Button isCTA={isButtonActive} onPress={this.savePassword}>
+        <Button
+          isCTA={isButtonActive}
+          disabled={!isButtonActive}
+          onPress={this.savePassword}
+        >
           {labels.savePassword}
         </Button>
       </React.Fragment>
@@ -94,6 +94,6 @@ export default class EnterNewPassword extends Component {
 const styles = StyleSheet.create({
   error: {
     color: Colors.orange,
-    marginTop: Spacing.base
+    marginTop: Spacing.base,
-  }
+  },
-})
+})

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++",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "drip.",
-  "version": "1.2208.2",
+  "version": "1.2208.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drip.",
-  "version": "1.2208.2",
+  "version": "1.2208.8",
   "contributors": [
     "Julia Friesel <julia.friesel@gmail.com>",
     "Marie Kochsiek",