diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx index c0d8faedfb..c1f34fff1e 100644 --- a/src/components/views/spaces/SpacePanel.tsx +++ b/src/components/views/spaces/SpacePanel.tsx @@ -294,7 +294,15 @@ const InnerSpacePanel = React.memo( const moduleSpaceItems = useModuleSpacePanelItems(ModuleApi.instance.extras); - const metaSpacesSection = metaSpaces + const homeSection = metaSpaces + .filter((key) => key === MetaSpace.Home) + .map((key) => { + const Component = metaSpaceComponentMap[key]; + return ; + }); + + const otherMetaSpacesSection = metaSpaces + .filter((key) => key !== MetaSpace.Home) .filter((key) => !(key === MetaSpace.VideoRooms && !SettingsStore.getValue("feature_video_rooms"))) .map((key) => { const Component = metaSpaceComponentMap[key]; @@ -317,7 +325,29 @@ const InnerSpacePanel = React.memo( role="tree" aria-label={_t("common|spaces")} > - {metaSpacesSection} + {homeSection} + {moduleSpaceItems.map((item) => ( +
  • + { + SpaceStore.instance.setActiveSpace(item.spaceKey); + item.onSelected?.(); + }} + /> +
  • + ))} + {otherMetaSpacesSection} {invites.map((s) => ( ( ))} {children} - {moduleSpaceItems.map((item) => ( -
  • - { - SpaceStore.instance.setActiveSpace(item.spaceKey); - item.onSelected?.(); - }} - /> -
  • - ))} {shouldShowComponent(UIComponent.CreateSpaces) && ( )}