imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3

Browse source 
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
This commit is contained in:
Michael Telatynski 2020-05-26 13:38:17 +01:00
commit c74d890774
56 changed files with 2052 additions and 733 deletions
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;
// 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({
view: Views.LOGGED_IN,
currentGroupId: groupId,
currentGroupIsNew: payload.group_is_new,
});