From efc2d80efc98ac4a3addf039f364d363aae96ea0 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Fri, 26 Sep 2025 16:42:55 +0700
Subject: [PATCH] TF-4066 Remove button `Filter messages` and replace with
 `Sort by` in search desktop

---
 .../mailbox_dashboard_view_web.dart           | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
index 04d9d57a9..4a23bf2a6 100644
--- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
+++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart
@@ -476,7 +476,8 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
       Obx(() {
         final filterMessageCurrent = controller.filterMessageOption.value;
 
-        if (controller.validateNoEmailsInTrashAndSpamFolder()) {
+        if (controller.validateNoEmailsInTrashAndSpamFolder() ||
+            controller.searchController.isSearchEmailRunning) {
           return const SizedBox.shrink();
         } else {
           return Padding(
@@ -506,11 +507,16 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
           return const SizedBox.shrink();
         }
       }),
-      const Spacer(),
       Obx(() {
         if (controller.searchController.isSearchEmailRunning &&
             controller.dashboardRoute.value == DashboardRoutes.thread) {
-          return _buildQuickSearchFilterButton(context, QuickSearchFilter.sortBy);
+          return Padding(
+            padding: const EdgeInsetsDirectional.only(start: 16),
+            child: _buildQuickSearchFilterButton(
+              context,
+              QuickSearchFilter.sortBy,
+            ),
+          );
         } else {
           return const SizedBox.shrink();
         }
@@ -740,8 +746,12 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
         listAddressOfTo: listAddressOfTo,
         mailbox: mailbox,
         buttonPadding: buttonPadding,
-        isContextMenuAlignEndButton: isFilterApplied ||
-            searchFilter == QuickSearchFilter.sortBy,
+        backgroundColor: searchFilter == QuickSearchFilter.sortBy
+          ? isSelected
+              ? AppColor.primaryColor.withValues(alpha: 0.06)
+              : AppColor.colorFilterMessageButton.withValues(alpha: 0.6)
+          : null,
+        isContextMenuAlignEndButton: isFilterApplied,
         onSelectSearchFilterAction: _onSelectSearchFilterAction,
         onDeleteSearchFilterAction: controller.onDeleteSearchFilterAction,
       );