diff --git a/lib/features/base/model/filter_filter.dart b/lib/features/base/model/filter_filter.dart index 04801db2c..672a4498c 100644 --- a/lib/features/base/model/filter_filter.dart +++ b/lib/features/base/model/filter_filter.dart @@ -13,6 +13,7 @@ enum FilterField { mailBox, date, sortBy, + labels, hasAttachment, deletionDate, receptionDate, @@ -49,6 +50,8 @@ enum FilterField { return appLocalizations.headerRecipients; case FilterField.sender: return appLocalizations.sender; + case FilterField.labels: + return appLocalizations.labels; default: return ''; } @@ -77,6 +80,8 @@ enum FilterField { case FilterField.recipients: case FilterField.sender: return appLocalizations.addAnEmailAddress; + case FilterField.labels: + return appLocalizations.allLabels; default: return ''; } diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart index 62700a798..d53c17504 100644 --- a/lib/features/email/presentation/controller/single_email_controller.dart +++ b/lib/features/email/presentation/controller/single_email_controller.dart @@ -897,7 +897,7 @@ class SingleEmailController extends BaseController with AppLoaderMixin { pressEmailAction(actionType, presentationEmail); break; case EmailActionType.labelAs: - if (!isLabelFeatureEnabled) return; + if (!isLabelAvailable) return; openAddLabelToEmailDialogModal(presentationEmail); break; default: diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart index ba1872d1a..f03b3e71a 100644 --- a/lib/features/email/presentation/email_view.dart +++ b/lib/features/email/presentation/email_view.dart @@ -41,6 +41,7 @@ import 'package:tmail_ui_user/features/email/presentation/widgets/information_se import 'package:tmail_ui_user/features/email/presentation/widgets/mail_unsubscribed_banner.dart'; import 'package:tmail_ui_user/features/email/presentation/widgets/view_entire_message_with_message_clipped_widget.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/handle_open_context_menu_extension.dart'; +import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/labels/handle_logic_label_extension.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/verify_display_overlay_view_on_iframe_extension.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart'; @@ -103,7 +104,7 @@ class EmailView extends GetWidget { handleEmailAction: controller.handleEmailAction, additionalActions: [], emailIsRead: presentationEmail.hasRead, - isLabelFeatureEnabled: controller.isLabelFeatureEnabled, + isLabelFeatureEnabled: controller.isLabelAvailable, labels: controller.mailboxDashBoardController.labelController.labels, openBottomSheetContextMenu: controller.mailboxDashBoardController.openBottomSheetContextMenu, openPopupMenu: controller.mailboxDashBoardController.openPopupMenuActionGroup, @@ -258,18 +259,15 @@ class EmailView extends GetWidget { children: [ if (!isInsideThreadDetailView || isFirstEmailInThreadDetail) Obx(() { - final isLabelCapabilitySupported = controller - .mailboxDashBoardController.isLabelCapabilitySupported; + final isLabelAvailable = controller + .mailboxDashBoardController.isLabelAvailable; final labelController = controller.mailboxDashBoardController.labelController; - final isLabelSettingEnabled = - labelController.isLabelSettingEnabled.isTrue; - List