mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-09-04 14:10:51 +00:00
commit 61bb682c7a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/structures/MatrixChat.js
View file

@ -1132,7 +1132,7 @@ export default React.createClass({
* *
* @param {string} teamToken * @param {string} teamToken
*/ */
_onLoggedIn: function(teamToken) { _onLoggedIn: async function(teamToken) {
this.setState({ this.setState({
view: VIEWS.LOGGED_IN, view: VIEWS.LOGGED_IN,
}); });
@ -1145,12 +1145,17 @@ export default React.createClass({
this._is_registered = false; this._is_registered = false;
if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) { if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
createRoom({ const roomId = await createRoom({
dmUserId: this.props.config.welcomeUserId, dmUserId: this.props.config.welcomeUserId,
// Only view the welcome user if we're NOT looking at a room // Only view the welcome user if we're NOT looking at a room
andView: !this.state.currentRoomId, andView: !this.state.currentRoomId,
}); });
return; // if successful, return because we're already
// viewing the welcomeUserId room
// else, if failed, fall through to view_home_page
if (roomId) {
return;
}
} }
// The user has just logged in after registering // The user has just logged in after registering
dis.dispatch({action: 'view_home_page'}); dis.dispatch({action: 'view_home_page'});