From 1934c4a32f5d9cd9828d36e75fd8dd0900caea59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Tue, 20 Apr 2021 12:39:11 +0200
Subject: [PATCH] Add getLastViewedRoomsStorageKey()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/stores/SpaceStore.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
index 615007af20..a7efbafd1e 100644
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -41,7 +41,7 @@ type SpaceKey = string | symbol;
 interface IState {}
 
 const ACTIVE_SPACE_LS_KEY = "mx_active_space";
-const LAST_VIEWED_ROOMS = "mx_last_viewed_rooms";
+
 
 const LAST_VIEWED_ROOMS_HOME = "home_space";
 
@@ -54,6 +54,11 @@ export const UPDATE_SELECTED_SPACE = Symbol("selected-space");
 
 const MAX_SUGGESTED_ROOMS = 20;
 
+const getLastViewedRoomsStorageKey = (spaceId?) => {
+    if (!spaceId) return null;
+    return `mx_last_viewed_rooms_${spaceId}`;
+}
+
 const partitionSpacesAndRooms = (arr: Room[]): [Room[], Room[]] => { // [spaces, rooms]
     return arr.reduce((result, room: Room) => {
         result[room.isSpaceRoom() ? 0 : 1].push(room);
@@ -116,7 +121,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
         // view last selected room from space
         const spaceId = space?.roomId || LAST_VIEWED_ROOMS_HOME;
-        const roomId = window.localStorage.getItem(`${LAST_VIEWED_ROOMS}_${spaceId}`);
+        const roomId = window.localStorage.getItem(getLastViewedRoomsStorageKey(spaceId));
 
         if (roomId && this.matrixClient.getRoom(roomId).getMyMembership() === "join") {
             defaultDispatcher.dispatch({
@@ -515,7 +520,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
 
                 if (room) {
                     const activeSpaceId = this.activeSpace?.roomId || LAST_VIEWED_ROOMS_HOME;
-                    window.localStorage.setItem(`${LAST_VIEWED_ROOMS}_${activeSpaceId}`, payload.room_id);
+                    window.localStorage.setItem(getLastViewedRoomsStorageKey(activeSpaceId), payload.room_id);
                 }
 
                 if (room?.getMyMembership() === "join") {