From 73134d283399142c71975b6288abf0fd566223b9 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Wed, 4 Feb 2026 15:09:30 +0700
Subject: [PATCH] TF-4303 Change order for label action

---
 .../utils/email_action_reactor/email_action_reactor.dart    | 4 ++--
 .../extension/on_thread_detail_action_click.dart            | 6 +++---
 model/lib/email/email_action_type.dart                      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/features/email/presentation/utils/email_action_reactor/email_action_reactor.dart b/lib/features/email/presentation/utils/email_action_reactor/email_action_reactor.dart
index c632bead9..a7ccdc167 100644
--- a/lib/features/email/presentation/utils/email_action_reactor/email_action_reactor.dart
+++ b/lib/features/email/presentation/utils/email_action_reactor/email_action_reactor.dart
@@ -507,14 +507,14 @@ class EmailActionReactor {
       if (EmailUtils.isReplyToListEnabled(presentationEmail.listPost ?? '') &&
           additionalActions.contains(EmailActionType.replyToList))
         EmailActionType.replyToList,
-      if (isLabelAvailable && labels?.isNotEmpty == true)
-        EmailActionType.labelAs,
       if (PlatformInfo.isWeb &&
           PlatformInfo.isCanvasKit &&
           additionalActions.contains(EmailActionType.printAll))
         EmailActionType.printAll,
       if (additionalActions.contains(EmailActionType.moveToMailbox))
         EmailActionType.moveToMailbox,
+      if (isLabelAvailable && labels?.isNotEmpty == true)
+        EmailActionType.labelAs,
       if (additionalActions.contains(EmailActionType.markAsStarred) &&
           additionalActions.contains(EmailActionType.unMarkAsStarred))
         presentationEmail.hasStarred
diff --git a/lib/features/thread_detail/presentation/extension/on_thread_detail_action_click.dart b/lib/features/thread_detail/presentation/extension/on_thread_detail_action_click.dart
index 080a116f8..bc1424100 100644
--- a/lib/features/thread_detail/presentation/extension/on_thread_detail_action_click.dart
+++ b/lib/features/thread_detail/presentation/extension/on_thread_detail_action_click.dart
@@ -137,9 +137,6 @@ extension OnThreadDetailActionClick on ThreadDetailController {
     if (currentContext == null) return;
 
     final moreActions = [
-      if (mailboxDashBoardController.isLabelAvailable &&
-          mailboxDashBoardController.labelController.labels.isNotEmpty)
-        EmailActionType.labelAs,
       threadDetailIsRead
           ? EmailActionType.markAsUnread
           : EmailActionType.markAsRead,
@@ -147,6 +144,9 @@ extension OnThreadDetailActionClick on ThreadDetailController {
           ? EmailActionType.unMarkAsStarred
           : EmailActionType.markAsStarred,
       EmailActionType.moveToMailbox,
+      if (mailboxDashBoardController.isLabelAvailable &&
+          mailboxDashBoardController.labelController.labels.isNotEmpty)
+        EmailActionType.labelAs,
       if (!threadDetailIsArchived) EmailActionType.archiveMessage,
       threadDetailIsSpam ? EmailActionType.unSpam : EmailActionType.moveToSpam,
       threadDetailIsTrashed
diff --git a/model/lib/email/email_action_type.dart b/model/lib/email/email_action_type.dart
index 30cba1d76..3b5c65d99 100644
--- a/model/lib/email/email_action_type.dart
+++ b/model/lib/email/email_action_type.dart
@@ -4,7 +4,7 @@ enum EmailActionType {
   replyToList(1),
   forward(1),
   replyAll(1),
-  labelAs(1),
+  labelAs(2),
   compose(),
   markAsRead(2),
   markAsUnread(2),