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

Use new method of getting team icon
2017-02-10 16:39:11 +00:00 · 2017-02-10 16:39:11 +00:00 · 33fc4f7d8d
parent a5a43bcd93 69add8fd64
commit 33fc4f7d8d
1 changed files with 6 additions and 1 deletions
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@ -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>