Fix forward recipients error handling

lib/features/manage_account/data/datasource/forwarding_datasource.dart

@@ -1,5 +1,6 @@
 import 'package:forward/forward/tmail_forward.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/delete_recipient_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/edit_local_copy_in_forwarding_request.dart';
@@ -7,9 +8,18 @@ import 'package:tmail_ui_user/features/manage_account/domain/model/edit_local_co
 abstract class ForwardingDataSource {
   Future<TMailForward> getForward(AccountId accountId);
 
-  Future<TMailForward> deleteRecipientInForwarding(AccountId accountId, DeleteRecipientInForwardingRequest deleteRequest);
+  Future<(TMailForward, SetMethodException?)> deleteRecipientInForwarding(
+    AccountId accountId,
+    DeleteRecipientInForwardingRequest deleteRequest,
+  );
 
-  Future<TMailForward> addRecipientsInForwarding(AccountId accountId, AddRecipientInForwardingRequest addRequest);
+  Future<(TMailForward, SetMethodException?)> addRecipientsInForwarding(
+    AccountId accountId,
+    AddRecipientInForwardingRequest addRequest,
+  );
 
-  Future<TMailForward> editLocalCopyInForwarding(AccountId accountId, EditLocalCopyInForwardingRequest editRequest);
+  Future<(TMailForward, SetMethodException?)> editLocalCopyInForwarding(
+    AccountId accountId,
+    EditLocalCopyInForwardingRequest editRequest,
+  );
 }

lib/features/manage_account/data/datasource_impl/forwarding_data_source_impl.dart

@@ -1,5 +1,6 @@
 import 'package:forward/forward/tmail_forward.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
 import 'package:tmail_ui_user/features/manage_account/data/datasource/forwarding_datasource.dart';
 import 'package:tmail_ui_user/features/manage_account/data/network/forwarding_api.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
@@ -22,23 +23,41 @@ class ForwardingDataSourceImpl extends ForwardingDataSource {
   }
 
   @override
-  Future<TMailForward> deleteRecipientInForwarding(AccountId accountId, DeleteRecipientInForwardingRequest deleteRequest) {
+  Future<(TMailForward, SetMethodException?)> deleteRecipientInForwarding(
+    AccountId accountId,
+    DeleteRecipientInForwardingRequest deleteRequest,
+  ) {
     return Future.sync(() async {
-      return await _forwardingAPI.updateForward(accountId, deleteRequest.newTMailForward);
+      return await _forwardingAPI.updateForward(
+        accountId,
+        deleteRequest.newTMailForward,
+      );
     }).catchError(_exceptionThrower.throwException);
   }
 
   @override
-  Future<TMailForward> addRecipientsInForwarding(AccountId accountId, AddRecipientInForwardingRequest addRequest) {
+  Future<(TMailForward, SetMethodException?)> addRecipientsInForwarding(
+    AccountId accountId,
+    AddRecipientInForwardingRequest addRequest,
+  ) {
     return Future.sync(() async {
-      return await _forwardingAPI.updateForward(accountId, addRequest.newTMailForward);
+      return await _forwardingAPI.updateForward(
+        accountId,
+        addRequest.newTMailForward,
+      );
     }).catchError(_exceptionThrower.throwException);
   }
 
   @override
-  Future<TMailForward> editLocalCopyInForwarding(AccountId accountId, EditLocalCopyInForwardingRequest editRequest) {
+  Future<(TMailForward, SetMethodException?)> editLocalCopyInForwarding(
+    AccountId accountId,
+    EditLocalCopyInForwardingRequest editRequest,
+  ) {
     return Future.sync(() async {
-      return await _forwardingAPI.updateForward(accountId, editRequest.newTMailForward);
+      return await _forwardingAPI.updateForward(
+        accountId,
+        editRequest.newTMailForward,
+      );
     }).catchError(_exceptionThrower.throwException);
   }
 }

lib/features/manage_account/data/network/forwarding_api.dart

@@ -43,7 +43,10 @@ class ForwardingAPI with HandleSetErrorMixin {
     return tMailForwardResult;
   }
 
-  Future<TMailForward> updateForward(AccountId accountId, TMailForward forward) async {
+  Future<(TMailForward, SetMethodException?)> updateForward(
+    AccountId accountId,
+    TMailForward forward,
+  ) async {
     log('ForwardingAPI::updateForward: ${forward.toJson()}');
     final setForwardMethod = SetForwardMethod(accountId)
       ..addUpdatesSingleton({
@@ -69,14 +72,9 @@ class ForwardingAPI with HandleSetErrorMixin {
     );
 
     final mapErrors = handleSetResponse([setForwardResponse]);
-    if (mapErrors.isNotEmpty) {
+    final methodException = mapErrors.isNotEmpty
-      throw SetMethodException(mapErrors);
+      ? SetMethodException(mapErrors)
-    }
+      : null;
-
-    final updatedForward = setForwardResponse?.updated;
-    if (updatedForward?.isNotEmpty != true) {
-      throw UpdateForwardException();
-    }
 
     final getForwardResponse = response.parse<GetForwardResponse>(
       getForwardInvocation.methodCallId,
@@ -84,10 +82,10 @@ class ForwardingAPI with HandleSetErrorMixin {
     );
 
     final newForward = getForwardResponse?.list.firstOrNull;
-    if (newForward == null) {
+    if (newForward != null) {
-      throw NotFoundForwardException();
+      return (newForward, methodException);
     }
 
-    return newForward;
+    throw methodException ?? NotFoundForwardException();
   }
 }

lib/features/manage_account/data/repository/forwarding_repository_impl.dart

@@ -1,5 +1,6 @@
 import 'package:forward/forward/tmail_forward.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
 import 'package:tmail_ui_user/features/manage_account/data/datasource/forwarding_datasource.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/delete_recipient_in_forwarding_request.dart';
@@ -12,17 +13,26 @@ class ForwardingRepositoryImpl extends ForwardingRepository {
   ForwardingRepositoryImpl(this.dataSource);
 
   @override
-  Future<TMailForward> addRecipientsInForwarding(AccountId accountId, AddRecipientInForwardingRequest addRequest) {
+  Future<(TMailForward, SetMethodException?)> addRecipientsInForwarding(
+    AccountId accountId,
+    AddRecipientInForwardingRequest addRequest,
+  ) {
     return dataSource.addRecipientsInForwarding(accountId, addRequest);
   }
 
   @override
-  Future<TMailForward> deleteRecipientInForwarding(AccountId accountId, DeleteRecipientInForwardingRequest deleteRequest) {
+  Future<(TMailForward, SetMethodException?)> deleteRecipientInForwarding(
+    AccountId accountId,
+    DeleteRecipientInForwardingRequest deleteRequest,
+  ) {
     return dataSource.deleteRecipientInForwarding(accountId, deleteRequest);
   }
 
   @override
-  Future<TMailForward> editLocalCopyInForwarding(AccountId accountId, EditLocalCopyInForwardingRequest editRequest) {
+  Future<(TMailForward, SetMethodException?)> editLocalCopyInForwarding(
+    AccountId accountId,
+    EditLocalCopyInForwardingRequest editRequest,
+  ) {
     return dataSource.editLocalCopyInForwarding(accountId, editRequest);
   }
 

lib/features/manage_account/domain/repository/forwarding_repository.dart

@@ -1,5 +1,6 @@
 import 'package:forward/forward/tmail_forward.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
+import 'package:tmail_ui_user/features/composer/domain/exceptions/set_method_exception.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/add_recipients_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/delete_recipient_in_forwarding_request.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/model/edit_local_copy_in_forwarding_request.dart';
@@ -7,9 +8,18 @@ import 'package:tmail_ui_user/features/manage_account/domain/model/edit_local_co
 abstract class ForwardingRepository {
   Future<TMailForward> getForward(AccountId accountId);
 
-  Future<TMailForward> deleteRecipientInForwarding(AccountId accountId, DeleteRecipientInForwardingRequest deleteRequest);
+  Future<(TMailForward, SetMethodException?)> deleteRecipientInForwarding(
+    AccountId accountId,
+    DeleteRecipientInForwardingRequest deleteRequest,
+  );
 
-  Future<TMailForward> addRecipientsInForwarding(AccountId accountId, AddRecipientInForwardingRequest addRequest);
+  Future<(TMailForward, SetMethodException?)> addRecipientsInForwarding(
+    AccountId accountId,
+    AddRecipientInForwardingRequest addRequest,
+  );
 
-  Future<TMailForward> editLocalCopyInForwarding(AccountId accountId, EditLocalCopyInForwardingRequest editRequest);
+  Future<(TMailForward, SetMethodException?)> editLocalCopyInForwarding(
+    AccountId accountId,
+    EditLocalCopyInForwardingRequest editRequest,
+  );
 }

lib/features/manage_account/domain/state/add_recipient_in_forwarding_state.dart

@@ -1,6 +1,7 @@
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:forward/forward/tmail_forward.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/state/update_forwarding_state.dart';
 
 class AddRecipientsInForwardingSuccess extends UIState {
   final TMailForward forward;
@@ -11,6 +12,14 @@ class AddRecipientsInForwardingSuccess extends UIState {
   List<Object?> get props => [forward];
 }
 
+class AddRecipientsInForwardingSuccessWithSomeCaseFailure
+    extends UpdateForwardingCompleteWithSomeCaseFailure {
+  AddRecipientsInForwardingSuccessWithSomeCaseFailure(
+    super.forward,
+    super.exception,
+  );
+}
+
 class AddRecipientsInForwardingFailure extends FeatureFailure {
 
   AddRecipientsInForwardingFailure(dynamic exception) : super(exception: exception);

lib/features/manage_account/domain/state/delete_recipient_in_forwarding_state.dart

@@ -1,6 +1,7 @@
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:forward/forward/tmail_forward.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/state/update_forwarding_state.dart';
 
 class StartDeleteRecipientInForwarding extends UIState {}
 
@@ -13,6 +14,14 @@ class DeleteRecipientInForwardingSuccess extends UIState {
   List<Object?> get props => [forward];
 }
 
+class DeleteRecipientInForwardingSuccessWithSomeCaseFailure
+    extends UpdateForwardingCompleteWithSomeCaseFailure {
+  DeleteRecipientInForwardingSuccessWithSomeCaseFailure(
+    super.forward,
+    super.exception,
+  );
+}
+
 class DeleteRecipientInForwardingFailure extends FeatureFailure {
 
   DeleteRecipientInForwardingFailure(dynamic exception) : super(exception: exception);

lib/features/manage_account/domain/state/edit_local_copy_in_forwarding_state.dart

@@ -1,6 +1,7 @@
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:forward/forward/tmail_forward.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/state/update_forwarding_state.dart';
 
 class EditLocalCopyInForwardingSuccess extends UIState {
   final TMailForward forward;
@@ -11,6 +12,14 @@ class EditLocalCopyInForwardingSuccess extends UIState {
   List<Object?> get props => [forward];
 }
 
+class EditLocalCopyInForwardingSuccessWithSomeCaseFailure
+    extends UpdateForwardingCompleteWithSomeCaseFailure {
+  EditLocalCopyInForwardingSuccessWithSomeCaseFailure(
+    super.forward,
+    super.exception,
+  );
+}
+
 class EditLocalCopyInForwardingFailure extends FeatureFailure {
 
   EditLocalCopyInForwardingFailure(dynamic exception) : super(exception: exception);

lib/features/manage_account/domain/state/update_forwarding_state.dart

@@ -0,0 +1,12 @@
+import 'package:core/presentation/state/failure.dart';
+import 'package:forward/forward/tmail_forward.dart';
+
+class UpdateForwardingCompleteWithSomeCaseFailure extends FeatureFailure {
+  final TMailForward forward;
+
+  UpdateForwardingCompleteWithSomeCaseFailure(this.forward, dynamic exception)
+      : super(exception: exception);
+
+  @override
+  List<Object?> get props => [forward, ...super.props];
+}

lib/features/manage_account/domain/usecases/add_recipients_in_forwarding_interactor.dart

@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
@@ -19,8 +17,19 @@ class AddRecipientsInForwardingInteractor {
   ) async* {
     try {
       yield Right<Failure, Success>(LoadingState());
-      final result = await _forwardingRepository.addRecipientsInForwarding(accountId, addRequest);
+      final result = await _forwardingRepository.addRecipientsInForwarding(
-      yield Right<Failure, Success>(AddRecipientsInForwardingSuccess(result));
+        accountId,
+        addRequest,
+      );
+
+      if (result.$2 == null) {
+        yield Right(AddRecipientsInForwardingSuccess(result.$1));
+      } else {
+        yield Left(AddRecipientsInForwardingSuccessWithSomeCaseFailure(
+          result.$1,
+          result.$2!,
+        ));
+      }
     } catch (exception) {
       yield Left<Failure, Success>(AddRecipientsInForwardingFailure(exception));
     }

lib/features/manage_account/domain/usecases/delete_recipient_in_forwarding_interactor.dart

@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
@@ -20,9 +18,17 @@ class DeleteRecipientInForwardingInteractor {
     try {
       yield Right<Failure, Success>(StartDeleteRecipientInForwarding());
       final result = await _forwardingRepository.deleteRecipientInForwarding(
-          accountId,
+        accountId,
-          deleteRequest);
+        deleteRequest,
-      yield Right<Failure, Success>(DeleteRecipientInForwardingSuccess(result));
+      );
+      if (result.$2 == null) {
+        yield Right(DeleteRecipientInForwardingSuccess(result.$1));
+      } else {
+        yield Left(DeleteRecipientInForwardingSuccessWithSomeCaseFailure(
+          result.$1,
+          result.$2!,
+        ));
+      }
     } catch (exception) {
       yield Left<Failure, Success>(DeleteRecipientInForwardingFailure(exception));
     }

lib/features/manage_account/domain/usecases/edit_local_copy_in_forwarding_interactor.dart

@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
@@ -18,8 +16,19 @@ class EditLocalCopyInForwardingInteractor {
       EditLocalCopyInForwardingRequest editRequest,
   ) async* {
     try {
-      final result = await _forwardingRepository.editLocalCopyInForwarding(accountId, editRequest);
+      final result = await _forwardingRepository.editLocalCopyInForwarding(
-      yield Right<Failure, Success>(EditLocalCopyInForwardingSuccess(result));
+        accountId,
+        editRequest,
+      );
+
+      if (result.$2 == null) {
+        yield Right(EditLocalCopyInForwardingSuccess(result.$1));
+      } else {
+        yield Left(EditLocalCopyInForwardingSuccessWithSomeCaseFailure(
+          result.$1,
+          result.$2!,
+        ));
+      }
     } catch (exception) {
       yield Left<Failure, Success>(EditLocalCopyInForwardingFailure(exception));
     }

lib/features/manage_account/presentation/forward/extensions/handle_update_forward_extension.dart

@@ -1,14 +1,16 @@
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/utils/app_logger.dart';
+import 'package:model/mailbox/select_mode.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/state/add_recipient_in_forwarding_state.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/state/delete_recipient_in_forwarding_state.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/state/edit_local_copy_in_forwarding_state.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/state/update_forwarding_state.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/forward/forward_controller.dart';
 
-extension HandleErrorWhenUpdateForwardFailExtension on ForwardController {
+extension HandleUpdateForwardExtension on ForwardController {
   void handleErrorWhenUpdateForwardFail(Failure failure) {
     logError(
-      'HandleErrorWhenUpdateForwardFailExtension::handleErrorWhenUpdateForwardFail: $failure',
+      '$runtimeType::handleErrorWhenUpdateForwardFail: $failure',
     );
     if (failure is AddRecipientsInForwardingFailure) {
       _handleAddRecipientsInForwardingFailure(failure);
@@ -37,4 +39,20 @@ extension HandleErrorWhenUpdateForwardFailExtension on ForwardController {
   ) {
     toastManager.showMessageFailure(failure);
   }
+
+  void handleUpdateForwardingCompleteWithSomeCaseFailure(
+    UpdateForwardingCompleteWithSomeCaseFailure state,
+  ) {
+    log(
+      '$runtimeType::handleUpdateForwardingCompleteWithSomeCaseFailure: $state',
+    );
+    if (state is AddRecipientsInForwardingSuccessWithSomeCaseFailure) {
+      recipientController.clearAll();
+    } else if (state is DeleteRecipientInForwardingSuccessWithSomeCaseFailure) {
+      selectionMode.value = SelectMode.INACTIVE;
+    }
+    updateTMailForward(state.forward);
+
+    toastManager.showMessageFailure(state);
+  }
 }

lib/features/manage_account/presentation/forward/forward_controller.dart

@@ -22,6 +22,7 @@ import 'package:tmail_ui_user/features/manage_account/domain/state/add_recipient
 import 'package:tmail_ui_user/features/manage_account/domain/state/delete_recipient_in_forwarding_state.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/state/edit_local_copy_in_forwarding_state.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/state/get_forward_state.dart';
+import 'package:tmail_ui_user/features/manage_account/domain/state/update_forwarding_state.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/usecases/add_recipients_in_forwarding_interactor.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/usecases/delete_recipient_in_forwarding_interactor.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/usecases/edit_local_copy_in_forwarding_interactor.dart';
@@ -29,7 +30,7 @@ import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_forwar
 import 'package:tmail_ui_user/features/manage_account/presentation/action/dashboard_setting_action.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/extensions/tmail_forward_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/forward/controller/forward_recipient_controller.dart';
-import 'package:tmail_ui_user/features/manage_account/presentation/forward/extensions/handle_error_when_update_forward_fail_extension.dart';
+import 'package:tmail_ui_user/features/manage_account/presentation/forward/extensions/handle_update_forward_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/model/recipient_forward.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
@@ -88,9 +89,7 @@ class ForwardController extends BaseController {
   @override
   void handleSuccessViewState(Success success) {
     if (success is GetForwardSuccess) {
-      currentForward.value = success.forward;
+      updateTMailForward(success.forward);
-      listRecipientForward.value = currentForward.value!.listRecipientForward;
-      _updateForwardWarningBannerState();
     } else if (success is DeleteRecipientInForwardingSuccess) {
       _handleDeleteRecipientSuccess(success);
     } else if (success is AddRecipientsInForwardingSuccess) {
@@ -108,6 +107,8 @@ class ForwardController extends BaseController {
         failure is DeleteRecipientInForwardingFailure ||
         failure is EditLocalCopyInForwardingFailure) {
       handleErrorWhenUpdateForwardFail(failure);
+    } else if (failure is UpdateForwardingCompleteWithSomeCaseFailure) {
+      handleUpdateForwardingCompleteWithSomeCaseFailure(failure);
     } else {
       super.handleFailureViewState(failure);
     }
@@ -119,6 +120,12 @@ class ForwardController extends BaseController {
     }
   }
 
+  void updateTMailForward(TMailForward forward) {
+    currentForward.value = forward;
+    listRecipientForward.value = forward.listRecipientForward;
+    _updateForwardWarningBannerState();
+  }
+
   void deleteRecipients(BuildContext context, String emailAddress) {
     clearInputFocus();
 
@@ -154,11 +161,8 @@ class ForwardController extends BaseController {
         currentOverlayContext!,
         AppLocalizations.of(currentContext!).toastMessageDeleteRecipientSuccessfully);
     }
-
-    currentForward.value = success.forward;
-    listRecipientForward.value = currentForward.value!.listRecipientForward;
     selectionMode.value = SelectMode.INACTIVE;
-    _updateForwardWarningBannerState();
+    updateTMailForward(success.forward);
   }
 
   List<RecipientForward> get listRecipientForwardSelected =>
@@ -260,13 +264,8 @@ class ForwardController extends BaseController {
         currentOverlayContext!,
         AppLocalizations.of(currentContext!).toastMessageAddRecipientsSuccessfully);
     }
-
-    currentForward.value = success.forward;
-    listRecipientForward.value = currentForward.value!.listRecipientForward;
-
     recipientController.clearAll();
-
+    updateTMailForward(success.forward);
-    _updateForwardWarningBannerState();
   }
 
   void handleEditLocalCopy() {
@@ -292,11 +291,7 @@ class ForwardController extends BaseController {
           ? AppLocalizations.of(currentContext!).toastMessageLocalCopyEnable
           : AppLocalizations.of(currentContext!).toastMessageLocalCopyDisable);
     }
-
+    updateTMailForward(success.forward);
-    currentForward.value = success.forward;
-    listRecipientForward.value = currentForward.value!.listRecipientForward;
-
-    _updateForwardWarningBannerState();
   }
 
   void registerListenerWorker() {

lib/main/utils/toast_manager.dart

@@ -169,12 +169,15 @@ class ToastManager {
           message ?? AppLocalizations.of(context).previewEmailFromEMLFileFailed;
     } else if (failure is ExportTraceLogFailure) {
       message = message ?? AppLocalizations.of(context).exportTraceLogFailed;
-    } else if (failure is AddRecipientsInForwardingFailure) {
+    } else if (failure is AddRecipientsInForwardingFailure ||
+        failure is AddRecipientsInForwardingSuccessWithSomeCaseFailure) {
       message = message ?? AppLocalizations.of(context).addRecipientsFailed;
-    } else if (failure is EditLocalCopyInForwardingFailure) {
+    } else if (failure is EditLocalCopyInForwardingFailure ||
+        failure is EditLocalCopyInForwardingSuccessWithSomeCaseFailure) {
       message =
           message ?? AppLocalizations.of(context).editLocalCopyInForwardFailed;
-    } else if (failure is DeleteRecipientInForwardingFailure) {
+    } else if (failure is DeleteRecipientInForwardingFailure ||
+        failure is DeleteRecipientInForwardingSuccessWithSomeCaseFailure) {
       message = message ?? AppLocalizations.of(context).deleteRecipientsFailed;
     } else if (failure is CreateNewRuleFilterFailure) {
       message = message ?? AppLocalizations.of(context).createFilterRuleFailed;