From 406c34b71576050fb9beffaee12088c1e55965af Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 16 Feb 2017 18:00:52 +0000 Subject: [PATCH] Make UserSettings use the right teamToken This threads the correct teamToken through to UserSettings for generating the referral section. --- src/components/structures/LoggedInView.js | 1 + src/components/structures/UserSettings.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js index 961277a4a1e..aa9470f1265 100644 --- 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 = ; break; diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index fdade60dfda..f8240e247b1 100644 --- 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; }