Merge pull request #3368 from matrix-org/travis/disable-msisdn

Disable MSISDN registration if the homeserver doesn't support it

src/components/views/auth/RegistrationForm.js

@@ -448,7 +448,8 @@ module.exports = createReactClass({
     _showPhoneNumber() {
         const threePidLogin = !SdkConfig.get().disable_3pid_login;
         const haveIs = Boolean(this.props.serverConfig.isUrl);
-        if (!threePidLogin || !haveIs || !this._authStepIsUsed('m.login.msisdn')) {
+        const haveRequiredIs = this.props.serverRequiresIdServer && !haveIs;
+        if (!threePidLogin || haveRequiredIs || !this._authStepIsUsed('m.login.msisdn')) {
             return false;
         }
         return true;