From fc5ffcc4dd9f108bca12fb9b51391a8a3bba5241 Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 24 Mar 2023 18:34:37 +0700 Subject: [PATCH] TF-1645 Fix always show default mailbox in destination picker (cherry picked from commit 81594b3e41019077e5c659f6754693ff6acb446c) --- .../presentation/destination_picker_controller.dart | 6 +++--- .../lib/extensions/list_presentation_mailbox_extension.dart | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/features/destination_picker/presentation/destination_picker_controller.dart b/lib/features/destination_picker/presentation/destination_picker_controller.dart index 3c9d505b5..cccad51de 100644 --- a/lib/features/destination_picker/presentation/destination_picker_controller.dart +++ b/lib/features/destination_picker/presentation/destination_picker_controller.dart @@ -118,14 +118,14 @@ class DestinationPickerController extends BaseMailboxController { if (success is GetAllMailboxSuccess) { if (mailboxAction.value == MailboxActions.move && mailboxIdSelected != null) { buildTree( - success.mailboxList.listSubscribedMailboxes, + success.mailboxList.listSubscribedMailboxesAndDefaultMailboxes, mailboxIdSelected: mailboxIdSelected ); } else { - buildTree(success.mailboxList.listSubscribedMailboxes); + buildTree(success.mailboxList.listSubscribedMailboxesAndDefaultMailboxes); } } else if (success is RefreshChangesAllMailboxSuccess) { - refreshTree(success.mailboxList.listSubscribedMailboxes); + refreshTree(success.mailboxList.listSubscribedMailboxesAndDefaultMailboxes); } }); } diff --git a/model/lib/extensions/list_presentation_mailbox_extension.dart b/model/lib/extensions/list_presentation_mailbox_extension.dart index f23b2d80e..812a7da5b 100644 --- a/model/lib/extensions/list_presentation_mailbox_extension.dart +++ b/model/lib/extensions/list_presentation_mailbox_extension.dart @@ -3,9 +3,6 @@ import 'package:model/mailbox/presentation_mailbox.dart'; extension ListPresentationMailboxExtension on List { - List get listSubscribedMailboxes => - where((mailbox) => mailbox.isSubscribedMailbox).toList(); - List get listSubscribedMailboxesAndDefaultMailboxes => where((mailbox) => mailbox.isSubscribedMailbox || mailbox.isDefault).toList();