OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4633 from matrix-org/t3chguy/group-view-guest 

fix viewGroup to actually show the group if possible
pull/21833/head
Michael Telatynski 2020-05-26 12:03:52 +01:00 committed by GitHub
parent 8062e5a6e8 c372e8edee
commit a64de63f00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/structures/MatrixChat.tsx
View File

@ -932,9 +932,20 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
}); });
} }
private viewGroup(payload) { private async viewGroup(payload) {
const groupId = payload.group_id; const groupId = payload.group_id;
// Wait for the first sync to complete
if (!this.firstSyncComplete) {
if (!this.firstSyncPromise) {
console.warn('Cannot view a group before first sync. group_id:', groupId);
return;
}
await this.firstSyncPromise.promise;
}
this.setState({ this.setState({
view: Views.LOGGED_IN,
currentGroupId: groupId, currentGroupId: groupId,
currentGroupIsNew: payload.group_is_new, currentGroupIsNew: payload.group_is_new,
}); });