From 3a9ece8d1e3a2a79ef6651442674af2ec1d3d53c Mon Sep 17 00:00:00 2001
From: another-simple-pixel <anton.m.egorov@gmail.com>
Date: Sat, 16 May 2026 09:24:35 -0700
Subject: [PATCH] NewChatSheet: render filtered contact list inside SectionView
 card
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "Contacts" header was a SectionView with empty content lambda, and
the actual contact rows were rendered as separate LazyColumn items
OUTSIDE the SectionView — so they sat on canvas without card chrome.

Move filteredContactChats.forEachIndexed { ContactListNavLinkView }
INSIDE the SectionView lambda in both OneHandLazyColumn and
NonOneHandLazyColumn so the contacts read as a single card matching
the iOS-style facelift.

Same trade-off as GroupChatInfoView members fix (fa29bb7a): lazy
rendering of contact rows replaced with eager composition inside a
Column. For typical contact lists (<100) imperceptible; very long
lists may compose slower on open.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../common/views/newchat/NewChatSheet.kt      | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatSheet.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatSheet.kt
index 1eceaf4158..0ba5f5d73e 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatSheet.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/NewChatSheet.kt
@@ -325,20 +325,20 @@ private fun ModalData.NewChatSheetLayout(
       item {
         if (filteredContactChats.isNotEmpty() && searchText.value.text.isEmpty()) {
           SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = false)
-          SectionView(stringResource(MR.strings.contact_list_header_title).uppercase(), headerBottomPadding = DEFAULT_PADDING_HALF) {}
-          Spacer(Modifier.height(DEFAULT_PADDING_HALF))
-        }
-      }
-      item {
-        NoFilteredContactsItem()
-      }
-      itemsIndexed(filteredContactChats) { index, chat ->
-        val nextChatSelected = remember(chat.id, filteredContactChats) {
-          derivedStateOf {
-            chatModel.chatId.value != null && filteredContactChats.getOrNull(index + 1)?.id == chatModel.chatId.value
+          SectionView(stringResource(MR.strings.contact_list_header_title).uppercase(), headerBottomPadding = DEFAULT_PADDING_HALF) {
+            filteredContactChats.forEachIndexed { index, chat ->
+              val nextChatSelected = remember(chat.id, filteredContactChats) {
+                derivedStateOf {
+                  chatModel.chatId.value != null && filteredContactChats.getOrNull(index + 1)?.id == chatModel.chatId.value
+                }
+              }
+              ContactListNavLinkView(chat, nextChatSelected, showDeletedChatIcon = true)
+            }
           }
+          Spacer(Modifier.height(DEFAULT_PADDING_HALF))
+        } else {
+          NoFilteredContactsItem()
         }
-        ContactListNavLinkView(chat, nextChatSelected, showDeletedChatIcon = true)
       }
       if (appPlatform.isAndroid) {
         item {
@@ -410,19 +410,19 @@ private fun ModalData.NewChatSheetLayout(
       item {
         if (filteredContactChats.isNotEmpty() && searchText.value.text.isEmpty()) {
           SectionDividerSpaced()
-          SectionView(stringResource(MR.strings.contact_list_header_title).uppercase(), headerBottomPadding = DEFAULT_PADDING_HALF) {}
-        }
-      }
-      item {
-        NoFilteredContactsItem()
-      }
-      itemsIndexed(filteredContactChats) { index, chat ->
-        val nextChatSelected = remember(chat.id, filteredContactChats) {
-          derivedStateOf {
-            chatModel.chatId.value != null && filteredContactChats.getOrNull(index + 1)?.id == chatModel.chatId.value
+          SectionView(stringResource(MR.strings.contact_list_header_title).uppercase(), headerBottomPadding = DEFAULT_PADDING_HALF) {
+            filteredContactChats.forEachIndexed { index, chat ->
+              val nextChatSelected = remember(chat.id, filteredContactChats) {
+                derivedStateOf {
+                  chatModel.chatId.value != null && filteredContactChats.getOrNull(index + 1)?.id == chatModel.chatId.value
+                }
+              }
+              ContactListNavLinkView(chat, nextChatSelected, showDeletedChatIcon = true)
+            }
           }
+        } else {
+          NoFilteredContactsItem()
         }
-        ContactListNavLinkView(chat, nextChatSelected, showDeletedChatIcon = true)
       }
       if (appPlatform.isAndroid) {
         item {