imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Weblate 2018-06-26 16:15:25 +00:00
commit 0724a033a6
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/stores/RoomViewStore.js
View file

@ -147,6 +147,8 @@ class RoomViewStore extends Store {
joining: payload.joining || false, joining: payload.joining || false,
// Reset replyingToEvent because we don't want cross-room because bad UX // Reset replyingToEvent because we don't want cross-room because bad UX
replyingToEvent: null, replyingToEvent: null,
// pull the user out of Room Settings
isEditingSettings: false,
}; };
if (this._state.forwardingEvent) { if (this._state.forwardingEvent) {