From 3195b9f964998ae61c94d8e96c60dd6aa61d6db5 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 5 Jun 2017 13:41:52 +0100
Subject: [PATCH] Keep deferred actions for view_user_settings and
 view_create_chat

This will bring up the correct UI as intended instead of defaulting to the home page with welcome user in the room list.

Fixes https://github.com/vector-im/riot-web/issues/4162
---
 src/components/structures/MatrixChat.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 5791ffe49a..e5912f58d5 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -444,6 +444,12 @@ module.exports = React.createClass({
                 break;
             case 'view_user_settings':
                 if (MatrixClientPeg.get().isGuest()) {
+                    dis.dispatch({
+                        action: 'do_after_sync_prepared',
+                        deferred_action: {
+                            action: 'view_user_settings',
+                        },
+                    });
                     dis.dispatch({action: 'view_set_mxid'});
                     break;
                 }
@@ -703,7 +709,13 @@ module.exports = React.createClass({
 
     _createChat: function() {
         if (MatrixClientPeg.get().isGuest()) {
-            this._setMxId();
+            dis.dispatch({
+                action: 'do_after_sync_prepared',
+                deferred_action: {
+                    action: 'view_create_chat',
+                },
+            });
+            dis.dispatch({action: 'view_set_mxid'});
             return;
         }
         const ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");