matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Return null if TagOrderStore is loading

Browse Source 
The view should decide the default state.
This commit is contained in:
Luke Barnard
2017-12-11 17:19:29 +00:00
parent 991ea4ebe5
commit aa914098dc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/TagPanel.js
View File

@@ -58,7 +58,7 @@ const TagPanel = React.createClass({
return;
}
const orderedTags = TagOrderStore.getOrderedTags();
const orderedTags = TagOrderStore.getOrderedTags() || [];
const orderedGroupTags = orderedTags.filter((t) => t[0] === '+');
Promise.all(orderedGroupTags.map(
(groupId) => FlairStore.getGroupProfileCached(this.context.matrixClient, groupId),

2
src/stores/TagOrderStore.js
View File

@@ -94,7 +94,7 @@ class TagOrderStore extends Store {
_updateOrderedTags() {
this._setState({
orderedTags: this._state.hasSynced && this._state.hasFetchedJoinedGroups ?
this._state.orderedTagsAccountData || this._state.joinedGroupIds : [],
this._state.orderedTagsAccountData || this._state.joinedGroupIds : null,
});
}