From 48bd8e46aca97c52e1cd15fd5aedffd9a4f1cd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Poyet?= <joel.poyet1@swisscom.com>
Date: Tue, 17 Feb 2026 07:44:28 +0100
Subject: [PATCH] feat(spaces): move module items below home in panel

---
 .../components/views/spaces/SpacePanel.tsx    | 55 +++++++++++--------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/apps/web/src/components/views/spaces/SpacePanel.tsx b/apps/web/src/components/views/spaces/SpacePanel.tsx
index 5e9713f63f..1e49372e76 100644
--- a/apps/web/src/components/views/spaces/SpacePanel.tsx
+++ b/apps/web/src/components/views/spaces/SpacePanel.tsx
@@ -308,7 +308,15 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(
 
         const moduleSpaceItems = useModuleSpacePanelItems(ModuleApi.instance.extras);
 
-        const metaSpacesSection = metaSpaces
+        const homeSection = metaSpaces
+            .filter((key) => key === MetaSpace.Home)
+            .map((key) => {
+                const Component = metaSpaceComponentMap[key];
+                return <Component key={key} selected={activeSpace === key} isPanelCollapsed={isPanelCollapsed} />;
+            });
+
+        const otherMetaSpacesSection = metaSpaces
+            .filter((key) => key !== MetaSpace.Home)
             .filter((key) => !(key === MetaSpace.VideoRooms && !SettingsStore.getValue("feature_video_rooms")))
             .map((key) => {
                 const Component = metaSpaceComponentMap[key];
@@ -331,7 +339,29 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(
                 role="tree"
                 aria-label={_t("common|spaces")}
             >
-                {metaSpacesSection}
+                {homeSection}
+                {moduleSpaceItems.map((item) => (
+                    <li
+                        key={item.spaceKey}
+                        className={classNames("mx_SpaceItem", {
+                            collapsed: isPanelCollapsed,
+                        })}
+                        role="treeitem"
+                        aria-selected={false} // TODO
+                    >
+                        <SpaceButton
+                            {...item}
+                            isNarrow={isPanelCollapsed}
+                            size="32px"
+                            selected={activeSpace === item.spaceKey}
+                            onClick={() => {
+                                SpaceStore.instance.setActiveSpace(item.spaceKey);
+                                item.onSelected?.();
+                            }}
+                        />
+                    </li>
+                ))}
+                {otherMetaSpacesSection}
                 {invites.map((s) => (
                     <SpaceItem
                         key={s.roomId}
@@ -359,27 +389,6 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(
                     </Draggable>
                 ))}
                 {children}
-                {moduleSpaceItems.map((item) => (
-                    <li
-                        key={item.spaceKey}
-                        className={classNames("mx_SpaceItem", {
-                            collapsed: isPanelCollapsed,
-                        })}
-                        role="treeitem"
-                        aria-selected={false} // TODO
-                    >
-                        <SpaceButton
-                            {...item}
-                            isNarrow={isPanelCollapsed}
-                            size="32px"
-                            selected={activeSpace === item.spaceKey}
-                            onClick={() => {
-                                SpaceStore.instance.setActiveSpace(item.spaceKey);
-                                item.onSelected?.();
-                            }}
-                        />
-                    </li>
-                ))}
                 {shouldShowComponent(UIComponent.CreateSpaces) && (
                     <CreateSpaceButton isPanelCollapsed={isPanelCollapsed} setPanelCollapsed={setPanelCollapsed} />
                 )}