diff --git a/lib/features/mailbox/presentation/mailbox_controller.dart b/lib/features/mailbox/presentation/mailbox_controller.dart index 45bdc7fa0..8dd3ff48e 100644 --- a/lib/features/mailbox/presentation/mailbox_controller.dart +++ b/lib/features/mailbox/presentation/mailbox_controller.dart @@ -550,7 +550,6 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM ) { log('MailboxController::_handleOpenMailbox():MailboxName: ${presentationMailboxSelected.name}'); KeyboardUtils.hideKeyboard(context); - mailboxDashBoardController.setSelectedMailbox(presentationMailboxSelected); mailboxDashBoardController.clearSelectedEmail(); if (presentationMailboxSelected.id != mailboxDashBoardController.selectedMailbox.value?.id) { mailboxDashBoardController.clearFilterMessageOption(); @@ -558,6 +557,7 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM _disableAllSearchEmail(); _replaceBrowserHistory(); mailboxDashBoardController.closeMailboxMenuDrawer(); + mailboxDashBoardController.setSelectedMailbox(presentationMailboxSelected); mailboxDashBoardController.dispatchRoute(DashboardRoutes.thread); } diff --git a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart index 8e084ed5c..616c4c786 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart @@ -372,7 +372,6 @@ class AdvancedFilterController extends BaseController { listFromEmailAddress.clear(); listToEmailAddress.clear(); _destinationMailboxSelected = null; - searchController.sortOrderFiltered.value = EmailSortOrderType.mostRecent; } void _clearAllTextFieldInput() { diff --git a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart index 117b37f6b..ea55dd620 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/search_controller.dart @@ -287,12 +287,17 @@ class SearchController extends BaseController with DateRangePickerMixin { searchInputController.clear(); searchFocus.unfocus(); } + + void _clearSortOrder() { + sortOrderFiltered.value = EmailSortOrderType.mostRecent; + } void disableAllSearchEmail() { _clearAllTextInputSimpleSearch(); deactivateSimpleSearch(); hideSimpleSearchFormView(); + _clearSortOrder(); clearSearchFilter(); deactivateAdvancedSearch(); hideAdvancedSearchFormView();