From 4edcc926e549da52c3cc0735ec1a3abd44193718 Mon Sep 17 00:00:00 2001
From: hieubt <trunghieu.bui201@gmail.com>
Date: Tue, 10 Oct 2023 16:22:35 +0700
Subject: [PATCH] TF-2184 Change the order of multi actions

(cherry picked from commit 1efc364a02ba423250e2af1f6d8718421b3803dc)
---
 .../rules_filter_creator_controller.dart      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart b/lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart
index 3012b3338..ebcfe3c6f 100644
--- a/lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart
+++ b/lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart
@@ -221,16 +221,6 @@ class RulesFilterCreatorController extends BaseMailboxController {
             RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
             listEmailRuleFilterActionSelected.add(newRuleFilterAction);
           }
-          if (currentAction.markAsSeen == true) {
-            EmailRuleFilterAction? action = EmailRuleFilterAction.maskAsSeen;
-            RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
-            listEmailRuleFilterActionSelected.add(newRuleFilterAction);
-          }
-          if (currentAction.markAsImportant == true) {
-            EmailRuleFilterAction? action = EmailRuleFilterAction.startIt;
-            RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
-            listEmailRuleFilterActionSelected.add(newRuleFilterAction);
-          }
           if (currentAction.appendIn.mailboxIds.isNotEmpty == true) {
             for (var mailboxId in currentAction.appendIn.mailboxIds) {
               if (mailboxId == findMailboxNodeByRole(PresentationMailbox.roleSpam)?.item.id) {
@@ -244,6 +234,16 @@ class RulesFilterCreatorController extends BaseMailboxController {
               }
             }
           }
+          if (currentAction.markAsImportant == true) {
+            EmailRuleFilterAction? action = EmailRuleFilterAction.startIt;
+            RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
+            listEmailRuleFilterActionSelected.add(newRuleFilterAction);
+          }
+          if (currentAction.markAsSeen == true) {
+            EmailRuleFilterAction? action = EmailRuleFilterAction.maskAsSeen;
+            RuleFilterActionArguments newRuleFilterAction = RuleFilterActionArguments.newAction(action);
+            listEmailRuleFilterActionSelected.add(newRuleFilterAction);
+          }
 
           if (listEmailRuleFilterActionSelected.length >= maxCountAction) {
             isShowAddAction.value = false;