TF-838 Implement State for Interactor

lib/features/composer/domain/state/save_email_as_drafts_state.dart

@@ -1,5 +1,7 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
 class SaveEmailAsDraftsLoading extends UIState {
 
@@ -9,11 +11,17 @@ class SaveEmailAsDraftsLoading extends UIState {
   List<Object?> get props => [];
 }
 
-class SaveEmailAsDraftsSuccess extends UIState {
+class SaveEmailAsDraftsSuccess extends UIActionState {
 
   final Email emailAsDrafts;
 
-  SaveEmailAsDraftsSuccess(this.emailAsDrafts);
+  SaveEmailAsDraftsSuccess(
+    this.emailAsDrafts,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [];

lib/features/composer/domain/state/send_email_state.dart

@@ -1,4 +1,6 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
 class SendingEmailState extends UIState {
   SendingEmailState();
@@ -7,9 +9,12 @@ class SendingEmailState extends UIState {
   List<Object?> get props => [];
 }
 
-class SendEmailSuccess extends UIState {
+class SendEmailSuccess extends UIActionState {
 
-  SendEmailSuccess();
+  SendEmailSuccess({
+    jmap.State? currentEmailState,
+    jmap.State? currentMailboxState,
+  }) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [];

lib/features/composer/domain/state/update_email_drafts_state.dart

@@ -1,5 +1,7 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
 class UpdatingEmailDrafts extends UIState {
 
@@ -9,11 +11,17 @@ class UpdatingEmailDrafts extends UIState {
   List<Object?> get props => [];
 }
 
-class UpdateEmailDraftsSuccess extends UIState {
+class UpdateEmailDraftsSuccess extends UIActionState {
 
   final Email emailAsDrafts;
 
-  UpdateEmailDraftsSuccess(this.emailAsDrafts);
+  UpdateEmailDraftsSuccess(
+    this.emailAsDrafts,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [];

lib/features/composer/domain/usecases/save_email_as_drafts_interactor.dart

@@ -4,18 +4,32 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:tmail_ui_user/features/composer/domain/state/save_email_as_drafts_state.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 
 class SaveEmailAsDraftsInteractor {
-  final EmailRepository emailRepository;
+  final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  SaveEmailAsDraftsInteractor(this.emailRepository);
+  SaveEmailAsDraftsInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, Email email) async* {
     try {
       yield Right<Failure, Success>(SaveEmailAsDraftsLoading());
-      final emailAsDrafts = await emailRepository.saveEmailAsDrafts(accountId, email);
+
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
+      final emailAsDrafts = await _emailRepository.saveEmailAsDrafts(accountId, email);
       if (emailAsDrafts != null) {
-        yield Right<Failure, Success>(SaveEmailAsDraftsSuccess(emailAsDrafts));
+        yield Right<Failure, Success>(SaveEmailAsDraftsSuccess(
+            emailAsDrafts,
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(SaveEmailAsDraftsFailure(null));
       }

lib/features/composer/domain/usecases/send_email_interactor.dart

@@ -4,18 +4,31 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
 import 'package:tmail_ui_user/features/composer/domain/state/send_email_state.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 
 class SendEmailInteractor {
-  final EmailRepository emailRepository;
+  final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  SendEmailInteractor(this.emailRepository);
+  SendEmailInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, EmailRequest emailRequest) async* {
     try {
       yield Right<Failure, Success>(SendingEmailState());
-      final result = await emailRepository.sendEmail(accountId, emailRequest);
+
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
+      final result = await _emailRepository.sendEmail(accountId, emailRequest);
       if (result) {
-        yield Right<Failure, Success>(SendEmailSuccess());
+        yield Right<Failure, Success>(SendEmailSuccess(
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(SendEmailFailure(result));
       }

lib/features/composer/domain/usecases/update_email_drafts_interactor.dart

@@ -4,18 +4,32 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:tmail_ui_user/features/composer/domain/state/update_email_drafts_state.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 
 class UpdateEmailDraftsInteractor {
-  final EmailRepository emailRepository;
+  final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  UpdateEmailDraftsInteractor(this.emailRepository);
+  UpdateEmailDraftsInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, Email newEmail, EmailId oldEmailId) async* {
     try {
       yield Right<Failure, Success>(UpdatingEmailDrafts());
-      final newEmailDrafts = await emailRepository.updateEmailDrafts(accountId, newEmail, oldEmailId);
+
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
+      final newEmailDrafts = await _emailRepository.updateEmailDrafts(accountId, newEmail, oldEmailId);
       if (newEmailDrafts != null) {
-        yield Right<Failure, Success>(UpdateEmailDraftsSuccess(newEmailDrafts));
+        yield Right<Failure, Success>(UpdateEmailDraftsSuccess(
+            newEmailDrafts,
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(UpdateEmailDraftsFailure(null));
       }

lib/features/email/domain/state/delete_email_permanently_state.dart

@@ -1,8 +1,13 @@
 import 'package:core/core.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 
-class DeleteEmailPermanentlySuccess extends UIState {
+class DeleteEmailPermanentlySuccess extends UIActionState {
 
-  DeleteEmailPermanentlySuccess();
+  DeleteEmailPermanentlySuccess({
+    jmap.State? currentEmailState,
+    jmap.State? currentMailboxState,
+  }) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [];
@@ -10,7 +15,7 @@ class DeleteEmailPermanentlySuccess extends UIState {
 
 class DeleteEmailPermanentlyFailure extends FeatureFailure {
 
-  final exception;
+  final dynamic exception;
 
   DeleteEmailPermanentlyFailure(this.exception);
 

lib/features/email/domain/state/delete_multiple_emails_permanently_state.dart

@@ -1,21 +1,35 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
-class DeleteMultipleEmailsPermanentlyAllSuccess extends UIState {
+class DeleteMultipleEmailsPermanentlyAllSuccess extends UIActionState {
 
   List<EmailId> emailIds;
 
-  DeleteMultipleEmailsPermanentlyAllSuccess(this.emailIds);
+  DeleteMultipleEmailsPermanentlyAllSuccess(
+    this.emailIds,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [emailIds];
 }
 
-class DeleteMultipleEmailsPermanentlyHasSomeEmailFailure extends UIState {
+class DeleteMultipleEmailsPermanentlyHasSomeEmailFailure extends UIActionState {
 
   List<EmailId> emailIds;
 
-  DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(this.emailIds);
+  DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(
+    this.emailIds,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object> get props => [emailIds];
@@ -31,7 +45,7 @@ class DeleteMultipleEmailsPermanentlyAllFailure extends FeatureFailure {
 
 class DeleteMultipleEmailsPermanentlyFailure extends FeatureFailure {
 
-  final exception;
+  final dynamic exception;
 
   DeleteMultipleEmailsPermanentlyFailure(this.exception);
 

lib/features/email/domain/state/mark_as_email_read_state.dart

@@ -1,20 +1,29 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:model/email/read_actions.dart';
 import 'package:model/model.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
-class MarkAsEmailReadSuccess extends UIState {
+class MarkAsEmailReadSuccess extends UIActionState {
   final Email updatedEmail;
   final ReadActions readActions;
 
-  MarkAsEmailReadSuccess(this.updatedEmail, this.readActions);
+  MarkAsEmailReadSuccess(
+    this.updatedEmail,
+    this.readActions,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [updatedEmail, readActions];
 }
 
 class MarkAsEmailReadFailure extends FeatureFailure {
-  final exception;
+  final dynamic exception;
   final ReadActions readActions;
 
   MarkAsEmailReadFailure(this.exception, this.readActions);

lib/features/email/domain/state/mark_as_email_star_state.dart

@@ -1,19 +1,28 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:model/model.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
-class MarkAsStarEmailSuccess extends UIState {
+class MarkAsStarEmailSuccess extends UIActionState {
   final Email updatedEmail;
   final MarkStarAction markStarAction;
 
-  MarkAsStarEmailSuccess(this.updatedEmail, this.markStarAction);
+  MarkAsStarEmailSuccess(
+    this.updatedEmail,
+    this.markStarAction,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [updatedEmail, markStarAction];
 }
 
 class MarkAsStarEmailFailure extends FeatureFailure {
-  final exception;
+  final dynamic exception;
   final MarkStarAction markStarAction;
 
   MarkAsStarEmailFailure(this.exception, this.markStarAction);

lib/features/email/domain/state/move_to_mailbox_state.dart

@@ -1,10 +1,12 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/model.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
 
-class MoveToMailboxSuccess extends UIState {
+class MoveToMailboxSuccess extends UIActionState {
   final EmailId emailId;
   final MailboxId currentMailboxId;
   final MailboxId destinationMailboxId;
@@ -18,8 +20,12 @@ class MoveToMailboxSuccess extends UIState {
     this.destinationMailboxId,
     this.moveAction,
     this.emailActionType,
-    {this.destinationPath}
+    {
-  );
+      this.destinationPath,
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [
@@ -34,7 +40,7 @@ class MoveToMailboxSuccess extends UIState {
 
 class MoveToMailboxFailure extends FeatureFailure {
   final EmailActionType emailActionType;
-  final exception;
+  final dynamic exception;
 
   MoveToMailboxFailure(this.emailActionType, this.exception);
 

lib/features/email/domain/usecases/delete_email_permanently_interactor.dart

@@ -4,17 +4,29 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/state/delete_email_permanently_state.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 
 class DeleteEmailPermanentlyInteractor {
-  final EmailRepository emailRepository;
+  final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  DeleteEmailPermanentlyInteractor(this.emailRepository);
+  DeleteEmailPermanentlyInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, EmailId emailId) async* {
     try {
-      final result = await emailRepository.deleteEmailPermanently(accountId, emailId);
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
+      final result = await _emailRepository.deleteEmailPermanently(accountId, emailId);
       if (result) {
-        yield Right<Failure, Success>(DeleteEmailPermanentlySuccess());
+        yield Right<Failure, Success>(DeleteEmailPermanentlySuccess(
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(DeleteEmailPermanentlyFailure(null));
       }

lib/features/email/domain/usecases/delete_multiple_emails_permanently_interactor.dart

@@ -4,19 +4,35 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/state/delete_multiple_emails_permanently_state.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 
 class DeleteMultipleEmailsPermanentlyInteractor {
-  final EmailRepository emailRepository;
+  final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  DeleteMultipleEmailsPermanentlyInteractor(this.emailRepository);
+  DeleteMultipleEmailsPermanentlyInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, List<EmailId> emailIds) async* {
     try {
-      final listResult = await emailRepository.deleteMultipleEmailsPermanently(accountId, emailIds);
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
+      final listResult = await _emailRepository.deleteMultipleEmailsPermanently(accountId, emailIds);
       if (listResult.length == emailIds.length) {
-        yield Right<Failure, Success>(DeleteMultipleEmailsPermanentlyAllSuccess(listResult));
+        yield Right<Failure, Success>(DeleteMultipleEmailsPermanentlyAllSuccess(
+            listResult,
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else if (listResult.isNotEmpty) {
-        yield Right<Failure, Success>(DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(listResult));
+        yield Right<Failure, Success>(DeleteMultipleEmailsPermanentlyHasSomeEmailFailure(
+            listResult,
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(DeleteMultipleEmailsPermanentlyAllFailure());
       }

lib/features/email/domain/usecases/mark_as_email_read_interactor.dart

@@ -5,18 +5,32 @@ import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 
 class MarkAsEmailReadInteractor {
   final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  MarkAsEmailReadInteractor(this._emailRepository);
+  MarkAsEmailReadInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, Email email, ReadActions readAction) async* {
     try {
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
       final result = await _emailRepository.markAsRead(accountId, [email], readAction);
       if (result.isNotEmpty) {
         final updatedEmail = email.updatedEmail(newKeywords: result.first.keywords);
-        yield Right(MarkAsEmailReadSuccess(updatedEmail, readAction));
+        yield Right(MarkAsEmailReadSuccess(
+            updatedEmail,
+            readAction,
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left(MarkAsEmailReadFailure(null, readAction));
       }

lib/features/email/domain/usecases/mark_as_star_email_interactor.dart

@@ -13,10 +13,14 @@ class MarkAsStarEmailInteractor {
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, Email email, MarkStarAction markStarAction) async* {
     try {
+      final currentEmailState = await emailRepository.getEmailState();
       final result = await emailRepository.markAsStar(accountId, [email], markStarAction);
       if (result.isNotEmpty) {
         final updatedEmail = email.updatedEmail(newKeywords: result.first.keywords);
-        yield Right(MarkAsStarEmailSuccess(updatedEmail, markStarAction));
+        yield Right(MarkAsStarEmailSuccess(
+            updatedEmail,
+            markStarAction,
+            currentEmailState: currentEmailState));
       } else {
         yield Left(MarkAsStarEmailFailure(null, markStarAction));
       }

lib/features/email/domain/usecases/move_to_mailbox_interactor.dart

@@ -4,15 +4,25 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_to_mailbox_request.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/state/move_to_mailbox_state.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 
 class MoveToMailboxInteractor {
-  final EmailRepository emailRepository;
+  final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  MoveToMailboxInteractor(this.emailRepository);
+  MoveToMailboxInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, MoveToMailboxRequest moveRequest) async* {
     try {
-      final result = await emailRepository.moveToMailbox(accountId, moveRequest);
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
+      final result = await _emailRepository.moveToMailbox(accountId, moveRequest);
       if (result.isNotEmpty) {
         yield Right(MoveToMailboxSuccess(
           result.first,
@@ -20,7 +30,9 @@ class MoveToMailboxInteractor {
           moveRequest.destinationMailboxId,
           moveRequest.moveAction,
           moveRequest.emailActionType,
-          destinationPath: moveRequest.destinationPath));
+          destinationPath: moveRequest.destinationPath,
+          currentMailboxState: currentMailboxState,
+          currentEmailState: currentEmailState));
       } else {
         yield Left(MoveToMailboxFailure(moveRequest.emailActionType, null));
       }

lib/features/mailbox/domain/state/create_new_mailbox_state.dart

@@ -1,11 +1,16 @@
 import 'package:core/core.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 
-class CreateNewMailboxSuccess extends UIState {
+class CreateNewMailboxSuccess extends UIActionState {
 
   final Mailbox newMailbox;
 
-  CreateNewMailboxSuccess(this.newMailbox);
+  CreateNewMailboxSuccess(this.newMailbox, {
+    jmap.State? currentEmailState,
+    jmap.State? currentMailboxState,
+  }) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [newMailbox];

lib/features/mailbox/domain/state/delete_multiple_mailbox_state.dart

@@ -1,11 +1,16 @@
 import 'package:core/core.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
-class DeleteMultipleMailboxSuccess extends UIState {
+class DeleteMultipleMailboxSuccess extends UIActionState {
 
   final MailboxId mailboxIdDeleted;
 
-  DeleteMultipleMailboxSuccess(this.mailboxIdDeleted);
+  DeleteMultipleMailboxSuccess(this.mailboxIdDeleted, {
+    jmap.State? currentEmailState,
+    jmap.State? currentMailboxState,
+  }) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [mailboxIdDeleted];

lib/features/mailbox/domain/state/mark_as_mailbox_read_state.dart

@@ -1,5 +1,7 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
 class MarkAsMailboxReadLoading extends UIState {
 
@@ -24,22 +26,34 @@ class UpdatingMarkAsMailboxReadState extends UIState {
   List<Object?> get props => [mailboxId, countRead, totalUnread];
 }
 
-class MarkAsMailboxReadAllSuccess extends UIState {
+class MarkAsMailboxReadAllSuccess extends UIActionState {
 
   final MailboxName mailboxName;
 
-  MarkAsMailboxReadAllSuccess(this.mailboxName);
+  MarkAsMailboxReadAllSuccess(this.mailboxName,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentMailboxState, currentEmailState);
 
   @override
   List<Object?> get props => [mailboxName];
 }
 
-class MarkAsMailboxReadHasSomeEmailFailure extends UIState {
+class MarkAsMailboxReadHasSomeEmailFailure extends UIActionState {
 
   final MailboxName mailboxName;
   final int countEmailsRead;
 
-  MarkAsMailboxReadHasSomeEmailFailure(this.mailboxName, this.countEmailsRead);
+  MarkAsMailboxReadHasSomeEmailFailure(
+    this.mailboxName,
+    this.countEmailsRead,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentMailboxState, currentEmailState);
 
   @override
   List<Object?> get props => [mailboxName, countEmailsRead];

lib/features/mailbox/domain/state/move_mailbox_state.dart

@@ -1,6 +1,8 @@
 import 'package:core/core.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 
 class MoveMailboxLoading extends UIState {
 
@@ -10,7 +12,7 @@ class MoveMailboxLoading extends UIState {
   List<Object?> get props => [];
 }
 
-class MoveMailboxSuccess extends UIState {
+class MoveMailboxSuccess extends UIActionState {
 
   final MailboxId mailboxIdSelected;
   final MoveAction moveAction;
@@ -24,9 +26,11 @@ class MoveMailboxSuccess extends UIState {
     {
       this.parentId,
       this.destinationMailboxId,
-      this.destinationMailboxName
+      this.destinationMailboxName,
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
     }
-  );
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [

lib/features/mailbox/domain/state/rename_mailbox_state.dart

@@ -1,8 +1,13 @@
 import 'package:core/core.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 
-class RenameMailboxSuccess extends UIState {
+class RenameMailboxSuccess extends UIActionState {
 
-  RenameMailboxSuccess();
+  RenameMailboxSuccess({
+    jmap.State? currentEmailState,
+    jmap.State? currentMailboxState,
+  }) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [];

lib/features/mailbox/domain/usecases/create_new_mailbox_interactor.dart

@@ -6,15 +6,18 @@ import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_reposit
 import 'package:tmail_ui_user/features/mailbox/domain/state/create_new_mailbox_state.dart';
 
 class CreateNewMailboxInteractor {
-  final MailboxRepository mailboxRepository;
+  final MailboxRepository _mailboxRepository;
 
-  CreateNewMailboxInteractor(this.mailboxRepository);
+  CreateNewMailboxInteractor(this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, CreateNewMailboxRequest newMailboxRequest) async* {
     try {
-      final newMailbox = await mailboxRepository.createNewMailbox(accountId, newMailboxRequest);
+      final currentMailboxState = await _mailboxRepository.getMailboxState();
+      final newMailbox = await _mailboxRepository.createNewMailbox(accountId, newMailboxRequest);
       if (newMailbox != null) {
-        yield Right<Failure, Success>(CreateNewMailboxSuccess(newMailbox));
+        yield Right<Failure, Success>(CreateNewMailboxSuccess(
+            newMailbox,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(CreateNewMailboxFailure(null));
       }

lib/features/mailbox/domain/usecases/delete_multiple_mailbox_interactor.dart

@@ -7,15 +7,18 @@ import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_reposit
 import 'package:tmail_ui_user/features/mailbox/domain/state/delete_multiple_mailbox_state.dart';
 
 class DeleteMultipleMailboxInteractor {
-  final MailboxRepository mailboxRepository;
+  final MailboxRepository _mailboxRepository;
 
-  DeleteMultipleMailboxInteractor(this.mailboxRepository);
+  DeleteMultipleMailboxInteractor(this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(Session session, AccountId accountId, List<MailboxId> mailboxIds, MailboxId mailboxIdDeleted) async* {
     try {
-      final result = await mailboxRepository.deleteMultipleMailbox(session, accountId, mailboxIds);
+      final currentMailboxState = await _mailboxRepository.getMailboxState();
+      final result = await _mailboxRepository.deleteMultipleMailbox(session, accountId, mailboxIds);
       if (result) {
-        yield Right<Failure, Success>(DeleteMultipleMailboxSuccess(mailboxIdDeleted));
+        yield Right<Failure, Success>(DeleteMultipleMailboxSuccess(
+            mailboxIdDeleted,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(DeleteMultipleMailboxFailure(null));
       }

lib/features/mailbox/domain/usecases/mark_as_mailbox_read_interactor.dart

@@ -4,13 +4,15 @@ import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
+import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/state/mark_as_mailbox_read_state.dart';
 
 class MarkAsMailboxReadInteractor {
   final MailboxRepository _mailboxRepository;
+  final EmailRepository _emailRepository;
 
-  MarkAsMailboxReadInteractor(this._mailboxRepository);
+  MarkAsMailboxReadInteractor(this._mailboxRepository, this._emailRepository);
 
   Stream<Either<Failure, Success>> execute(
       AccountId accountId,
@@ -23,6 +25,14 @@ class MarkAsMailboxReadInteractor {
       yield Right<Failure, Success>(MarkAsMailboxReadLoading());
       onProgressController.add(Right(MarkAsMailboxReadLoading()));
 
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
       final listEmails = await _mailboxRepository.markAsMailboxRead(
           accountId,
           mailboxId,
@@ -30,9 +40,16 @@ class MarkAsMailboxReadInteractor {
           onProgressController);
 
       if (totalEmailUnread == listEmails.length) {
-        yield Right(MarkAsMailboxReadAllSuccess(mailboxName));
+        yield Right(MarkAsMailboxReadAllSuccess(
+            mailboxName,
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else if (listEmails.isNotEmpty) {
-        yield Right(MarkAsMailboxReadHasSomeEmailFailure(mailboxName, listEmails.length));
+        yield Right(MarkAsMailboxReadHasSomeEmailFailure(
+            mailboxName,
+            listEmails.length,
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left(MarkAsMailboxReadAllFailure());
       }

lib/features/mailbox/domain/usecases/move_mailbox_interactor.dart

@@ -6,20 +6,22 @@ import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_reposit
 import 'package:tmail_ui_user/features/mailbox/domain/state/move_mailbox_state.dart';
 
 class MoveMailboxInteractor {
-  final MailboxRepository mailboxRepository;
+  final MailboxRepository _mailboxRepository;
 
-  MoveMailboxInteractor(this.mailboxRepository);
+  MoveMailboxInteractor(this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, MoveMailboxRequest request) async* {
     try {
-      final result = await mailboxRepository.moveMailbox(accountId, request);
+      final currentMailboxState = await _mailboxRepository.getMailboxState();
+      final result = await _mailboxRepository.moveMailbox(accountId, request);
       if (result) {
         yield Right<Failure, Success>(MoveMailboxSuccess(
             request.mailboxId,
             request.moveAction,
             parentId: request.parentId,
             destinationMailboxId: request.destinationMailboxId,
-            destinationMailboxName: request.destinationMailboxName));
+            destinationMailboxName: request.destinationMailboxName,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(MoveMailboxFailure(null));
       }

lib/features/mailbox/domain/usecases/rename_mailbox_interactor.dart

@@ -6,15 +6,17 @@ import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_reposit
 import 'package:tmail_ui_user/features/mailbox/domain/state/rename_mailbox_state.dart';
 
 class RenameMailboxInteractor {
-  final MailboxRepository mailboxRepository;
+  final MailboxRepository _mailboxRepository;
 
-  RenameMailboxInteractor(this.mailboxRepository);
+  RenameMailboxInteractor(this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, RenameMailboxRequest request) async* {
     try {
-      final result = await mailboxRepository.renameMailbox(accountId, request);
+      final currentMailboxState = await _mailboxRepository.getMailboxState();
+
+      final result = await _mailboxRepository.renameMailbox(accountId, request);
       if (result) {
-        yield Right<Failure, Success>(RenameMailboxSuccess());
+        yield Right<Failure, Success>(RenameMailboxSuccess(currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(RenameMailboxFailure(null));
       }

lib/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart

@@ -1,8 +1,13 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
-class RemoveEmailDraftsSuccess extends UIState {
+class RemoveEmailDraftsSuccess extends UIActionState {
 
-  RemoveEmailDraftsSuccess();
+  RemoveEmailDraftsSuccess({
+    jmap.State? currentEmailState,
+    jmap.State? currentMailboxState,
+  }) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [];

lib/features/mailbox_dashboard/domain/usecases/remove_email_drafts_interactor.dart

@@ -3,18 +3,30 @@ import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart';
 
 class RemoveEmailDraftsInteractor {
-  final EmailRepository emailRepository;
+  final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  RemoveEmailDraftsInteractor(this.emailRepository);
+  RemoveEmailDraftsInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, EmailId emailId) async* {
     try {
-      final result = await emailRepository.removeEmailDrafts(accountId, emailId);
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
+      final result = await _emailRepository.removeEmailDrafts(accountId, emailId);
       if (result) {
-        yield Right<Failure, Success>(RemoveEmailDraftsSuccess());
+        yield Right<Failure, Success>(RemoveEmailDraftsSuccess(
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else {
         yield Left<Failure, Success>(RemoveEmailDraftsFailure(result));
       }

lib/features/thread/domain/state/empty_trash_folder_state.dart

@@ -1,8 +1,13 @@
 import 'package:core/core.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 
-class EmptyTrashFolderSuccess extends UIState {
+class EmptyTrashFolderSuccess extends UIActionState {
 
-  EmptyTrashFolderSuccess();
+  EmptyTrashFolderSuccess({
+    jmap.State? currentEmailState,
+    jmap.State? currentMailboxState,
+  }) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [];

lib/features/thread/domain/state/mark_as_multiple_email_read_state.dart

@@ -1,11 +1,20 @@
 import 'package:core/core.dart';
 import 'package:model/email/read_actions.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
-class MarkAsMultipleEmailReadAllSuccess extends UIState {
+class MarkAsMultipleEmailReadAllSuccess extends UIActionState {
   final int countMarkAsReadSuccess;
   final ReadActions readActions;
 
-  MarkAsMultipleEmailReadAllSuccess(this.countMarkAsReadSuccess, this.readActions);
+  MarkAsMultipleEmailReadAllSuccess(
+      this.countMarkAsReadSuccess,
+      this.readActions,
+      {
+        jmap.State? currentEmailState,
+        jmap.State? currentMailboxState,
+      }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [countMarkAsReadSuccess, readActions];
@@ -20,11 +29,18 @@ class MarkAsMultipleEmailReadAllFailure extends FeatureFailure {
   List<Object> get props => [readActions];
 }
 
-class MarkAsMultipleEmailReadHasSomeEmailFailure extends UIState {
+class MarkAsMultipleEmailReadHasSomeEmailFailure extends UIActionState {
   final int countMarkAsReadSuccess;
   final ReadActions readActions;
 
-  MarkAsMultipleEmailReadHasSomeEmailFailure(this.countMarkAsReadSuccess, this.readActions);
+  MarkAsMultipleEmailReadHasSomeEmailFailure(
+    this.countMarkAsReadSuccess,
+    this.readActions,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object> get props => [countMarkAsReadSuccess, readActions];

lib/features/thread/domain/state/mark_as_star_multiple_email_state.dart

@@ -1,11 +1,20 @@
 import 'package:core/core.dart';
 import 'package:model/model.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 
-class MarkAsStarMultipleEmailAllSuccess extends UIState {
+class MarkAsStarMultipleEmailAllSuccess extends UIActionState {
   final int countMarkStarSuccess;
   final MarkStarAction markStarAction;
 
-  MarkAsStarMultipleEmailAllSuccess(this.countMarkStarSuccess, this.markStarAction);
+  MarkAsStarMultipleEmailAllSuccess(
+    this.countMarkStarSuccess,
+    this.markStarAction,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [countMarkStarSuccess, markStarAction];
@@ -20,11 +29,18 @@ class MarkAsStarMultipleEmailAllFailure extends FeatureFailure {
   List<Object> get props => [markStarAction];
 }
 
-class MarkAsStarMultipleEmailHasSomeEmailFailure extends UIState {
+class MarkAsStarMultipleEmailHasSomeEmailFailure extends UIActionState {
   final int countMarkStarSuccess;
   final MarkStarAction markStarAction;
 
-  MarkAsStarMultipleEmailHasSomeEmailFailure(this.countMarkStarSuccess, this.markStarAction);
+  MarkAsStarMultipleEmailHasSomeEmailFailure(
+    this.countMarkStarSuccess,
+    this.markStarAction,
+    {
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object> get props => [countMarkStarSuccess, markStarAction];

lib/features/thread/domain/state/move_multiple_email_to_mailbox_state.dart

@@ -1,10 +1,12 @@
 import 'package:core/core.dart';
+import 'package:jmap_dart_client/jmap/core/state.dart' as jmap;
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/email/email_action_type.dart';
+import 'package:tmail_ui_user/features/base/state/ui_action_state.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
 
-class MoveMultipleEmailToMailboxAllSuccess extends UIState {
+class MoveMultipleEmailToMailboxAllSuccess extends UIActionState {
   final List<EmailId> movedListEmailId;
   final MailboxId currentMailboxId;
   final MailboxId destinationMailboxId;
@@ -18,8 +20,12 @@ class MoveMultipleEmailToMailboxAllSuccess extends UIState {
     this.destinationMailboxId,
     this.moveAction,
     this.emailActionType,
-    {this.destinationPath}
+    {
-  );
+      this.destinationPath,
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [
@@ -42,7 +48,7 @@ class MoveMultipleEmailToMailboxAllFailure extends FeatureFailure {
   List<Object> get props => [moveAction, emailActionType];
 }
 
-class MoveMultipleEmailToMailboxHasSomeEmailFailure extends UIState {
+class MoveMultipleEmailToMailboxHasSomeEmailFailure extends UIActionState {
   final List<EmailId> movedListEmailId;
   final MailboxId currentMailboxId;
   final MailboxId destinationMailboxId;
@@ -56,8 +62,12 @@ class MoveMultipleEmailToMailboxHasSomeEmailFailure extends UIState {
     this.destinationMailboxId,
     this.moveAction,
     this.emailActionType,
-    {this.destinationPath}
+    {
-  );
+      this.destinationPath,
+      jmap.State? currentEmailState,
+      jmap.State? currentMailboxState,
+    }
+  ) : super(currentEmailState, currentMailboxState);
 
   @override
   List<Object?> get props => [

lib/features/thread/domain/usecases/empty_trash_folder_interactor.dart

@@ -2,21 +2,40 @@ import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
+import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 import 'package:tmail_ui_user/features/thread/domain/repository/thread_repository.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/empty_trash_folder_state.dart';
 
 class EmptyTrashFolderInteractor {
   final ThreadRepository threadRepository;
+  final MailboxRepository _mailboxRepository;
+  final EmailRepository _emailRepository;
 
-  EmptyTrashFolderInteractor(this.threadRepository);
+  EmptyTrashFolderInteractor(
+    this.threadRepository,
+    this._mailboxRepository,
+    this._emailRepository
+  );
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, MailboxId trashMailboxId) async* {
     try {
       yield Right<Failure, Success>(LoadingState());
 
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
       final result = await threadRepository.emptyTrashFolder(accountId, trashMailboxId);
       if (result) {
-        yield Right<Failure, Success>(EmptyTrashFolderSuccess());
+        yield Right<Failure, Success>(EmptyTrashFolderSuccess(
+          currentMailboxState: currentMailboxState,
+          currentEmailState: currentEmailState,
+        ));
       } else {
         yield Left<Failure, Success>(EmptyTrashFolderFailure(null));
       }

lib/features/thread/domain/usecases/mark_as_multiple_email_read_interactor.dart

@@ -4,12 +4,14 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/mark_as_multiple_email_read_state.dart';
 
 class MarkAsMultipleEmailReadInteractor {
   final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  MarkAsMultipleEmailReadInteractor(this._emailRepository);
+  MarkAsMultipleEmailReadInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(
       AccountId accountId,
@@ -17,6 +19,14 @@ class MarkAsMultipleEmailReadInteractor {
       ReadActions readAction
   ) async* {
     try {
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
       final listEmailNeedMarkAsRead = emails
           .where((email) => readAction == ReadActions.markAsUnread ? email.hasRead : !email.hasRead)
           .toList();
@@ -25,12 +35,20 @@ class MarkAsMultipleEmailReadInteractor {
 
       if (listEmailNeedMarkAsRead.length == result.length) {
         final countMarkAsReadSuccess = emails.length;
-        yield Right(MarkAsMultipleEmailReadAllSuccess(countMarkAsReadSuccess, readAction));
+        yield Right(MarkAsMultipleEmailReadAllSuccess(
+            countMarkAsReadSuccess,
+            readAction,
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       } else if (result.isEmpty) {
         yield Left(MarkAsMultipleEmailReadAllFailure(readAction));
       } else {
         final countMarkAsReadSuccess = emails.length - (listEmailNeedMarkAsRead.length - result.length);
-        yield Right(MarkAsMultipleEmailReadHasSomeEmailFailure(countMarkAsReadSuccess, readAction));
+        yield Right(MarkAsMultipleEmailReadHasSomeEmailFailure(
+            countMarkAsReadSuccess,
+            readAction,
+            currentEmailState: currentEmailState,
+            currentMailboxState: currentMailboxState));
       }
     } catch (e) {
       yield Left(MarkAsMultipleEmailReadFailure(e, readAction));

lib/features/thread/domain/usecases/mark_as_star_multiple_email_interactor.dart

@@ -17,6 +17,8 @@ class MarkAsStarMultipleEmailInteractor {
       MarkStarAction markStarAction
   ) async* {
     try {
+      final currentEmailState = await _emailRepository.getEmailState();
+
       final listEmailNeedMarkStar = emails
           .where((email) => markStarAction == MarkStarAction.unMarkStar ? email.hasStarred : !email.hasStarred)
           .toList();
@@ -25,12 +27,18 @@ class MarkAsStarMultipleEmailInteractor {
 
       if (listEmailNeedMarkStar.length == result.length) {
         final countMarkStarSuccess = emails.length;
-        yield Right(MarkAsStarMultipleEmailAllSuccess(countMarkStarSuccess, markStarAction));
+        yield Right(MarkAsStarMultipleEmailAllSuccess(
+            countMarkStarSuccess,
+            markStarAction,
+            currentEmailState: currentEmailState));
       } else if (result.isEmpty) {
         yield Left(MarkAsStarMultipleEmailAllFailure(markStarAction));
       } else {
         final countMarkStarSuccess = emails.length - (listEmailNeedMarkStar.length - result.length);
-        yield Right(MarkAsStarMultipleEmailHasSomeEmailFailure(countMarkStarSuccess, markStarAction));
+        yield Right(MarkAsStarMultipleEmailHasSomeEmailFailure(
+            countMarkStarSuccess,
+            markStarAction,
+            currentEmailState: currentEmailState));
       }
     } catch (e) {
       yield Left(MarkAsStarMultipleEmailFailure(e, markStarAction));

lib/features/thread/domain/usecases/move_multiple_email_to_mailbox_interactor.dart

@@ -5,15 +5,25 @@ import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:tmail_ui_user/features/email/domain/model/move_to_mailbox_request.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
+import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
 import 'package:tmail_ui_user/features/thread/domain/state/move_multiple_email_to_mailbox_state.dart';
 
 class MoveMultipleEmailToMailboxInteractor {
   final EmailRepository _emailRepository;
+  final MailboxRepository _mailboxRepository;
 
-  MoveMultipleEmailToMailboxInteractor(this._emailRepository);
+  MoveMultipleEmailToMailboxInteractor(this._emailRepository, this._mailboxRepository);
 
   Stream<Either<Failure, Success>> execute(AccountId accountId, MoveToMailboxRequest moveRequest) async* {
     try {
+      final listState = await Future.wait([
+        _mailboxRepository.getMailboxState(),
+        _emailRepository.getEmailState(),
+      ], eagerError: true);
+
+      final currentMailboxState = listState.first;
+      final currentEmailState = listState.last;
+
       final result = await _emailRepository.moveToMailbox(accountId, moveRequest);
 
       if (moveRequest.emailIds.length == result.length) {
@@ -23,7 +33,9 @@ class MoveMultipleEmailToMailboxInteractor {
           moveRequest.destinationMailboxId,
           moveRequest.moveAction,
           moveRequest.emailActionType,
-          destinationPath: moveRequest.destinationPath));
+          destinationPath: moveRequest.destinationPath,
+          currentEmailState: currentEmailState,
+          currentMailboxState: currentMailboxState));
       } else if (result.isEmpty) {
         yield Left(MoveMultipleEmailToMailboxAllFailure(moveRequest.moveAction, moveRequest.emailActionType));
       } else {
@@ -33,7 +45,9 @@ class MoveMultipleEmailToMailboxInteractor {
           moveRequest.destinationMailboxId,
           moveRequest.moveAction,
           moveRequest.emailActionType,
-          destinationPath: moveRequest.destinationPath));
+          destinationPath: moveRequest.destinationPath,
+          currentEmailState: currentEmailState,
+          currentMailboxState: currentMailboxState));
       }
     } catch (e) {
       yield Left(MoveMultipleEmailToMailboxFailure(e, moveRequest.emailActionType, moveRequest.moveAction));