From e219fe082adf3c2669323251bd9571493bee58d3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 22 Apr 2021 12:07:16 +0100
Subject: [PATCH] Tweak context switching edge case for space invites

---
 src/stores/SpaceStore.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index c28e24a460..a9a73e164f 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -123,7 +123,12 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
             // view last selected room from space
             const roomId = window.localStorage.getItem(getSpaceContextKey(this.activeSpace));
 
-            if (roomId && this.matrixClient?.getRoom(roomId)?.getMyMembership() === "join") {
+            // if the space being selected is an invite then always view that invite
+            // else if the last viewed room in this space is joined then view that
+            // else view space home or home depending on what is being clicked on
+            if (space?.getMyMembership !== "invite" &&
+                this.matrixClient?.getRoom(roomId)?.getMyMembership() === "join"
+            ) {
                 defaultDispatcher.dispatch({
                     action: "view_room",
                     room_id: roomId,