From 6b6e59e0dd7391cffd8956cf43cbf739869fd9ea Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 14 Sep 2017 22:22:21 +0100
Subject: [PATCH] Display spinner not room preview after room create

After creating a room, display the activity spinner while we wait
for the room to come down the event stream.

This was the intention before but I can't see how it would have
worked: we were setting the 'joining' flag, but then resetting it
by claiming we were already joined in the view_room dispatch.

 * Send 'joining' instead of 'joined' in view_room dispatch, which
   will set the corresponding joining flag (ie. to indicate we've
   sent a request to join the room). Remove the 'joined' flag.
 * Reset 'joining' to false otherwise on a view_room dispatch to
   prevent it from leaking between rooms (this may have been the
   intention of the `if (payload.joined) newState.joining = false`?

Fixes https://github.com/vector-im/riot-web/issues/4701
---
 src/createRoom.js           | 12 ++++--------
 src/stores/RoomViewStore.js |  6 ++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/createRoom.js b/src/createRoom.js
index 944c6a70a1..ffe3a85c4e 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -79,12 +79,6 @@ function createRoom(opts) {
     const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
 
     let roomId;
-    if (opts.andView) {
-        // We will possibly have a successful join, indicate as such
-        dis.dispatch({
-            action: 'will_join',
-        });
-    }
     return client.createRoom(createOpts).finally(function() {
         modal.close();
     }).then(function(res) {
@@ -104,8 +98,10 @@ function createRoom(opts) {
                 action: 'view_room',
                 room_id: roomId,
                 should_peek: false,
-                // Creating a room will have joined us to the room
-                joined: true,
+                // Creating a room will have joined us to the room,
+                // so we are expecting the room to come down the sync
+                // stream, if it hasn't already.
+                joining: true,
             });
         }
         return roomId;
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 17fcc97160..a028fc077f 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -119,12 +119,10 @@ class RoomViewStore extends Store {
                 roomLoadError: null,
                 // should peek by default
                 shouldPeek: payload.should_peek === undefined ? true : payload.should_peek,
+                // have we sent a join request for this room and are waiting for a response?
+                joining: payload.joining || false,
             };
 
-            if (payload.joined) {
-                newState.joining = false;
-            }
-
             if (this._state.forwardingEvent) {
                 dis.dispatch({
                     action: 'send_event',