Merge pull request #1031 from matrix-org/luke/fix-deferred-start-chat…

…-settings Keep deferred actions for view_user_settings and view_create_chat
matrix-org · Jun 5, 2017 · d8e3423 · d8e3423
2 parents cdd8cc4 + 3195b9f
commit d8e3423
Showing 1 changed file with 13 additions and 1 deletion.
diff --git 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");