From a6201f2008e32916059a239e44dd2d7c16c7484c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 17 Nov 2025 09:20:24 +0100
Subject: [PATCH] Fix detekt issue

Content slots should not be reused in different code branches/scopes of a composable function, to preserve the slot internal state.
---
 .../impl/roles/ChangeRolesView.kt                    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
index 2eff60fe6e..bade3b72c7 100644
--- a/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
+++ b/features/rolesandpermissions/impl/src/main/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesView.kt
@@ -230,20 +230,20 @@ private fun SearchResultsList(
         state = lazyListState,
     ) {
         item {
-            if (currentRole == RoomMember.Role.Admin) {
-                val ownersAndSelectedUsers by remember {
-                    derivedStateOf {
+            val usersInHorizontalRow by remember {
+                derivedStateOf {
+                    if (currentRole == RoomMember.Role.Admin) {
                         // Also include the owners in the horizontal list
                         val owners = searchResults.owners.map {
                             it.toMatrixUser()
                         }
                         (owners + selectedUsers).toImmutableList()
+                    } else {
+                        selectedUsers
                     }
                 }
-                selectedUsersList(ownersAndSelectedUsers)
-            } else {
-                selectedUsersList(selectedUsers)
             }
+            selectedUsersList(usersInHorizontalRow)
         }
         if (searchResults.owners.isNotEmpty()) {
             stickyHeader { ListSectionHeader(text = stringResource(R.string.screen_room_roles_and_permissions_owners)) }