From f49cc04a0189caa16a7f35b97e87ee63f448149a Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 15 Jul 2025 13:33:09 +0700 Subject: [PATCH] Hide spam banner when we are in spam Signed-off-by: dab246 --- .../presentation/mailbox_dashboard_view_web.dart | 14 ++++++++++++-- lib/features/thread/presentation/thread_view.dart | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart index ceb083b06..b2f9d554d 100644 --- a/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart +++ b/lib/features/mailbox_dashboard/presentation/mailbox_dashboard_view_web.dart @@ -177,8 +177,18 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView { Obx(() { final spamController = controller.spamReportController; - if (spamController.spamReportState.value == SpamReportState.disabled || - spamController.presentationSpamMailbox.value == null) { + final isSpamReportDisabled = spamController.spamReportState.value == SpamReportState.disabled; + + final isSpamFolderSelected = controller + .selectedMailbox + .value + ?.isSpam == true; + + final isPresentationSpamMailboxIsNull = spamController.presentationSpamMailbox.value == null; + + if (isSpamReportDisabled || + isPresentationSpamMailboxIsNull || + isSpamFolderSelected) { return const SizedBox.shrink(); } diff --git a/lib/features/thread/presentation/thread_view.dart b/lib/features/thread/presentation/thread_view.dart index 475735a46..7dfe947fb 100644 --- a/lib/features/thread/presentation/thread_view.dart +++ b/lib/features/thread/presentation/thread_view.dart @@ -115,8 +115,19 @@ class ThreadView extends GetWidget .mailboxDashBoardController .spamReportController; - if (spamController.spamReportState.value == SpamReportState.disabled || - spamController.presentationSpamMailbox.value == null) { + final isSpamReportDisabled = spamController.spamReportState.value == SpamReportState.disabled; + + final isSpamFolderSelected = controller + .mailboxDashBoardController + .selectedMailbox + .value + ?.isSpam == true; + + final isPresentationSpamMailboxIsNull = spamController.presentationSpamMailbox.value == null; + + if (isSpamReportDisabled || + isPresentationSpamMailboxIsNull || + isSpamFolderSelected) { return const SizedBox.shrink(); }