From 920e37d09706e4cb37a7672a5e646bfd5be2b0dc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2026 09:35:06 +0200
Subject: [PATCH] Scroll the rooms header with the search results in room
 select screen

Move the "Rooms" section header inside the LazyColumn of the search results, so that it scrolls with the list
instead of staying fixed above it, as it is done for the room list when the search is not active.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 .../libraries/roomselect/impl/RoomSelectView.kt    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
index 19798d854c..1c7d59eed7 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
@@ -201,16 +201,18 @@ fun RoomSelectView(
                 resultState = state.resultState,
                 showBackButton = false,
             ) { summaries ->
-                if (summaries.isNotEmpty()) {
-                    ListSectionHeader(
-                        title = stringResource(CommonStrings.common_header_rooms),
-                        hasDivider = false,
-                    )
-                }
                 LazyColumn(
                     state = lazyListState,
                     contentPadding = lazyColumnContentPadding,
                 ) {
+                    if (summaries.isNotEmpty()) {
+                        item {
+                            ListSectionHeader(
+                                title = stringResource(CommonStrings.common_header_rooms),
+                                hasDivider = false,
+                            )
+                        }
+                    }
                     item {
                         SelectedRoomsHelper(
                             selectedRooms = state.selectedRooms,