From 8ad54aca5c79374a95b9e694b579b0bcb08265e2 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Fri, 10 Feb 2023 18:19:16 +0700
Subject: [PATCH] TF-1432 Close email view when mailbox deleted

---
 .../mailbox/presentation/mailbox_controller.dart      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/features/mailbox/presentation/mailbox_controller.dart b/lib/features/mailbox/presentation/mailbox_controller.dart
index 76ef55a81..367d09d37 100644
--- a/lib/features/mailbox/presentation/mailbox_controller.dart
+++ b/lib/features/mailbox/presentation/mailbox_controller.dart
@@ -792,8 +792,9 @@ class MailboxController extends BaseMailboxController {
           message: AppLocalizations.of(currentContext!).delete_mailboxes_successfully,
           icon: _imagePaths.icSelected);
     }
-    if (listMailboxIdDeleted.contains(mailboxDashBoardController.selectedMailbox.value?.id)) {
+    if (listMailboxIdDeleted.contains(selectedMailbox?.id)) {
       _switchBackToMailboxDefault();
+      _closeEmailViewIfMailboxDisabledOrNotExist(listMailboxIdDeleted);
     }
     refreshMailboxChanges(currentMailboxState: currentMailboxState);
   }
@@ -1280,7 +1281,7 @@ class MailboxController extends BaseMailboxController {
 
       if (success.mailboxId == selectedMailbox?.id) {
         _switchBackToMailboxDefault();
-        _closeEmailViewIfMailboxDisabled([success.mailboxId]);
+        _closeEmailViewIfMailboxDisabledOrNotExist([success.mailboxId]);
       }
     }
 
@@ -1293,7 +1294,7 @@ class MailboxController extends BaseMailboxController {
 
       if (success.mailboxIdsSubscribe.contains(selectedMailbox?.id)) {
         _switchBackToMailboxDefault();
-        _closeEmailViewIfMailboxDisabled(success.mailboxIdsSubscribe);
+        _closeEmailViewIfMailboxDisabledOrNotExist(success.mailboxIdsSubscribe);
       }
     }
 
@@ -1306,14 +1307,14 @@ class MailboxController extends BaseMailboxController {
 
       if (success.mailboxIdsSubscribe.contains(selectedMailbox?.id)) {
         _switchBackToMailboxDefault();
-        _closeEmailViewIfMailboxDisabled(success.mailboxIdsSubscribe);
+        _closeEmailViewIfMailboxDisabledOrNotExist(success.mailboxIdsSubscribe);
       }
     }
 
     refreshMailboxChanges(currentMailboxState: success.currentMailboxState);
   }
 
-  void _closeEmailViewIfMailboxDisabled(List<MailboxId> mailboxIdsDisabled) {
+  void _closeEmailViewIfMailboxDisabledOrNotExist(List<MailboxId> mailboxIdsDisabled) {
     if (selectedEmail == null) {
       return;
     }