From a50dfd37ad9e01a2f593045249b81a2a029b54a9 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 28 Jul 2026 14:06:10 -0400
Subject: [PATCH] Fix scroll issue in forward sheet.

---
 .../thoughtcrime/securesms/contacts/paged/ContactSearch.kt  | 6 ++++--
 .../securesms/contacts/paged/ContactSearchView.kt           | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearch.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearch.kt
index 027ee8e5cf..6a4bef0104 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearch.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearch.kt
@@ -19,7 +19,9 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -138,7 +140,7 @@ fun ContactSearch(
     userScrollEnabled = !isDisplayingContextMenu,
     fastScrollerState = fastScrollerState,
     lazyListState = lazyListState,
-    modifier = modifier,
+    modifier = modifier.nestedScroll(rememberNestedScrollInteropConnection()),
     letterContent = {
       Emojifier(text = it.toString()) { annotatedText, inlineContent ->
         Text(
@@ -154,7 +156,7 @@ fun ContactSearch(
       userScrollEnabled = !isDisplayingContextMenu,
       controller = mappingCtrl,
       lazyListState = it,
-      modifier = modifier
+      modifier = Modifier.fillMaxSize()
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchView.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchView.kt
index ac4919ffe9..8f40d18527 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchView.kt
@@ -18,12 +18,10 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.AbstractComposeView
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import androidx.fragment.app.FragmentManager
 import kotlinx.collections.immutable.persistentHashMapOf
 import kotlinx.coroutines.flow.filter
@@ -159,7 +157,7 @@ class ContactSearchView : AbstractComposeView {
         longClickCallbacks = currentLongClickCallbacks ?: rememberDefaultContactSearchItemLongClickCallbacks(),
         storyContextMenuCallbacks = currentStoryContextMenuCallbacks ?: rememberDefaultContactSearchItemStoryContextMenuCallbacks(vm),
         callButtonClickCallbacks = currentCallButtonClickCallbacks ?: rememberDefaultContactSearchItemCallButtonClickCallbacks(),
-        modifier = Modifier.nestedScroll(rememberNestedScrollInteropConnection()).fillMaxSize()
+        modifier = Modifier.fillMaxSize()
       )
     }
   }