Merge pull request #2924 from jryans/password-on-server-name

Test `defaultServerName` before showing it on forgot password
This commit is contained in:
J. Ryan Stinnett 2019-04-17 15:23:03 +01:00 committed by GitHub
commit 65784afb91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -222,7 +222,7 @@ module.exports = React.createClass({
}
let yourMatrixAccountText = _t('Your Matrix account');
if (this.state.enteredHsUrl === this.props.defaultHsUrl) {
if (this.state.enteredHsUrl === this.props.defaultHsUrl && this.props.defaultServerName) {
yourMatrixAccountText = _t('Your Matrix account on %(serverName)s', {
serverName: this.props.defaultServerName,
});