From 4da6e99d38fc081fedaa2959680106acb421b27e Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Mon, 29 Jun 2026 08:49:14 +0000
Subject: [PATCH] desktop, android: fix sections layout in Lock view and
 "connect to remote desktop" views (#7163)

---
 .../common/views/remote/ConnectDesktopView.kt | 14 ++--
 .../views/usersettings/PrivacySettings.kt     | 70 +++++++++----------
 2 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectDesktopView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectDesktopView.kt
index 81e1afd22c..86be99d1bf 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectDesktopView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/remote/ConnectDesktopView.kt
@@ -148,7 +148,6 @@ private fun ConnectingDesktop(session: RemoteCtrlSession, rc: RemoteCtrlInfo?) {
   AppBarTitle(stringResource(MR.strings.connecting_to_desktop))
   SectionView(stringResource(MR.strings.connecting_to_desktop), contentPadding = PaddingValues(horizontal = DEFAULT_PADDING)) {
     CtrlDeviceNameText(session, rc)
-    Spacer(Modifier.height(DEFAULT_PADDING_HALF))
     CtrlDeviceVersionText(session)
   }
 
@@ -257,7 +256,6 @@ private fun VerifySession(session: RemoteCtrlSession, rc: RemoteCtrlInfo?, sessC
   AppBarTitle(stringResource(MR.strings.verify_connection))
   SectionView(stringResource(MR.strings.connected_to_desktop), contentPadding = PaddingValues(horizontal = DEFAULT_PADDING)) {
     CtrlDeviceNameText(session, rc)
-    Spacer(Modifier.height(DEFAULT_PADDING_HALF))
     CtrlDeviceVersionText(session)
   }
 
@@ -265,16 +263,15 @@ private fun VerifySession(session: RemoteCtrlSession, rc: RemoteCtrlInfo?, sessC
 
   SectionView(stringResource(MR.strings.verify_code_with_desktop)) {
     SessionCodeText(sessCode)
+    SectionItemView({ verifyDesktopSessionCode(remoteCtrls, sessCode) }) {
+      Icon(painterResource(MR.images.ic_check), generalGetString(MR.strings.confirm_verb), tint = MaterialTheme.colors.secondary)
+      TextIconSpaced(false)
+      Text(generalGetString(MR.strings.confirm_verb))
+    }
   }
 
   SectionDividerSpaced()
 
-  SectionItemView({ verifyDesktopSessionCode(remoteCtrls, sessCode) }) {
-    Icon(painterResource(MR.images.ic_check), generalGetString(MR.strings.confirm_verb), tint = MaterialTheme.colors.secondary)
-    TextIconSpaced(false)
-    Text(generalGetString(MR.strings.confirm_verb))
-  }
-
   SectionView {
     DisconnectButton(onClick = ::disconnectDesktop)
   }
@@ -312,7 +309,6 @@ private fun ActiveSession(session: RemoteCtrlSession, rc: RemoteCtrlInfo, close:
   AppBarTitle(stringResource(MR.strings.connected_to_desktop))
   SectionView(stringResource(MR.strings.connected_desktop), contentPadding = PaddingValues(horizontal = DEFAULT_PADDING)) {
     Text(rc.deviceViewName)
-    Spacer(Modifier.height(DEFAULT_PADDING_HALF))
     CtrlDeviceVersionText(session)
   }
 
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt
index cf34fd5a44..0b698b2c5d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt
@@ -665,46 +665,46 @@ fun SimplexLockView(
           }
         }
       }
-      if (performLA.value && laMode.value == LAMode.PASSCODE) {
-        SectionDividerSpaced()
-        SectionView(stringResource(MR.strings.self_destruct_passcode)) {
-          val openInfo = {
-            ModalManager.start.showModal {
-              SelfDestructInfoView()
-            }
+    }
+    if (performLA.value && laMode.value == LAMode.PASSCODE) {
+      SectionDividerSpaced()
+      SectionView(stringResource(MR.strings.self_destruct_passcode)) {
+        val openInfo = {
+          ModalManager.start.showModal {
+            SelfDestructInfoView()
           }
-          SettingsActionItemWithContent(null, null, click = openInfo) {
-            SharedPreferenceToggleWithIcon(
-              stringResource(MR.strings.enable_self_destruct),
-              painterResource(MR.images.ic_info),
-              openInfo,
-              remember { selfDestructPref.state }.value
-            ) {
-              toggleSelfDestruct(selfDestructPref)
-            }
+        }
+        SettingsActionItemWithContent(null, null, click = openInfo) {
+          SharedPreferenceToggleWithIcon(
+            stringResource(MR.strings.enable_self_destruct),
+            painterResource(MR.images.ic_info),
+            openInfo,
+            remember { selfDestructPref.state }.value
+          ) {
+            toggleSelfDestruct(selfDestructPref)
           }
+        }
 
-          if (remember { selfDestructPref.state }.value) {
-            Column(Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF)) {
-              Text(
-                stringResource(MR.strings.self_destruct_new_display_name),
-                fontSize = 16.sp,
-                modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
-              )
-              ProfileNameField(selfDestructDisplayName, "", { isValidDisplayName(it.trim()) })
-              LaunchedEffect(selfDestructDisplayName.value) {
-                val new = selfDestructDisplayName.value
-                if (isValidDisplayName(new) && selfDestructDisplayNamePref.get() != new) {
-                  selfDestructDisplayNamePref.set(new)
-                }
+        if (remember { selfDestructPref.state }.value) {
+          Column(Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF)) {
+            Text(
+              stringResource(MR.strings.self_destruct_new_display_name),
+              fontSize = 16.sp,
+              modifier = Modifier.padding(bottom = DEFAULT_PADDING_HALF)
+            )
+            ProfileNameField(selfDestructDisplayName, "", { isValidDisplayName(it.trim()) })
+            LaunchedEffect(selfDestructDisplayName.value) {
+              val new = selfDestructDisplayName.value
+              if (isValidDisplayName(new) && selfDestructDisplayNamePref.get() != new) {
+                selfDestructDisplayNamePref.set(new)
               }
             }
-            SectionItemView({ changeSelfDestructPassword() }) {
-              Text(
-                stringResource(MR.strings.change_self_destruct_passcode),
-                color = MaterialTheme.colors.primary
-              )
-            }
+          }
+          SectionItemView({ changeSelfDestructPassword() }) {
+            Text(
+              stringResource(MR.strings.change_self_destruct_passcode),
+              color = MaterialTheme.colors.primary
+            )
           }
         }
       }