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

Merge remote-tracking branch 'origin/develop' into feature_confetti#14676

Browse source
This commit is contained in:
Travis Ralston 2020-12-07 14:58:56 -07:00
commit 2c992c456e
100 changed files with 3268 additions and 1825 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/RoomView.tsx
View file

@ -1360,7 +1360,7 @@ export default class RoomView extends React.Component<IProps, IState> {
rejecting: true,
});
this.context.leave(this.state.roomId).then(() => {
dis.dispatch({ action: 'view_next_room' });
dis.dispatch({ action: 'view_home_page' });
this.setState({
rejecting: false,
});
@ -1394,7 +1394,7 @@ export default class RoomView extends React.Component<IProps, IState> {
await this.context.setIgnoredUsers(ignoredUsers);
await this.context.leave(this.state.roomId);
dis.dispatch({ action: 'view_next_room' });
dis.dispatch({ action: 'view_home_page' });
this.setState({
rejecting: false,
});