Merge pull request #5825 from matrix-org/travis/spaces/room-list

Restabilize room list ordering with prefiltering on spaces/communities

test/components/views/rooms/RoomList-test.js

@@ -296,6 +296,11 @@ describe('RoomList', () => {
             GroupStore._notifyListeners();
 
             await waitForRoomListStoreUpdate();
+
+            // XXX: Even though the store updated, it can take a bit before the update makes
+            // it to the components. This gives it plenty of time to figure out what to do.
+            await (new Promise(resolve => setTimeout(resolve, 500)));
+
             expectRoomInSubList(otherRoom, (s) => s.props.tagId === DefaultTagID.Untagged);
         });