merge develop

src/stores/RoomViewStore.js

@@ -44,6 +44,8 @@ const INITIAL_STATE = {
     forwardingEvent: null,
 
     quotingEvent: null,
+
+    isEditingSettings: false,
 };
 
 /**
@@ -116,6 +118,16 @@ class RoomViewStore extends Store {
                     replyingToEvent: payload.event,
                 });
                 break;
+            case 'open_room_settings':
+                this._setState({
+                    isEditingSettings: true,
+                });
+                break;
+            case 'close_settings':
+                this._setState({
+                    isEditingSettings: false,
+                });
+                break;
         }
     }
 
@@ -135,6 +147,8 @@ class RoomViewStore extends Store {
                 joining: payload.joining || false,
                 // Reset replyingToEvent because we don't want cross-room because bad UX
                 replyingToEvent: null,
+                // pull the user out of Room Settings
+                isEditingSettings: false,
             };
 
             if (this._state.forwardingEvent) {
@@ -301,6 +315,10 @@ class RoomViewStore extends Store {
         return this._state.replyingToEvent;
     }
 
+    isEditingSettings() {
+        return this._state.isEditingSettings;
+    }
+
     shouldPeek() {
         return this._state.shouldPeek;
     }