From 5c395e4db737de08870976860fe95be455433bd6 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 4 Sep 2018 14:26:36 +0200
Subject: [PATCH] wait for room creation, to go to home page in case of failure
---
src/components/structures/MatrixChat.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 4bcfd77ff7..7a13067976 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1132,7 +1132,7 @@ export default React.createClass({
*
* @param {string} teamToken
*/
- _onLoggedIn: function(teamToken) {
+ _onLoggedIn: async function(teamToken) {
this.setState({
view: VIEWS.LOGGED_IN,
});
@@ -1145,12 +1145,17 @@ export default React.createClass({
this._is_registered = false;
if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) {
- createRoom({
+ const roomId = await createRoom({
dmUserId: this.props.config.welcomeUserId,
// Only view the welcome user if we're NOT looking at a room
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
dis.dispatch({action: 'view_home_page'});