Merge pull request from matrix-org/luke/rts-fix-reg-icon

Use new method of getting team icon
This commit is contained in:
David Baker 2017-02-10 16:39:11 +00:00 committed by GitHub
commit 33fc4f7d8d

View file

@ -426,7 +426,12 @@ module.exports = React.createClass({
return (
<div className="mx_Login">
<div className="mx_Login_box">
<LoginHeader icon={this.state.teamSelected ? this.state.teamSelected.icon : null}/>
<LoginHeader
icon={this.state.teamSelected ?
this.props.teamServerConfig.teamServerURL + "/static/common/" +
this.state.teamSelected.domain + "/icon.png" :
null}
/>
{this._getRegisterContentJsx()}
<LoginFooter />
</div>