From 6f36200e0bee360b4852cf62ab76eae03cbaa265 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Wed, 5 Oct 2022 09:30:04 +0200
Subject: [PATCH] chore: Follow up search on spaces tab

---
 lib/pages/chat_list/chat_list_body.dart | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart
index 95e6ccff2..19441d6b8 100644
--- a/lib/pages/chat_list/chat_list_body.dart
+++ b/lib/pages/chat_list/chat_list_body.dart
@@ -49,9 +49,15 @@ class ChatListViewBody extends StatelessWidget {
               .where((s) => s.hasRoomUpdate)
               .rateLimit(const Duration(seconds: 1)),
           builder: (context, _) {
-            if (controller.waitForFirstSync &&
-                client.prevBatch != null &&
-                controller.activeFilter != ActiveFilter.spaces) {
+            if (controller.activeFilter == ActiveFilter.spaces &&
+                !controller.isSearchMode) {
+              return SpaceView(
+                controller,
+                scrollController: controller.scrollController,
+                key: Key(controller.activeSpaceId ?? 'Spaces'),
+              );
+            }
+            if (controller.waitForFirstSync && client.prevBatch != null) {
               final rooms = controller.filteredRooms;
               final displayStoriesHeader = {
                 ActiveFilter.allChats,
@@ -210,13 +216,6 @@ class ChatListViewBody extends StatelessWidget {
                 },
               );
             }
-            if (controller.activeFilter == ActiveFilter.spaces) {
-              return SpaceView(
-                controller,
-                scrollController: controller.scrollController,
-                key: Key(controller.activeSpaceId ?? 'Spaces'),
-              );
-            }
             const dummyChatCount = 5;
             final titleColor =
                 Theme.of(context).textTheme.bodyText1!.color!.withAlpha(100);