From 0e743dd1393143e3df298b4e2e173de1a97920da Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Tue, 7 Nov 2023 14:45:18 +0200
Subject: [PATCH] Fixes #2040 - Prevent the room list from staying empty after
 cancelling a search

---
 .../HomeScreen/HomeScreenViewModel.swift      | 28 +++++++++----------
 changelog.d/2040.bugfix                       |  1 +
 2 files changed, 14 insertions(+), 15 deletions(-)
 create mode 100644 changelog.d/2040.bugfix

diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
index 6007bdff95..6077f9ef2a 100644
--- a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
+++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
@@ -98,21 +98,19 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
             .weakAssign(to: \.state.selectedRoomID, on: self)
             .store(in: &cancellables)
         
-        context.$viewState
-            .map(\.bindings.searchQuery)
-            .removeDuplicates()
-            .sink { [weak self] searchQuery in
-                guard let self else { return }
-                updateFilter(isSearchFieldFocused: state.bindings.isSearchFieldFocused, searchQuery: searchQuery)
-            }
-            .store(in: &cancellables)
+        struct SearchBarState: Equatable {
+            let searchQuery: String
+            let isSearchFieldFocused: Bool
+        }
         
         context.$viewState
-            .map(\.bindings.isSearchFieldFocused)
+            .map { SearchBarState(searchQuery: $0.bindings.searchQuery, isSearchFieldFocused: $0.bindings.isSearchFieldFocused) }
             .removeDuplicates()
-            .sink { [weak self] isSearchFieldFocused in
+            .sink { [weak self] _ in
                 guard let self else { return }
-                updateFilter(isSearchFieldFocused: isSearchFieldFocused, searchQuery: state.bindings.searchQuery)
+                // Don't capture the values here as combine behaves incorrectly and `isSearchFieldFocused` is sometimes
+                // turning to true after cancelling the search. Read them directly from the state in the updateFilter method instead.
+                updateFilter()
             }
             .store(in: &cancellables)
         
@@ -170,13 +168,13 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
     
     // MARK: - Private
     
-    private func updateFilter(isSearchFieldFocused: Bool, searchQuery: String) {
-        if !isSearchFieldFocused {
+    private func updateFilter() {
+        if !state.bindings.isSearchFieldFocused {
             roomSummaryProvider?.setFilter(.all)
-        } else if searchQuery.isEmpty {
+        } else if state.bindings.searchQuery.isEmpty {
             roomSummaryProvider?.setFilter(.none)
         } else {
-            roomSummaryProvider?.setFilter(.normalizedMatchRoomName(searchQuery))
+            roomSummaryProvider?.setFilter(.normalizedMatchRoomName(state.bindings.searchQuery))
         }
     }
     
diff --git a/changelog.d/2040.bugfix b/changelog.d/2040.bugfix
new file mode 100644
index 0000000000..72b6c19925
--- /dev/null
+++ b/changelog.d/2040.bugfix
@@ -0,0 +1 @@
+Prevent the room list from staying empty after cancelling a search
\ No newline at end of file