TW-1994: Fix load more for chat search (#1997)

linagora · Aug 20, 2024 · 7ed3c82 · 7ed3c82
1 parent 192228e
commit 7ed3c82
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/lib/pages/search/server_search_controller.dart b/lib/pages/search/server_search_controller.dart
@@ -89,7 +89,25 @@ class ServerSearchController with SearchDebouncerMixin {
         if (success is ServerSearchChatSuccess) {
           updateNextBatch(success.nextBatch);
           if (success.results?.isEmpty == true) {
-            searchResultsNotifier.value = PresentationServerSideEmptySearch();
+            if (isLoadingMoreNotifier.value) {
+              searchResultsNotifier.value = PresentationServerSideSearch(
+                searchResults: [
+                  if (searchResultsNotifier.value
+                      is PresentationServerSideSearch)
+                    ...(searchResultsNotifier.value
+                            as PresentationServerSideSearch)
+                        .searchResults,
+                  ...success.results ?? <Result>[],
+                ]
+                    .where(
+                      (result) =>
+                          result.isDisplayableResult(context: currentContext),
+                    )
+                    .toList(),
+              );
+            } else {
+              searchResultsNotifier.value = PresentationServerSideEmptySearch();
+            }
           } else {
             searchResultsNotifier.value = PresentationServerSideSearch(
               searchResults: [