Merge pull request #706 from matrix-org/luke/fix-team-token-referral-…

…link Make UserSettings use the right teamToken
matrix-org · Feb 16, 2017 · 4753552 · 4753552
2 parents b13e6ca + 406c34b
commit 4753552
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
@@ -175,6 +175,7 @@ export default React.createClass({
                     collapsedRhs={this.props.collapse_rhs}
                     enableLabs={this.props.config.enableLabs}
                     referralBaseUrl={this.props.config.referralBaseUrl}
+                    teamToken={this.props.teamToken}
                 />;
                 if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
                 break;

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
@@ -109,6 +109,10 @@ module.exports = React.createClass({
 
         // true if RightPanel is collapsed
         collapsedRhs: React.PropTypes.bool,
+
+        // Team token for the referral link. If falsy, the referral section will
+        // not appear
+        teamToken: React.PropTypes.string,
     },
 
     getDefaultProps: function() {
@@ -462,7 +466,7 @@ module.exports = React.createClass({
     },
 
     _renderReferral: function() {
-        const teamToken = window.localStorage.getItem('mx_team_token');
+        const teamToken = this.props.teamToken;
         if (!teamToken) {
             return null;
         }