TW-1923: Hide no results when search matrix ID

linagora · Jul 22, 2024 · e12cfd6 · e12cfd6
1 parent 876cd3b
commit e12cfd6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/pages/search/search_view.dart b/lib/pages/search/search_view.dart
@@ -73,8 +73,10 @@ class SearchView extends StatelessWidget {
                 searchController.serverSearchController.searchResultsNotifier,
             builder: ((context, searchResults, child) {
               if (searchResults is PresentationServerSideEmptySearch) {
+                final keyword = searchController.textEditingController.text;
                 if (searchController.searchContactAndRecentChatController!
-                    .recentAndContactsNotifier.value.isNotEmpty) {
+                        .recentAndContactsNotifier.value.isNotEmpty ||
+                    (keyword.isValidMatrixId && keyword.startsWith('@'))) {
                   return child!;
                 }
                 return _SearchHeader(

diff --git a/lib/pages/search/server_search_view.dart b/lib/pages/search/server_search_view.dart
@@ -28,11 +28,13 @@ class ServerSearchMessagesList extends StatelessWidget {
             searchController.serverSearchController.searchResultsNotifier,
         builder: (context, serverSearchNotifier, child) {
           if (serverSearchNotifier is PresentationServerSideEmptySearch) {
+            final keyword = searchController.textEditingController.text;
             if (searchController.searchContactAndRecentChatController!
-                .recentAndContactsNotifier.value.isNotEmpty) {
-              return const SizedBox.shrink();
+                    .recentAndContactsNotifier.value.isEmpty &&
+                !(keyword.isValidMatrixId && keyword.startsWith('@'))) {
+              return child!;
             }
-            return child!;
+            return const SizedBox.shrink();
           }
 
           if (serverSearchNotifier is PresentationServerSideSearch) {