From a2bb240dcb71c16f756184a5bacb586522ba8472 Mon Sep 17 00:00:00 2001 From: lukebarnard Date: Wed, 3 Jan 2018 14:04:53 +0000 Subject: [PATCH 1/2] Fetch group data for all tags instead of those selected so that tag switching is not delayed by fetching group data, i.e group members and rooms. --- src/components/views/rooms/RoomList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 82516cc218..2dc36d5700 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -96,7 +96,7 @@ module.exports = React.createClass({ this._visibleRooms = []; // When the selected tags are changed, initialise a group store if necessary this._tagStoreToken = TagOrderStore.addListener(() => { - TagOrderStore.getSelectedTags().forEach((tag) => { + TagOrderStore.getOrderedTags().forEach((tag) => { if (tag[0] !== '+' || this._groupStores[tag]) { return; } From 2baacfa56222a3697076af3fc9c120b7d877956a Mon Sep 17 00:00:00 2001 From: lukebarnard Date: Wed, 3 Jan 2018 14:12:28 +0000 Subject: [PATCH 2/2] Handle case where ordering is not yet known --- src/components/views/rooms/RoomList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js index 2dc36d5700..0339ce738d 100644 --- a/src/components/views/rooms/RoomList.js +++ b/src/components/views/rooms/RoomList.js @@ -96,7 +96,7 @@ module.exports = React.createClass({ this._visibleRooms = []; // When the selected tags are changed, initialise a group store if necessary this._tagStoreToken = TagOrderStore.addListener(() => { - TagOrderStore.getOrderedTags().forEach((tag) => { + (TagOrderStore.getOrderedTags() || []).forEach((tag) => { if (tag[0] !== '+' || this._groupStores[tag]) { return; }