From 0a624c155009d7be00456c95f65fefbff2c7a0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Fri, 21 Aug 2026 15:51:14 +0200
Subject: [PATCH] Fix empty state for room search

---
 .../home/impl/search/GlobalSearchPresenter.kt | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenter.kt
index 103548daea..f0f3cac4d5 100644
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenter.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/GlobalSearchPresenter.kt
@@ -31,7 +31,6 @@ import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.roomlist.LatestEventValue
-import io.element.android.libraries.matrix.api.roomlist.RoomList
 import io.element.android.libraries.matrix.api.search.MessageSearch
 import io.element.android.libraries.matrix.api.search.MessageSearchPaginationState
 import io.element.android.libraries.matrix.api.search.MessageSearchResult
@@ -109,25 +108,14 @@ class GlobalSearchPresenter(
 
             when (currentTarget) {
                 GlobalSearchTarget.ROOMS -> {
-                    combine(
-                        roomListSearchDataSource.roomSummaries,
-                        roomListSearchDataSource.loadingState,
-                    ) { summaries, loadingState ->
-                        Pair(summaries, loadingState)
-                    }.collectLatest { (results, loadingState) ->
-                        Timber.d("Room list search found ${results.size} items, loading state: $loadingState")
+                    roomListSearchDataSource.roomSummaries.collectLatest { results ->
+                        Timber.d("Room list search found ${results.size} items")
                         // The room list data source always returns some values, even if the query is empty,
                         // so we only want to update the search results if the query is not empty
-                        searchResults = when {
-                            queryState.text.isNotEmpty() && results.isNotEmpty() -> {
-                                AsyncData.Success(GlobalSearchResults.RoomListResults(results = results))
-                            }
-                            loadingState is RoomList.LoadingState.Loaded && results.isEmpty() -> {
-                                AsyncData.Success(GlobalSearchResults.RoomListResults(results = persistentListOf()))
-                            }
-                            else -> {
-                                AsyncData.Uninitialized
-                            }
+                        searchResults = if (queryState.text.isNotEmpty()) {
+                            AsyncData.Success(GlobalSearchResults.RoomListResults(results = results))
+                        } else {
+                            AsyncData.Uninitialized
                         }
                     }
                 }