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

Fix being wrongly sent to Home space when creating/joining/leaving rooms (#7418)

Browse source
This commit is contained in:
Michael Telatynski 2021-12-23 12:01:14 +00:00 • committed by GitHub
parent a20f3560da
commit f94bad7f0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/utils/membership.ts
View file

@ -26,6 +26,9 @@ import ErrorDialog from "../components/views/dialogs/ErrorDialog";
import dis from "../dispatcher/dispatcher";
import RoomViewStore from "../stores/RoomViewStore";
import Spinner from "../components/views/elements/Spinner";
import { isMetaSpace } from "../stores/spaces";
import SpaceStore from "../stores/spaces/SpaceStore";
import { Action } from "../dispatcher/actions";
/**
* Approximation of a membership status for a given room.
@ -179,7 +182,16 @@ export async function leaveRoomBehaviour(roomId: string, retry = true, spinner =
return;
}
if (RoomViewStore.getRoomId() === roomId) {
if (SpaceStore.spacesEnabled &&
!isMetaSpace(SpaceStore.instance.activeSpace) &&
SpaceStore.instance.activeSpace !== roomId &&
RoomViewStore.getRoomId() === roomId
) {
dis.dispatch({
action: Action.ViewRoom,
room_id: SpaceStore.instance.activeSpace,
});
} else {
dis.dispatch({ action: 'view_home_page' });
}
}