OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Keep deferred actions for view_user_settings and view_create_chat
pull/21833/head
David Baker 2017-06-05 14:10:29 +01:00 committed by GitHub
parent cdd8cc41e2 3195b9f964
commit d8e3423060
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/structures/MatrixChat.js
View File

@ -444,6 +444,12 @@ module.exports = React.createClass({
break; break;
case 'view_user_settings': case 'view_user_settings':
if (MatrixClientPeg.get().isGuest()) { if (MatrixClientPeg.get().isGuest()) {
dis.dispatch({
action: 'do_after_sync_prepared',
deferred_action: {
action: 'view_user_settings',
},
});
dis.dispatch({action: 'view_set_mxid'}); dis.dispatch({action: 'view_set_mxid'});
break; break;
} }
@ -703,7 +709,13 @@ module.exports = React.createClass({
_createChat: function() { _createChat: function() {
if (MatrixClientPeg.get().isGuest()) { 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; return;
} }
const ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog"); const ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");