From fe1693fa3e7ee70d0073b77529cc30f67531e75f Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Thu, 15 Sep 2022 22:24:43 +0700
Subject: [PATCH] TF-933 Apply search/quick search in all mailbox and
 unselected mailbox when show search result

---
 .../controller/mailbox_dashboard_controller.dart         | 5 +++++
 lib/features/thread/presentation/thread_controller.dart  | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
index 969f604e0..8f277e5c0 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -374,6 +374,7 @@ class MailboxDashBoardController extends ReloadableController {
     if (value.isEmpty){
       searchController.setEmailReceiveTimeType(null);
     }
+    _unSelectedMailbox();
   }
 
   bool _searchInsideEmailDetailedViewIsActive(BuildContext context) {
@@ -382,6 +383,10 @@ class MailboxDashBoardController extends ReloadableController {
         && routePath.value == AppRoutes.EMAIL;
   }
 
+  void _unSelectedMailbox() {
+    selectedMailbox.value = null;
+  }
+
   void _closeEmailDetailedView() {
     dispatchRoute(AppRoutes.THREAD);
     clearSelectedEmail();
diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart
index 3ce839b40..fdf725f3d 100644
--- a/lib/features/thread/presentation/thread_controller.dart
+++ b/lib/features/thread/presentation/thread_controller.dart
@@ -236,8 +236,12 @@ class ThreadController extends BaseController {
         if (_currentMailboxId != mailbox.id) {
           _currentMailboxId = mailbox.id;
           _resetToOriginalValue();
+          disableSearch();
           _getAllEmail();
         }
+      } else if (mailbox == null) { // disable current mailbox when search active
+        _currentMailboxId = null;
+        _resetToOriginalValue();
       }
     });
 
@@ -336,7 +340,6 @@ class ThreadController extends BaseController {
     emailList.clear();
     canLoadMore = true;
     _isLoadingMore = false;
-    disableSearch();
     cancelSelectEmail();
     mailboxDashBoardController.dispatchRoute(AppRoutes.THREAD);
   }
@@ -862,10 +865,6 @@ class ThreadController extends BaseController {
     if (_accountId != null && searchQuery != null) {
       searchController.searchIsActive.value = true;
 
-      if(searchController.isAdvancedSearchHasApply.isFalse){
-        searchController.updateFilterEmail(mailbox: currentMailbox);
-      }
-
       filterMessageOption = EmailFilterCondition(
         notKeyword: filterMessageOption?.notKeyword,
         hasKeyword: filterMessageOption?.hasKeyword,