From 05f509496fdd7c21df316161d9f345debefc107d Mon Sep 17 00:00:00 2001 From: hieubt Date: Tue, 10 Oct 2023 18:35:24 +0700 Subject: [PATCH] Fix cannot delete email rule (cherry picked from commit 0fcd0492e3d461806514abcb97a1331878413989) --- .../email_rules/email_rules_controller.dart | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart b/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart index 5e289ebb9..9af571c8a 100644 --- a/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart +++ b/lib/features/manage_account/presentation/email_rules/email_rules_controller.dart @@ -200,6 +200,28 @@ class EmailRulesController extends BaseController { void _handleDeleteEmailRuleAction(TMailRule emailRule) { popBack(); + if (emailRule.conditionGroup != null) { + emailRule = TMailRule( + id: emailRule.id, + name: emailRule.name, + action: emailRule.action, + conditionGroup: emailRule.conditionGroup, + ); + } + + listEmailRule.value = listEmailRule.map((rule) { + if (rule.conditionGroup != null) { + return TMailRule( + id: rule.id, + name: rule.name, + action: rule.action, + conditionGroup: rule.conditionGroup, + ); + } else { + return rule; + } + }).toList(); + if (_deleteEmailRuleInteractor != null) { final deleteEmailRuleRequest = DeleteEmailRuleRequest( emailRuleDelete : emailRule,