From 747c0c44a68be5d40dfcad34b26af15e6d6092b0 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 9 Feb 2017 09:24:46 +0000
Subject: [PATCH 1/2] Use new method of getting team icon

This was necessary because the team token may not be known when registering, but domain is. Storing the icon under the "common" directory is the chosen solution to this.
---
 src/components/structures/login/Registration.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index efe7dae723..78e65519ff 100644
--- 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 ?
+                            "https://riot.im/rts/static/common/" +
+                            this.state.teamSelected.domain + "/icon.png" :
+                            null}
+                    />
                     {this._getRegisterContentJsx()}
                     <LoginFooter />
                 </div>

From 69add8fd642a584281aecf0c775702144d2073fb Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 9 Feb 2017 13:16:46 +0000
Subject: [PATCH 2/2] Actually use the RTS URL

---
 src/components/structures/login/Registration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 78e65519ff..7887f3e7de 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -428,7 +428,7 @@ module.exports = React.createClass({
                 <div className="mx_Login_box">
                     <LoginHeader
                         icon={this.state.teamSelected ?
-                            "https://riot.im/rts/static/common/" +
+                            this.props.teamServerConfig.teamServerURL + "/static/common/" +
                             this.state.teamSelected.domain + "/icon.png" :
                             null}
                     />