diff --git a/playwright/snapshots/settings/quick-settings-menu.spec.ts/quick-settings-linux.png b/playwright/snapshots/settings/quick-settings-menu.spec.ts/quick-settings-linux.png index 2992e35d60e..52946ff9a0b 100644 Binary files a/playwright/snapshots/settings/quick-settings-menu.spec.ts/quick-settings-linux.png and b/playwright/snapshots/settings/quick-settings-menu.spec.ts/quick-settings-linux.png differ diff --git a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx index 041e437661e..7fb84b05e3c 100644 --- a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx @@ -71,9 +71,6 @@ const SidebarUserSettingsTab: React.FC = () => { PosthogTrackers.trackInteraction("WebSettingsSidebarTabSpacesCheckbox", event, 1); }; - // "Favourites" and "People" meta spaces are not available in the new room list - const newRoomListEnabled = useSettingValue("feature_new_room_list"); - return ( @@ -103,35 +100,25 @@ const SidebarUserSettingsTab: React.FC = () => { {_t("settings|sidebar|metaspaces_home_all_rooms")} - {!newRoomListEnabled && ( - <> - - - {_t("common|favourites")} - + + + {_t("common|favourites")} + - - - {_t("common|people")} - - - )} + + + {_t("common|people")} + )} - {!newRoomListEnabled && ( - <> -

- - {_t("quick_settings|metaspace_section")} -

- - - {_t("common|favourites")} - - - - {_t("common|people")} - - { - closeMenu(); - defaultDispatcher.dispatch({ - action: Action.ViewUserSettings, - initialTabId: UserTab.Sidebar, - }); - }} - > - - {_t("quick_settings|sidebar_settings")} - - - )} +

+ + {_t("quick_settings|metaspace_section")} +

+ + + {_t("common|favourites")} + + + + {_t("common|people")} + + { + closeMenu(); + defaultDispatcher.dispatch({ + action: Action.ViewUserSettings, + initialTabId: UserTab.Sidebar, + }); + }} + > + + {_t("quick_settings|sidebar_settings")} + ); diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts index bfb98f6b02a..81620eb55c6 100644 --- a/src/stores/spaces/SpaceStore.ts +++ b/src/stores/spaces/SpaceStore.ts @@ -172,17 +172,11 @@ export class SpaceStoreClass extends AsyncStoreWithClient { } /** - * Get the order of meta spaces to display in the space panel. - * - * This accessor should be removed when the "feature_new_room_list" labs flag is removed. - * "People" and "Favourites" will be removed from the "metaSpaceOrder" array and this filter will no longer be needed. + * Get the order of meta spaces to display in the space panel * @private */ private get metaSpaceOrder(): MetaSpace[] { - if (!SettingsStore.getValue("feature_new_room_list")) return metaSpaceOrder; - - // People and Favourites are not shown when the new room list is enabled - return metaSpaceOrder.filter((space) => space !== MetaSpace.People && space !== MetaSpace.Favourites); + return metaSpaceOrder; } public get invitedSpaces(): Room[] { diff --git a/test/unit-tests/stores/SpaceStore-test.ts b/test/unit-tests/stores/SpaceStore-test.ts index fc05cf5fed3..c83a120c034 100644 --- a/test/unit-tests/stores/SpaceStore-test.ts +++ b/test/unit-tests/stores/SpaceStore-test.ts @@ -1402,13 +1402,18 @@ describe("SpaceStore", () => { removeListener(); }); - it("Favourites and People meta spaces should not be returned when the feature_new_room_list labs flag is enabled", async () => { + it("Favourites and People meta spaces should be returned even when the feature_new_room_list labs flag is enabled", async () => { // Enable the new room list await SettingsStore.setValue("feature_new_room_list", null, SettingLevel.DEVICE, true); await run(); - // Favourites and People meta spaces should not be returned - expect(SpaceStore.instance.enabledMetaSpaces).toStrictEqual([MetaSpace.Home, MetaSpace.Orphans]); + // Favourites and People meta spaces should be returned + expect(SpaceStore.instance.enabledMetaSpaces).toStrictEqual([ + MetaSpace.Home, + MetaSpace.Favourites, + MetaSpace.People, + MetaSpace.Orphans, + ]); }); describe("when feature_dynamic_room_predecessors is not enabled", () => {