From 23b0e41d877ca100a2f903a8f1e83066a854158a Mon Sep 17 00:00:00 2001
From: "Evgeny @ SimpleX Chat"
 <259188159+evgeny-simplex@users.noreply.github.com>
Date: Mon, 18 May 2026 08:04:19 +0000
Subject: [PATCH] remove diff noise

---
 .../common/views/chatlist/UserPicker.kt       | 61 +++++++++----------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
index 63b64b34c4..0a42b21d7b 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
@@ -218,7 +218,34 @@ fun UserPicker(
     }
 
     @Composable
-    fun ProfilesOptionRow() {
+    fun SecondSectionBody() {
+      val inactiveUsers = users.filter { !it.user.activeUser }
+      UserPickerOptionRow(
+        painterResource(MR.images.ic_qr_code),
+        if (chatModel.userAddress.value != null) generalGetString(MR.strings.your_simplex_contact_address) else generalGetString(MR.strings.create_simplex_address),
+        showCustomModal { it, close -> UserAddressView(it, shareViaProfile = it.currentUser.value!!.addressShared, close = close) }, disabled = stopped
+      )
+      UserPickerOptionRow(
+        painterResource(MR.images.ic_toggle_on),
+        stringResource(MR.strings.chat_preferences),
+        click = if (stopped) null else ({
+          showCustomModal { m, close ->
+            PreferencesView(m, m.currentUser.value ?: return@showCustomModal, close)
+          }()
+        }),
+        disabled = stopped
+      )
+      if (appPlatform.isDesktop && inactiveUsers.isNotEmpty()) {
+        Column(modifier = Modifier.padding(vertical = DEFAULT_PADDING_HALF)) {
+          UserPickerUsersSection(
+            users = inactiveUsers,
+            iconColor = iconColor,
+            onUserClicked = onUserClicked,
+            stopped = stopped
+          )
+        }
+        SectionDivider()
+      }
       if (chatModel.desktopNoUserNoRemote) {
         UserPickerOptionRow(
           painterResource(MR.images.ic_manage_accounts),
@@ -272,38 +299,6 @@ fun UserPicker(
       }
     }
 
-    @Composable
-    fun SecondSectionBody() {
-      val inactiveUsers = users.filter { !it.user.activeUser }
-      UserPickerOptionRow(
-        painterResource(MR.images.ic_qr_code),
-        if (chatModel.userAddress.value != null) generalGetString(MR.strings.your_simplex_contact_address) else generalGetString(MR.strings.create_simplex_address),
-        showCustomModal { it, close -> UserAddressView(it, shareViaProfile = it.currentUser.value!!.addressShared, close = close) }, disabled = stopped
-      )
-      UserPickerOptionRow(
-        painterResource(MR.images.ic_toggle_on),
-        stringResource(MR.strings.chat_preferences),
-        click = if (stopped) null else ({
-          showCustomModal { m, close ->
-            PreferencesView(m, m.currentUser.value ?: return@showCustomModal, close)
-          }()
-        }),
-        disabled = stopped
-      )
-      if (appPlatform.isDesktop && inactiveUsers.isNotEmpty()) {
-        Column(modifier = Modifier.padding(vertical = DEFAULT_PADDING_HALF)) {
-          UserPickerUsersSection(
-            users = inactiveUsers,
-            iconColor = iconColor,
-            onUserClicked = onUserClicked,
-            stopped = stopped
-          )
-        }
-        SectionDivider()
-      }
-      ProfilesOptionRow()
-    }
-
     if (appPlatform.isDesktop || windowOrientation() == WindowOrientation.PORTRAIT) {
       Column {
         FirstSection()