OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Make UserSettings use the right teamToken
pull/21833/head
David Baker 2017-02-16 18:12:46 +00:00 committed by GitHub
parent b13e6ca022 406c34b715
commit 4753552ddc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/LoggedInView.js
View File

@ -175,6 +175,7 @@ export default React.createClass({
collapsedRhs={this.props.collapse_rhs} collapsedRhs={this.props.collapse_rhs}
enableLabs={this.props.config.enableLabs} enableLabs={this.props.config.enableLabs}
referralBaseUrl={this.props.config.referralBaseUrl} referralBaseUrl={this.props.config.referralBaseUrl}
teamToken={this.props.teamToken}
/>; />;
if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>; if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
break; break;

6
src/components/structures/UserSettings.js
View File

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