From 7aa72230494af28b858d39fda38205b620c9af5d Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Wed, 30 Jul 2025 10:40:22 +0700
Subject: [PATCH] TF-3834 Persist sort order when reload page

Signed-off-by: dab246 <tdvu@linagora.com>
---
 .../controller/mailbox_dashboard_controller.dart       |  2 +-
 .../thread/presentation/thread_controller.dart         | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 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 0df805045..d0f187384 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -373,7 +373,6 @@ class MailboxDashBoardController extends ReloadableController
     }
     _handleArguments();
     _loadAppGrid();
-    loadStoredEmailSortOrder();
     super.onReady();
   }
 
@@ -825,6 +824,7 @@ class MailboxDashBoardController extends ReloadableController
     notifyThreadDetailSettingUpdated();
     getServerSetting();
     cleanupRecentSearch();
+    loadStoredEmailSortOrder();
 
     if (PlatformInfo.isMobile) {
       getAllSendingEmails();
diff --git a/lib/features/thread/presentation/thread_controller.dart b/lib/features/thread/presentation/thread_controller.dart
index 1441af745..fa95eb71c 100644
--- a/lib/features/thread/presentation/thread_controller.dart
+++ b/lib/features/thread/presentation/thread_controller.dart
@@ -1427,7 +1427,10 @@ class ThreadController extends BaseController with EmailActionController {
     searchController.enableSearch();
     if (searchQuery != null) {
       searchController.updateTextSearch(searchQuery.value);
-      searchController.updateFilterEmail(textOption: Some(searchQuery));
+      searchController.updateFilterEmail(
+        textOption: Some(searchQuery),
+        sortOrderTypeOption: Some(mailboxDashBoardController.currentSortOrder),
+      );
       if (currentContext != null) {
         FocusScope.of(currentContext!).unfocus();
       }
@@ -1442,7 +1445,10 @@ class ThreadController extends BaseController with EmailActionController {
     dispatchState(Right(SearchingState()));
     searchController.enableSearch();
     searchController.updateTextSearch(searchQuery.value);
-    searchController.updateFilterEmail(textOption: Some(searchQuery));
+    searchController.updateFilterEmail(
+      textOption: Some(searchQuery),
+      sortOrderTypeOption: Some(mailboxDashBoardController.currentSortOrder),
+    );
     if (currentContext != null) {
       FocusScope.of(currentContext!).unfocus();
     }