OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Test `defaultServerName` before showing it on forgot password
pull/21833/head
J. Ryan Stinnett 2019-04-17 15:23:03 +01:00 committed by GitHub
parent 65020a56c1 adc23faf4b
commit 65784afb91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/auth/ForgotPassword.js
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,
});