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

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

This commit is contained in:
Travis Ralston
2020-01-09 14:15:09 -07:00
190 changed files with 6185 additions and 2225 deletions

View File

@@ -32,7 +32,7 @@ export default createReactClass({
return {
busy: false,
ready: false,
isGroupPublicised: null,
isGroupPublicised: false, // assume false as <ToggleSwitch /> expects a boolean
};
},
@@ -43,7 +43,7 @@ export default createReactClass({
_initGroupStore: function(groupId) {
this._groupStoreToken = GroupStore.registerListener(groupId, () => {
this.setState({
isGroupPublicised: GroupStore.getGroupPublicity(groupId),
isGroupPublicised: Boolean(GroupStore.getGroupPublicity(groupId)),
ready: GroupStore.isStateReady(groupId, GroupStore.STATE_KEY.Summary),
});
});