Merge pull request #1143 from matrix-org/luke/fix-login-multiple-fields

Only submit phone number when phone loginType is selected

src/components/views/login/PasswordLogin.js

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