matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-27 04:21:52 +03:00
Code Activity

Merge pull request from matrix-org/luke/rts-set-team-token-view-home

Browse Source 
View /home on registered /w team
This commit is contained in:
David Baker
2017-02-14 10:21:23 +00:00
committed by GitHub
parent a21e71f59d 16e3365240
commit 18cba1fe45
2 changed files with 8 additions and 0 deletions
src/components/structures
MatrixChat.js
login
Registration.js

6
src/components/structures/MatrixChat.js

@ -991,6 +991,11 @@ module.exports = React.createClass({
this._setPage(PageTypes.UserSettings);
},
onTeamMemberRegistered: function(teamToken) {
this._teamToken = teamToken;
this._setPage(PageTypes.HomePage);
},
onFinishPostRegistration: function() {
// Don't confuse this with "PageType" which is the middle window to show
this.setState({
@ -1119,6 +1124,7 @@ module.exports = React.createClass({
customIsUrl={this.getCurrentIsUrl()}
registrationUrl={this.props.registrationUrl}
defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
onTeamMemberRegistered={this.onTeamMemberRegistered}
onLoggedIn={this.onRegistered}
onLoginClick={this.onLoginClick}
onRegisterClick={this.onRegisterClick}