From 02efe0706eae552027f6ae511b58859fae7c377d Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 15 Jan 2026 12:41:11 +0100
Subject: [PATCH] Move manage rooms menu item to top of space menu

---
 .../features/space/impl/root/SpaceView.kt     | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
index cb19636dfd..5dcb57dfdb 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpaceView.kt
@@ -136,8 +136,8 @@ fun SpaceView(
                         showManageRoomsAction = state.showManageRoomsAction,
                         onBackClick = onBackClick,
                         onLeaveSpaceClick = onLeaveSpaceClick,
-                        onShareSpace = onShareSpace,
                         onSettingsClick = onSettingsClick,
+                        onShareSpace = onShareSpace,
                         onViewMembersClick = onViewMembersClick,
                         onManageRoomsClick = { state.eventSink(SpaceEvents.EnterManageMode) },
                     )
@@ -379,6 +379,17 @@ private fun SpaceViewTopBar(
                 expanded = showMenu,
                 onDismissRequest = { showMenu = false }
             ) {
+                if (showManageRoomsAction) {
+                    SpaceMenuItem(
+                        titleRes = CommonStrings.action_manage_rooms,
+                        icon = CompoundIcons.Edit(),
+                        onClick = {
+                            showMenu = false
+                            onManageRoomsClick()
+                        }
+                    )
+                    HorizontalDivider()
+                }
                 SpaceMenuItem(
                     titleRes = R.string.screen_space_menu_action_members,
                     icon = CompoundIcons.User(),
@@ -395,16 +406,6 @@ private fun SpaceViewTopBar(
                         onShareSpace()
                     }
                 )
-                if (showManageRoomsAction) {
-                    SpaceMenuItem(
-                        titleRes = CommonStrings.action_manage_rooms,
-                        icon = CompoundIcons.Edit(),
-                        onClick = {
-                            showMenu = false
-                            onManageRoomsClick()
-                        }
-                    )
-                }
                 if (canAccessSpaceSettings) {
                     SpaceMenuItem(
                         titleRes = CommonStrings.common_settings,
@@ -415,6 +416,7 @@ private fun SpaceViewTopBar(
                         }
                     )
                 }
+                HorizontalDivider()
                 SpaceMenuItem(
                     titleRes = CommonStrings.action_leave_space,
                     icon = CompoundIcons.Leave(),