Merge branch 'develop' into luke/fix-rte-strikeout

2017-06-26 09:41:17 +01:00
parent 9404dd30c5 caa0250d30
commit c1bceb81d2
7 changed files with 143 additions and 88 deletions
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -69,10 +69,19 @@ class PasswordLogin extends React.Component {

    onSubmitForm(ev) {
        ev.preventDefault();
+        if (this.state.loginType === PasswordLogin.LOGIN_FIELD_PHONE) {
+            this.props.onSubmit(
+                '', // XXX: Synapse breaks if you send null here:
+                this.state.phoneCountry,
+                this.state.phoneNumber,
+                this.state.password,
+            );
+            return;
+        }
        this.props.onSubmit(
            this.state.username,
-            this.state.phoneCountry,
-            this.state.phoneNumber,
+            null,
+            null,
            this.state.password,
        );
    }