From a009277aa2552ca3c7f6c3a9fa16a1ba830d7616 Mon Sep 17 00:00:00 2001
From: hieubt <trunghieu.bui201@gmail.com>
Date: Thu, 21 Sep 2023 16:34:11 +0700
Subject: [PATCH] TF-2085 Update CreateNewEmailRuleFilterRequest for
 ConditionGroup

(cherry picked from commit 6730b218a201718a4f8c1b6c12f6d29fb6d7d040)
---
 .../create_new_email_rule_filter_request.dart      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/features/manage_account/domain/model/create_new_email_rule_filter_request.dart b/lib/features/manage_account/domain/model/create_new_email_rule_filter_request.dart
index 9618c53fb..9f5291ee9 100644
--- a/lib/features/manage_account/domain/model/create_new_email_rule_filter_request.dart
+++ b/lib/features/manage_account/domain/model/create_new_email_rule_filter_request.dart
@@ -11,7 +11,19 @@ class CreateNewEmailRuleFilterRequest with EquatableMixin {
   CreateNewEmailRuleFilterRequest(this.currentListTMailRules, this.newTMailRule);
 
   List<TMailRule> get newListTMailRules {
-    final newListRules = currentListTMailRules;
+    final newListRules = <TMailRule>[];
+    for (var rule in currentListTMailRules) {
+      if (rule.conditionGroup != null) {
+        final newRule = TMailRule(
+          name: rule.name,
+          action: rule.action,
+          conditionGroup: rule.conditionGroup,
+        );
+        newListRules.add(newRule);
+      } else {
+        newListRules.add(rule);
+      }
+    }
     newListRules.insert(0, newTMailRule);
     log('CreateNewEmailRuleFilterRequest::newListTMailRules(): $newListRules');
     return newListRules;