TF-1613 Implement handleSuccessViewState and handleFailureViewState for all controller

(cherry picked from commit 35e727e795bb3c44cc9c47e02542b5bdc3955fdd)

core/lib/presentation/utils/html_transformer/dom/add_tooltip_link_transformers.dart

@@ -30,7 +30,11 @@ class AddTooltipLinkTransformer extends DomTransformer {
     if (children.isEmpty && text.isNotEmpty && url != null) {
       final innerHtml = element.innerHtml;
       final tagClass = element.attributes['class'];
+      if (tagClass != null) {
         element.attributes['class'] = '$tagClass $nameClassToolTip';
+      } else {
+        element.attributes['class'] = nameClassToolTip;
+      }
       element.innerHtml = innerHtml + textHasToolTip(url);
     }
   }

core/lib/presentation/utils/html_transformer/dom/image_transformers.dart

@@ -23,11 +23,16 @@ class ImageTransformer extends DomTransformer {
     final imageElements = document.querySelectorAll('img[src^="cid:"]');
     log('ImageTransformer::process(): imageElements: ${imageElements.length}');
     await Future.wait(imageElements.map((imageElement) async {
-      final _exStyle = imageElement.attributes['style'];
+      final exStyle = imageElement.attributes['style'];
-      imageElement.attributes['style'] = '$_exStyle display: inline;max-width: 100%;';
+      if (exStyle != null) {
+        imageElement.attributes['style'] = '$exStyle display: inline;max-width: 100%;';
+      } else {
+        imageElement.attributes['style'] = 'display: inline;max-width: 100%;';
+      }
       final src = imageElement.attributes['src'];
+      if (src != null) {
         log('ImageTransformer::process(): src: $src');
-      final cid = src?.replaceFirst('cid:', '').trim();
+        final cid = src.replaceFirst('cid:', '').trim();
         final urlDownloadCid = mapUrlDownloadCID?[cid];
         log('ImageTransformer::process(): urlDownloadCid: $urlDownloadCid');
         if (urlDownloadCid?.isNotEmpty == true && dioClient != null) {
@@ -39,6 +44,7 @@ class ImageTransformer extends DomTransformer {
             imageElement.attributes['src'] = imgBase64Uri;
           }
         }
+      }
     }));
   }
 

lib/features/base/base_controller.dart

@@ -96,6 +96,7 @@ abstract class BaseController extends GetxController
     viewState.value.fold(
       (failure) {
         if (_handleCommonException(failure)) {
+          handleFinallyCommonException();
           return;
         }
         handleFailureViewState(failure);
@@ -113,6 +114,7 @@ abstract class BaseController extends GetxController
   void onError(Object error, StackTrace stackTrace) {
     logError('BaseController::onError():error: $error | stackTrace: $stackTrace');
     if (_handleCommonError(error)) {
+      handleFinallyCommonException();
       return;
     }
     handleErrorViewState(error, stackTrace);
@@ -142,7 +144,6 @@ abstract class BaseController extends GetxController
           currentOverlayContext!,
           AppLocalizations.of(currentContext!).badCredentials);
       }
-
       checkAuthenticationTypeWhenLogout();
       return true;
     }
@@ -152,6 +153,10 @@ abstract class BaseController extends GetxController
 
   void handleErrorViewState(Object error, StackTrace stackTrace) {}
 
+  void handleFinallyCommonException() {
+    clearState();
+  }
+
   void handleFailureViewState(Failure failure) {
     logError('BaseController::handleFailureViewState(): $failure');
     if (failure is LogoutOidcFailure) {
@@ -249,27 +254,18 @@ abstract class BaseController extends GetxController
     }
   }
 
-  bool fcmEnabled(Session? session, AccountId? accountId) {
+  bool _isFcmActivated(Session session, AccountId accountId) =>
-    bool fcmEnabled = false;
+    [FirebaseCapability.fcmIdentifier].isSupported(session, accountId) && AppConfig.fcmAvailable;
-    try {
-      requireCapability(session!, accountId!, [FirebaseCapability.fcmIdentifier]);
-      if (AppConfig.fcmAvailable) {
-        fcmEnabled = true;
-      } else {
-        fcmEnabled = false;
-      }
-    } catch (e) {
-      logError('BaseController::fcmEnabled(): exception: $e');
-    }
-    return fcmEnabled;
-  }
 
   void goToLogin({LoginArguments? arguments}) {
     pushAndPopAll(AppRoutes.login, arguments: arguments);
   }
 
   void logout(Session? session, AccountId? accountId) {
-    _isFcmEnabled = fcmEnabled(session, accountId);
+    if (session == null || accountId == null) {
+      return;
+    }
+    _isFcmEnabled = _isFcmActivated(session, accountId);
     final authenticationType = authorizationInterceptors.authenticationType;
     if (authenticationType == AuthenticationType.oidc) {
       consumeState(logoutOidcInteractor.execute());

lib/features/base/base_mailbox_controller.dart

@@ -112,9 +112,9 @@ abstract class BaseMailboxController extends BaseController {
     if (personalMailboxTree.value.updateExpandedNode(selectedMailboxNode, newExpandMode) != null) {
       log('toggleMailboxFolder() refresh folderMailboxTree');
       personalMailboxTree.refresh();
-      final _childrenItems = personalMailboxTree.value.root.childrenItems ?? [];
+      final childrenItems = personalMailboxTree.value.root.childrenItems ?? [];
       _triggerScrollWhenExpandMailboxFolder(
-        _childrenItems,
+        childrenItems,
         selectedMailboxNode,
         scrollController);
     }
@@ -122,9 +122,9 @@ abstract class BaseMailboxController extends BaseController {
     if (teamMailboxesTree.value.updateExpandedNode(selectedMailboxNode, newExpandMode) != null) {
       log('toggleMailboxFolder() refresh teamMailboxesTree');
       teamMailboxesTree.refresh();
-      final _childrenItems = teamMailboxesTree.value.root.childrenItems ?? [];
+      final childrenItems = teamMailboxesTree.value.root.childrenItems ?? [];
       _triggerScrollWhenExpandMailboxFolder(
-          _childrenItems,
+          childrenItems,
           selectedMailboxNode,
           scrollController);
     }
@@ -135,13 +135,13 @@ abstract class BaseMailboxController extends BaseController {
       MailboxNode selectedMailboxNode,
       ScrollController scrollController) async {
     await Future.delayed(const Duration(milliseconds: 200));
-    final _lastItem = childrenItems.last;
+    final lastItem = childrenItems.last;
 
     if (selectedMailboxNode.expandMode == ExpandMode.COLLAPSE) {
       return;
     }
 
-    if (_lastItem.mailboxNameAsString.contains(selectedMailboxNode.mailboxNameAsString)) {
+    if (lastItem.mailboxNameAsString.contains(selectedMailboxNode.mailboxNameAsString)) {
       scrollController.animateTo(
           scrollController.position.maxScrollExtent,
           duration: const Duration(milliseconds: 200),

lib/features/base/reloadable/reloadable_controller.dart

@@ -3,7 +3,6 @@ import 'package:core/presentation/extensions/uri_extension.dart';
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
-import 'package:dartz/dartz.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';
@@ -35,10 +34,8 @@ abstract class ReloadableController extends BaseController {
   );
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleFailureViewState(Failure failure) {
-    super.onData(newState);
+    super.handleFailureViewState(failure);
-    viewState.value.fold(
-      (failure) {
     if (failure is GetCredentialFailure) {
       goToLogin(arguments: LoginArguments(LoginFormType.credentialForm));
     } else if (failure is GetSessionFailure) {
@@ -48,8 +45,11 @@ abstract class ReloadableController extends BaseController {
     } else if (failure is GetAuthenticatedAccountFailure || failure is NoAuthenticatedAccountFailure) {
       goToLogin(arguments: LoginArguments(LoginFormType.credentialForm));
     }
-      },
+  }
-      (success) {
+
+  @override
+  void handleSuccessViewState(Success success) {
+    super.handleSuccessViewState(success);
     if (success is GetCredentialViewState) {
       _handleGetCredentialSuccess(success);
     } else if (success is GetSessionSuccess) {
@@ -58,8 +58,6 @@ abstract class ReloadableController extends BaseController {
       _handleGetStoredTokenOIDCSuccess(success);
     }
   }
-    );
-  }
 
   /*
   * trigger reload by getting Credential again then setting up Interceptor and retrieving session
@@ -91,7 +89,7 @@ abstract class ReloadableController extends BaseController {
   }
 
   void _getSessionAction() {
-    consumeState(_getSessionInteractor.execute().asStream());
+    consumeState(_getSessionInteractor.execute());
   }
 
   void _handleGetSessionFailure() async {

lib/features/composer/presentation/composer_controller.dart

@@ -266,34 +266,18 @@ class ComposerController extends BaseController {
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleSuccessViewState(Success success) {
-    super.onData(newState);
+    super.handleSuccessViewState(success);
-    newState.map((success) async {
     if (success is GetEmailContentLoading) {
       emailContentsViewState.value = Right(success);
-      }
+    } else if (success is LocalFilePickerSuccess) {
-    });
-  }
-
-  @override
-  void onDone() {
-    viewState.value.fold(
-      (failure) {
-        if (failure is LocalFilePickerFailure || failure is LocalFilePickerCancel) {
-          _pickFileFailure(failure);
-        } else if (failure is GetEmailContentFailure) {
-          emailContentsViewState.value = Left(failure);
-        }
-      },
-      (success) {
-        if (success is LocalFilePickerSuccess) {
       _pickFileSuccess(success);
     } else if (success is GetEmailContentSuccess) {
       _getEmailContentSuccess(success);
     } else if (success is GetAllIdentitiesSuccess) {
       _handleGetAllIdentitiesSuccess(success);
     } else if (success is DownloadImageAsBase64Success) {
-          if(kIsWeb) {
+      if (BuildUtils.isWeb) {
         richTextWebController.insertImage(
           InlineImage(
             ImageSource.local,
@@ -310,7 +294,16 @@ class ComposerController extends BaseController {
       }
       maxWithEditor = null;
     }
-      });
+  }
+
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is LocalFilePickerFailure || failure is LocalFilePickerCancel) {
+      _pickFileFailure(failure);
+    } else if (failure is GetEmailContentFailure) {
+      emailContentsViewState.value = Left(failure);
+    }
   }
 
   void _listenWorker() {

lib/features/contact/presentation/contact_controller.dart

@@ -190,7 +190,4 @@ class ContactController extends BaseController {
       popBack();
     }
   }
-
-  @override
-  void onDone() {}
 }

lib/features/destination_picker/presentation/destination_picker_controller.dart

@@ -3,7 +3,6 @@ import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/utils/build_utils.dart';
-import 'package:dartz/dartz.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
@@ -112,42 +111,33 @@ class DestinationPickerController extends BaseMailboxController {
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleSuccessViewState(Success success) {
-    super.onData(newState);
+    super.handleSuccessViewState(success);
-    newState.map((success) {
     if (success is GetAllMailboxSuccess) {
       if (mailboxAction.value == MailboxActions.move && mailboxIdSelected != null) {
         buildTree(
           success.mailboxList.listSubscribedMailboxesAndDefaultMailboxes,
-            mailboxIdSelected: mailboxIdSelected
+          mailboxIdSelected: mailboxIdSelected);
-          );
       } else {
         buildTree(success.mailboxList.listSubscribedMailboxesAndDefaultMailboxes);
       }
     } else if (success is RefreshChangesAllMailboxSuccess) {
       refreshTree(success.mailboxList.listSubscribedMailboxesAndDefaultMailboxes);
-      }
+    } else if (success is SearchMailboxSuccess) {
-    });
-  }
-
-  @override
-  void onDone() {
-    viewState.value.fold(
-        (failure) {
-          if (failure is SearchMailboxFailure) {
-            _searchMailboxFailure(failure);
-          } else if (failure is CreateNewMailboxFailure) {
-            _createNewMailboxFailure(failure);
-          }
-        },
-        (success) {
-          if (success is SearchMailboxSuccess) {
       _searchMailboxSuccess(success);
     } else if (success is CreateNewMailboxSuccess) {
       _createNewMailboxSuccess(success);
     }
   }
-    );
+
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is SearchMailboxFailure) {
+      _searchMailboxFailure(failure);
+    } else if (failure is CreateNewMailboxFailure) {
+      _createNewMailboxFailure(failure);
+    }
   }
 
   @override

lib/features/email/presentation/controller/single_email_controller.dart

@@ -138,6 +138,44 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
     super.onClose();
   }
 
+  @override
+  void handleSuccessViewState(Success success) {
+    super.handleSuccessViewState(success);
+    if (success is GetEmailContentSuccess) {
+      _getEmailContentSuccess(success);
+    } else if (success is MarkAsEmailReadSuccess) {
+      _markAsEmailReadSuccess(success);
+    } else if (success is ExportAttachmentSuccess) {
+      _exportAttachmentSuccessAction(success);
+    } else if (success is MoveToMailboxSuccess) {
+      _moveToMailboxSuccess(success);
+    } else if (success is MarkAsStarEmailSuccess) {
+      _markAsEmailStarSuccess(success);
+    } else if (success is DownloadAttachmentForWebSuccess) {
+      _downloadAttachmentForWebSuccessAction(success);
+    } else if (success is GetAllIdentitiesSuccess) {
+      _getAllIdentitiesSuccess(success);
+    } else if (success is SendReceiptToSenderSuccess) {
+      _sendReceiptToSenderSuccess(success);
+    } else if (success is CreateNewRuleFilterSuccess) {
+      _createNewRuleFilterSuccess(success);
+    }
+  }
+
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is MarkAsEmailReadFailure) {
+      _markAsEmailReadFailure(failure);
+    } else if (failure is DownloadAttachmentsFailure) {
+      _downloadAttachmentsFailure(failure);
+    } else if (failure is ExportAttachmentFailure) {
+      _exportAttachmentFailureAction(failure);
+    } else if (failure is DownloadAttachmentForWebFailure) {
+      _downloadAttachmentForWebFailureAction(failure);
+    }
+  }
+
   void _registerObxStreamListener() {
     ever(mailboxDashBoardController.accountId, (accountId) {
       if (accountId is AccountId) {
@@ -311,43 +349,6 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
     }
   }
 
-  @override
-  void onDone() {
-    viewState.value.fold(
-      (failure) {
-        if (failure is MarkAsEmailReadFailure) {
-          _markAsEmailReadFailure(failure);
-        } else if (failure is DownloadAttachmentsFailure) {
-          _downloadAttachmentsFailure(failure);
-        } else if (failure is ExportAttachmentFailure) {
-          _exportAttachmentFailureAction(failure);
-        } else if (failure is DownloadAttachmentForWebFailure) {
-          _downloadAttachmentForWebFailureAction(failure);
-        }
-      },
-      (success) {
-        if (success is GetEmailContentSuccess) {
-          _getEmailContentSuccess(success);
-        } else if (success is MarkAsEmailReadSuccess) {
-          _markAsEmailReadSuccess(success);
-        } else if (success is ExportAttachmentSuccess) {
-          _exportAttachmentSuccessAction(success);
-        } else if (success is MoveToMailboxSuccess) {
-          _moveToMailboxSuccess(success);
-        } else if (success is MarkAsStarEmailSuccess) {
-          _markAsEmailStarSuccess(success);
-        } else if (success is DownloadAttachmentForWebSuccess) {
-          _downloadAttachmentForWebSuccessAction(success);
-        } else if (success is GetAllIdentitiesSuccess) {
-          _getAllIdentitiesSuccess(success);
-        } else if (success is SendReceiptToSenderSuccess) {
-          _sendReceiptToSenderSuccess(success);
-        } else if (success is CreateNewRuleFilterSuccess) {
-          _createNewRuleFilterSuccess(success);
-        }
-      });
-  }
-
   void _getEmailContentSuccess(GetEmailContentSuccess success) {
     if(emailSupervisorController.presentationEmailsLoaded.length > ThreadConstants.defaultLimit.value.toInt()) {
       emailSupervisorController.popFirstEmailQueue();

lib/features/home/presentation/home_bindings.dart

@@ -48,7 +48,6 @@ class HomeBindings extends BaseBindings {
         Get.find<CleanupRecentSearchCacheInteractor>(),
         Get.find<CleanupRecentLoginUrlCacheInteractor>(),
         Get.find<CleanupRecentLoginUsernameCacheInteractor>(),
-        Get.find<CheckOIDCIsAvailableInteractor>(),
     ));
   }
 

lib/features/home/presentation/home_controller.dart

@@ -1,5 +1,4 @@
 import 'package:core/core.dart';
-import 'package:dartz/dartz.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_downloader/flutter_downloader.dart';
 import 'package:get/get.dart';
@@ -17,16 +16,14 @@ import 'package:tmail_ui_user/features/cleanup/domain/usecases/cleanup_email_cac
 import 'package:tmail_ui_user/features/cleanup/domain/usecases/cleanup_recent_login_url_cache_interactor.dart';
 import 'package:tmail_ui_user/features/cleanup/domain/usecases/cleanup_recent_login_username_interactor.dart';
 import 'package:tmail_ui_user/features/cleanup/domain/usecases/cleanup_recent_search_cache_interactor.dart';
-import 'package:tmail_ui_user/features/login/domain/state/check_oidc_is_available_state.dart';
+import 'package:tmail_ui_user/features/login/domain/state/get_authenticated_account_state.dart';
 import 'package:tmail_ui_user/features/login/domain/state/get_credential_state.dart';
 import 'package:tmail_ui_user/features/login/domain/state/get_stored_token_oidc_state.dart';
-import 'package:tmail_ui_user/features/login/domain/usecases/check_oidc_is_available_interactor.dart';
 import 'package:tmail_ui_user/features/login/domain/usecases/get_authenticated_account_interactor.dart';
 import 'package:tmail_ui_user/features/login/presentation/login_form_type.dart';
 import 'package:tmail_ui_user/features/login/presentation/model/login_arguments.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
-import 'package:tmail_ui_user/main/utils/app_config.dart';
 import 'package:tmail_ui_user/main/utils/email_receive_manager.dart';
 
 class HomeController extends BaseController {
@@ -37,7 +34,6 @@ class HomeController extends BaseController {
   final CleanupRecentSearchCacheInteractor _cleanupRecentSearchCacheInteractor;
   final CleanupRecentLoginUrlCacheInteractor _cleanupRecentLoginUrlCacheInteractor;
   final CleanupRecentLoginUsernameCacheInteractor _cleanupRecentLoginUsernameCacheInteractor;
-  final CheckOIDCIsAvailableInteractor _checkOIDCIsAvailableInteractor;
 
   HomeController(
     this._getAuthenticatedAccountInteractor,
@@ -47,14 +43,12 @@ class HomeController extends BaseController {
     this._cleanupRecentSearchCacheInteractor,
     this._cleanupRecentLoginUrlCacheInteractor,
     this._cleanupRecentLoginUsernameCacheInteractor,
-    this._checkOIDCIsAvailableInteractor,
   );
 
   Account? currentAccount;
 
   @override
   void onInit() {
-    log('HomeController::onInit(): ');
     if (!kIsWeb) {
       _initFlutterDownloader();
       _registerReceivingSharingIntent();
@@ -120,65 +114,23 @@ class HomeController extends BaseController {
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleFailureViewState(Failure failure) async {
-    super.onData(newState);
+    super.handleFailureViewState(failure);
-    newState.fold(_handleFailureViewState, _handleSuccessViewState);
+    if (failure is NoAuthenticatedAccountFailure ||
-  }
+        failure is GetAuthenticatedAccountFailure ||
-
+        failure is GetStoredTokenOidcFailure ||
-  @override
+        failure is GetCredentialFailure) {
-  void onDone() {}
-
-  @override
-  void onError(error) {
-    _clearAllCacheAndCredential();
-  }
-
-  void _handleFailureViewState(Failure failure) async {
-    logError('HomeController::_handleFailureViewState(): ${failure.toString()}');
-    if (failure is CheckOIDCIsAvailableFailure) {
       _goToLogin(arguments: LoginArguments(LoginFormType.credentialForm));
-    } else {
-      _clearAllCacheAndCredential();
     }
   }
 
-  void _handleSuccessViewState(Success success) {
+  @override
-    log('HomeController::_handleSuccessViewState(): $success');
+  void handleSuccessViewState(Success success) {
+    super.handleSuccessViewState(success);
     if (success is GetStoredTokenOidcSuccess) {
       _goToSessionWithTokenOidc(success);
     } else if (success is GetCredentialViewState) {
       _goToSessionWithBasicAuth(success);
-    } else if (success is CheckOIDCIsAvailableSuccess) {
-      _goToLogin(arguments: LoginArguments(LoginFormType.ssoForm));
-    }
-  }
-
-  void _clearAllCacheAndCredential() async {
-    await Future.wait([
-      deleteCredentialInteractor.execute(),
-      deleteAuthorityOidcInteractor.execute(),
-      cachingManager.clearAll()
-    ]).then((value) {
-      if (BuildUtils.isWeb) {
-        _checkOIDCIsAvailable();
-      } else {
-        _goToLogin();
-      }
-    });
-  }
-
-  Uri? _parseUri(String? url) => url != null && url.trim().isNotEmpty
-      ? Uri.parse(url.trim())
-      : null;
-
-  void _checkOIDCIsAvailable() async {
-    final baseUri = _parseUri(AppConfig.baseUrl);
-    if (baseUri != null) {
-      consumeState(_checkOIDCIsAvailableInteractor.execute(OIDCRequest(
-          baseUrl: baseUri.toString(),
-          resourceUrl: baseUri.origin)));
-    } else {
-      _goToLogin(arguments: LoginArguments(LoginFormType.credentialForm));
     }
   }
 

lib/features/identity_creator/presentation/identity_creator_controller.dart

@@ -1,4 +1,6 @@
 
+import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/build_utils.dart';
 import 'package:flutter/cupertino.dart';
@@ -137,19 +139,19 @@ class IdentityCreatorController extends BaseController {
   }
 
   @override
-  void onDone() {
+  void handleSuccessViewState(Success success) {
-    viewState.value.fold(
+    super.handleSuccessViewState(success);
-        (failure) {
-          if (failure is GetAllIdentitiesFailure) {
-            _getALlIdentitiesFailure(failure);
-          }
-        },
-        (success) {
     if (success is GetAllIdentitiesSuccess) {
       _getALlIdentitiesSuccess(success);
     }
   }
-    );
+
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is GetAllIdentitiesFailure) {
+      _getALlIdentitiesFailure(failure);
+    }
   }
 
   void _checkDefaultIdentityIsSupported() {

lib/features/login/presentation/base_login_view.dart

@@ -74,27 +74,21 @@ abstract class BaseLoginView extends GetWidget<LoginController> {
     return Container(
       margin:  const EdgeInsets.only(bottom: 16, left: 24, right: 24),
       width: responsiveUtils.getDeviceWidth(context),height: 48,
-        child: AbsorbPointer(
-          absorbing: !controller.networkConnectionController.isNetworkConnectionAvailable(),
       child: ElevatedButton(
         key: const Key('loginSubmitForm'),
         style: ButtonStyle(
           foregroundColor: MaterialStateProperty.resolveWith<Color>((Set<MaterialState> states) => Colors.white),
-                  backgroundColor: MaterialStateProperty.resolveWith<Color>(
+          backgroundColor: MaterialStateProperty.resolveWith<Color>((Set<MaterialState> states) => AppColor.primaryColor),
-                      (Set<MaterialState> states) => AppColor.primaryColor.withOpacity(
-                          controller.networkConnectionController.isNetworkConnectionAvailable() ? 1 : 0.5)),
           shape: MaterialStateProperty.all(RoundedRectangleBorder(
             borderRadius: BorderRadius.circular(10),
             side: const BorderSide(width: 0, color: AppColor.primaryColor)
           ))
         ),
-              child: Text(AppLocalizations.of(context).signIn,
+        onPressed: loginController.handleLoginPressed,
+        child: Text(
+          AppLocalizations.of(context).signIn,
           style: const TextStyle(fontSize: 16, color: Colors.white)
-              ),
+        )
-              onPressed: () {
-                loginController.handleLoginPressed();
-              }
-          ),
       )
     );
   }

lib/features/login/presentation/login_controller.dart

@@ -48,7 +48,6 @@ import 'package:tmail_ui_user/features/login/presentation/login_form_type.dart';
 import 'package:tmail_ui_user/features/login/presentation/model/login_arguments.dart';
 import 'package:tmail_ui_user/features/login/presentation/state/login_state.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/usecases/log_out_oidc_interactor.dart';
-import 'package:tmail_ui_user/features/network_status_handle/presentation/network_connnection_controller.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/navigation_router.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
@@ -74,7 +73,6 @@ class LoginController extends ReloadableController {
 
   final TextEditingController urlInputController = TextEditingController();
   final TextEditingController usernameInputController = TextEditingController();
-  final NetworkConnectionController networkConnectionController = Get.find<NetworkConnectionController>();
 
   LoginController(
     LogoutOidcInteractor logoutOidcInteractor,
@@ -140,10 +138,8 @@ class LoginController extends ReloadableController {
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleFailureViewState(Failure failure) {
-    super.onData(newState);
+    super.handleFailureViewState(failure);
-    viewState.value.fold(
-      (failure) {
     if (failure is GetAuthenticationInfoFailure) {
       getAuthenticatedAccountAction();
     } else if (failure is CheckOIDCIsAvailableFailure ||
@@ -159,8 +155,11 @@ class LoginController extends ReloadableController {
         failure is AuthenticateOidcOnBrowserFailure) {
       loginState.value = LoginState(Left(failure));
     }
-      },
+  }
-      (success) {
+
+  @override
+  void handleSuccessViewState(Success success) {
+    super.handleSuccessViewState(success);
     if (success is GetAuthenticationInfoSuccess) {
       _getStoredOidcConfiguration();
     } else if (success is GetStoredOidcConfigurationSuccess) {
@@ -187,7 +186,11 @@ class LoginController extends ReloadableController {
       loginState.value = LoginState(Right(LoginLoadingAction()));
     }
   }
-    );
+
+  @override
+  void handleFinallyCommonException() {
+    super.handleFinallyCommonException();
+    loginState.value = LoginState(Right(LoginInitAction()));
   }
 
   @override
@@ -404,7 +407,4 @@ class LoginController extends ReloadableController {
     urlInputController.clear();
     super.onClose();
   }
-
-  @override
-  void onDone() {}
 }

lib/features/login/presentation/login_view.dart

@@ -178,15 +178,12 @@ class LoginView extends BaseLoginView {
     return Container(
       margin:  const EdgeInsets.only(bottom: 16, left: 24, right: 24),
       width: responsiveUtils.getDeviceWidth(context),height: 48,
-      child: AbsorbPointer(
-        absorbing: !controller.networkConnectionController.isNetworkConnectionAvailable(),
       child: ElevatedButton(
         key: const Key('nextToCredentialForm'),
         style: ButtonStyle(
           foregroundColor: MaterialStateProperty.resolveWith<Color>((Set<MaterialState> states) => Colors.white),
           backgroundColor: MaterialStateProperty.resolveWith<Color>(
-              (Set<MaterialState> states) => AppColor.primaryColor.withOpacity(
+            (Set<MaterialState> states) => AppColor.primaryColor),
-                  controller.networkConnectionController.isNetworkConnectionAvailable() ? 1 : 0.5)),
           shape: MaterialStateProperty.all(RoundedRectangleBorder(
             borderRadius: BorderRadius.circular(10),
             side: const BorderSide(width: 0, color: AppColor.primaryColor)
@@ -198,7 +195,6 @@ class LoginView extends BaseLoginView {
         onPressed: () {
           loginController.handleNextInUrlInputFormPress();
         }
-        ),
       )
     );
   }

lib/features/login/presentation/login_view_web.dart

@@ -276,15 +276,12 @@ class LoginView extends BaseLoginView {
     return Container(
         margin:  const EdgeInsets.only(bottom: 16, left: 24, right: 24),
         width: responsiveUtils.getDeviceWidth(context),height: 48,
-        child: AbsorbPointer(
-          absorbing: !controller.networkConnectionController.isNetworkConnectionAvailable(),
         child: ElevatedButton(
             key: const Key('ssoSubmitForm'),
             style: ButtonStyle(
                 foregroundColor: MaterialStateProperty.resolveWith<Color>((Set<MaterialState> states) => Colors.white),
                 backgroundColor: MaterialStateProperty.resolveWith<Color>(
-                    (Set<MaterialState> states) => AppColor.primaryColor.withOpacity(
+                  (Set<MaterialState> states) => AppColor.primaryColor),
-                        controller.networkConnectionController.isNetworkConnectionAvailable() ? 1 : 0.5)),
                 shape: MaterialStateProperty.all(RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(10),
                     side: const BorderSide(width: 0, color: AppColor.primaryColor)
@@ -296,7 +293,6 @@ class LoginView extends BaseLoginView {
             onPressed: () {
               loginController.handleSSOPressed();
             }
-          ),
         )
     );
   }

lib/features/mailbox/presentation/mailbox_controller.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:core/core.dart';
-import 'package:dartz/dartz.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -146,34 +145,12 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleSuccessViewState(Success success) {
-    super.onData(newState);
+    super.handleSuccessViewState(success);
-    newState.map((success) async {
     if (success is GetAllMailboxSuccess) {
       _handleGetAllMailboxSuccess(success);
     } else if (success is RefreshChangesAllMailboxSuccess) {
       _handleRefreshChangesAllMailboxSuccess(success);
-      }
-    });
-  }
-
-  @override
-  void onDone() {
-    viewState.value.fold(
-      (failure) {
-        if (failure is CreateNewMailboxFailure) {
-          _createNewMailboxFailure(failure);
-        } else if (failure is DeleteMultipleMailboxFailure) {
-          _deleteMailboxFailure(failure);
-        }
-      },
-      (success) async {
-        if (success is GetAllMailboxSuccess) {
-          _initialMailboxVariableStorage();
-          mailboxDashBoardController.getSpamReportBanner();
-        } else if (success is RefreshChangesAllMailboxSuccess) {
-          _initialMailboxVariableStorage(isRefreshChange: true);
-          mailboxDashBoardController.refreshSpamReportBanner();
     } else if (success is CreateNewMailboxSuccess) {
       _createNewMailboxSuccess(success);
     } else if (success is DeleteMultipleMailboxAllSuccess) {
@@ -192,7 +169,29 @@ class MailboxController extends BaseMailboxController with MailboxActionHandlerM
       _handleUnsubscribeMultipleMailboxHasSomeSuccess(success);
     }
   }
-    );
+
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is CreateNewMailboxFailure) {
+      _createNewMailboxFailure(failure);
+    } else if (failure is DeleteMultipleMailboxFailure) {
+      _deleteMailboxFailure(failure);
+    }
+  }
+
+  @override
+  void onDone() {
+    super.onDone();
+    viewState.value.fold((failure) => null, (success) {
+      if (success is GetAllMailboxSuccess) {
+        _initialMailboxVariableStorage();
+        mailboxDashBoardController.getSpamReportBanner();
+      } else if (success is RefreshChangesAllMailboxSuccess) {
+        _initialMailboxVariableStorage(isRefreshChange: true);
+        mailboxDashBoardController.refreshSpamReportBanner();
+      }
+    });
   }
 
   void handleScrollEnable() {

lib/features/mailbox_creator/presentation/mailbox_creator_controller.dart

@@ -69,9 +69,6 @@ class MailboxCreatorController extends BaseController {
     }
   }
 
-  @override
-  void onDone() {}
-
   @override
   void onClose() {
     _disposeWidget();

lib/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart

@@ -357,7 +357,4 @@ class AdvancedFilterController extends BaseController {
     _unregisterWorkerListener();
     super.onClose();
   }
-
-  @override
-  void onDone() {}
 }

lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart

@@ -80,7 +80,6 @@ import 'package:tmail_ui_user/features/manage_account/presentation/extensions/da
 import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/model/account_menu_item.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/model/manage_account_arguments.dart';
-import 'package:tmail_ui_user/features/network_status_handle/presentation/network_connnection_controller.dart';
 import 'package:tmail_ui_user/features/push_notification/domain/state/get_email_state_to_refresh_state.dart';
 import 'package:tmail_ui_user/features/push_notification/domain/state/get_mailbox_state_to_refresh_state.dart';
 import 'package:tmail_ui_user/features/push_notification/domain/usecases/delete_email_state_to_refresh_interactor.dart';
@@ -121,7 +120,6 @@ class MailboxDashBoardController extends ReloadableController {
   final EmailReceiveManager _emailReceiveManager = Get.find<EmailReceiveManager>();
   final SearchController searchController = Get.find<SearchController>();
   final DownloadController downloadController = Get.find<DownloadController>();
-  final NetworkConnectionController networkConnectionController = Get.find<NetworkConnectionController>();
   final AppGridDashboardController appGridDashboardController = Get.find<AppGridDashboardController>();
   final SpamReportController spamReportController = Get.find<SpamReportController>();
 
@@ -252,21 +250,14 @@ class MailboxDashBoardController extends ReloadableController {
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleSuccessViewState(Success success) {
-    super.onData(newState);
+    super.handleSuccessViewState(success);
-    viewState.value.fold(
-      (failure) {
-        log('MailboxDashBoardController::onData():failure $failure');
-      },
-      (success) {
-        log('MailboxDashBoardController::onData():success $success');
     if (success is SendingEmailState) {
       if (currentOverlayContext != null && currentContext != null) {
         _appToast.showToastMessage(
           currentOverlayContext!,
           AppLocalizations.of(currentContext!).your_email_being_sent,
-              leadingSVGIcon: _imagePaths.icSendToast
+          leadingSVGIcon: _imagePaths.icSendToast);
-            );
       }
     } else if (success is GetEmailStateToRefreshSuccess) {
       dispatchEmailUIAction(RefreshChangeEmailAction(success.storedState));
@@ -274,32 +265,7 @@ class MailboxDashBoardController extends ReloadableController {
     } else if (success is GetMailboxStateToRefreshSuccess) {
       dispatchMailboxUIAction(RefreshChangeMailboxAction(success.storedState));
       _deleteMailboxStateToRefreshAction();
-        }
+    } else if (success is SendEmailSuccess) {
-      }
-    );
-  }
-
-  @override
-  void onDone() {
-    viewState.value.fold(
-      (failure) {
-        if (failure is SendEmailFailure) {
-          _handleSendEmailFailure(failure);
-        } else if (failure is SaveEmailAsDraftsFailure) {
-          _handleSaveEmailAsDraftsFailure(failure);
-        } else if (failure is UpdateEmailDraftsFailure) {
-          _handleUpdateEmailAsDraftsFailure(failure);
-        } else if (failure is RemoveEmailDraftsFailure) {
-          clearState();
-        } else if (failure is MarkAsMailboxReadAllFailure ||
-            failure is MarkAsMailboxReadFailure) {
-          _markAsReadMailboxFailure(failure);
-        } else if (failure is GetEmailByIdFailure) {
-          _handleGetEmailDetailedFailed(failure);
-        }
-      },
-      (success) {
-        if (success is SendEmailSuccess) {
       if (currentOverlayContext != null && currentContext != null) {
         _appToast.showToastSuccessMessage(
           currentOverlayContext!,
@@ -307,7 +273,6 @@ class MailboxDashBoardController extends ReloadableController {
           leadingSVGIcon: _imagePaths.icSendSuccessToast);
       }
     } else if (success is SaveEmailAsDraftsSuccess) {
-          log('MailboxDashBoardController::onDone(): SaveEmailAsDraftsSuccess');
       _saveEmailAsDraftsSuccess(success);
     } else if (success is MoveToMailboxSuccess) {
       _moveToMailboxSuccess(success);
@@ -322,19 +287,19 @@ class MailboxDashBoardController extends ReloadableController {
       }
     } else if (success is UpdateVacationSuccess) {
       _handleUpdateVacationSuccess(success);
-        } else if (success is MarkAsMultipleEmailReadAllSuccess
+    } else if (success is MarkAsMultipleEmailReadAllSuccess ||
-            || success is MarkAsMultipleEmailReadHasSomeEmailFailure) {
+        success is MarkAsMultipleEmailReadHasSomeEmailFailure) {
       _markAsReadSelectedMultipleEmailSuccess(success);
-        } else if (success is MarkAsStarMultipleEmailAllSuccess
+    } else if (success is MarkAsStarMultipleEmailAllSuccess ||
-            || success is MarkAsStarMultipleEmailHasSomeEmailFailure) {
+        success is MarkAsStarMultipleEmailHasSomeEmailFailure) {
       _markAsStarMultipleEmailSuccess(success);
-        } else if (success is MoveMultipleEmailToMailboxAllSuccess
+    } else if (success is MoveMultipleEmailToMailboxAllSuccess ||
-            || success is MoveMultipleEmailToMailboxHasSomeEmailFailure) {
+        success is MoveMultipleEmailToMailboxHasSomeEmailFailure) {
       _moveSelectedMultipleEmailToMailboxSuccess(success);
     } else if (success is EmptyTrashFolderSuccess) {
       _emptyTrashFolderSuccess(success);
-        } else if (success is DeleteMultipleEmailsPermanentlyAllSuccess
+    } else if (success is DeleteMultipleEmailsPermanentlyAllSuccess ||
-            || success is DeleteMultipleEmailsPermanentlyHasSomeEmailFailure) {
+        success is DeleteMultipleEmailsPermanentlyHasSomeEmailFailure) {
       _deleteMultipleEmailsPermanentlySuccess(success);
     } else if (success is GetAppDashboardConfigurationSuccess) {
       appGridDashboardController.handleShowAppDashboard(success.linagoraApplications);
@@ -342,7 +307,24 @@ class MailboxDashBoardController extends ReloadableController {
       _moveToEmailDetailedView(success);
     }
   }
-    );
+
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is SendEmailFailure) {
+      _handleSendEmailFailure(failure);
+    } else if (failure is SaveEmailAsDraftsFailure) {
+      _handleSaveEmailAsDraftsFailure(failure);
+    } else if (failure is UpdateEmailDraftsFailure) {
+      _handleUpdateEmailAsDraftsFailure(failure);
+    } else if (failure is RemoveEmailDraftsFailure) {
+      clearState();
+    } else if (failure is MarkAsMailboxReadAllFailure ||
+        failure is MarkAsMailboxReadFailure) {
+      _markAsReadMailboxFailure(failure);
+    } else if (failure is GetEmailByIdFailure) {
+      _handleGetEmailDetailedFailed(failure);
+    }
   }
 
   void _registerPendingEmailAddress() {

lib/features/mailbox_dashboard/presentation/controller/search_controller.dart

@@ -303,9 +303,6 @@ class SearchController extends BaseController with DateRangePickerMixin {
     hideAdvancedSearchFormView();
   }
 
-  @override
-  void onDone() {}
-
   @override
   void onClose() {
     searchInputController.dispose();

lib/features/mailbox_dashboard/presentation/controller/spam_report_controller.dart

@@ -1,3 +1,5 @@
+import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
@@ -39,14 +41,8 @@ class SpamReportController extends BaseController {
   );
 
   @override
-  void onDone() {
+  void handleSuccessViewState(Success success) {
-     viewState.value.fold(
+    super.handleSuccessViewState(success);
-      (failure) {
-        if (failure is GetUnreadSpamMailboxFailure || failure is GetSpamMailboxCachedFailure) {
-          _presentationSpamMailbox.value = null;
-        }
-      },
-      (success) {
     if (success is GetUnreadSpamMailboxSuccess){
       _presentationSpamMailbox.value = success.unreadSpamMailbox.toPresentationMailbox();
     } else if (success is StoreLastTimeDismissedSpamReportSuccess) {
@@ -58,8 +54,14 @@ class SpamReportController extends BaseController {
     } else if (success is GetSpamMailboxCachedSuccess) {
       _presentationSpamMailbox.value = success.spamMailbox.toPresentationMailbox();
     }
-      },
+  }
-    );
+
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is GetUnreadSpamMailboxFailure || failure is GetSpamMailboxCachedFailure) {
+      _presentationSpamMailbox.value = null;
+    }
   }
 
   void dismissSpamReportAction() {

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

@@ -4,9 +4,9 @@ import 'package:core/presentation/utils/html_transformer/dom/blockcode_transform
 import 'package:core/presentation/utils/html_transformer/dom/blockquoted_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/dom/image_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/dom/script_transformers.dart';
-import 'package:core/presentation/utils/html_transformer/dom/sigature_transformers.dart';
 import 'package:core/presentation/utils/html_transformer/html_transform.dart';
 import 'package:core/presentation/utils/html_transformer/transform_configuration.dart';
+import 'package:core/utils/build_utils.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
 import 'package:jmap_dart_client/jmap/core/session/session.dart';
@@ -59,12 +59,11 @@ class IdentityDataSourceImpl extends IdentityDataSource {
       final signatureUnescape = await HtmlTransform(signature).transformToHtml(
         transformConfiguration: TransformConfiguration.create(customDomTransformers: [
           const RemoveScriptTransformer(),
-          const SignatureTransformer(),
           const BlockQuotedTransformer(),
           const BlockCodeTransformer(),
           const AddTargetBlankInTagATransformer(),
           const ImageTransformer(),
-          const AddTooltipLinkTransformer()
+          if (BuildUtils.isWeb) const AddTooltipLinkTransformer()
         ]));
       return signatureUnescape;
     }).catchError(_exceptionThrower.throwException);

lib/features/manage_account/presentation/email_rules/email_rules_controller.dart

@@ -1,5 +1,6 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
+import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart';
@@ -46,25 +47,6 @@ class EmailRulesController extends BaseController {
 
   final listEmailRule = <TMailRule>[].obs;
 
-  EmailRulesController();
-
-  @override
-  void onDone() {
-    viewState.value.fold((failure) {}, (success) {
-      if (success is GetAllRulesSuccess) {
-        if (success.rules?.isNotEmpty == true) {
-          listEmailRule.addAll(success.rules!);
-        }
-      } else if (success is DeleteEmailRuleSuccess) {
-        _handleDeleteEmailRuleSuccess(success);
-      } else if (success is CreateNewRuleFilterSuccess) {
-        _createNewRuleFilterSuccess(success);
-      } else if (success is EditEmailRuleFilterSuccess) {
-        _editEmailRuleFilterSuccess(success);
-      }
-    });
-  }
-
   @override
   void onInit() {
     super.onInit();
@@ -84,6 +66,22 @@ class EmailRulesController extends BaseController {
     super.onReady();
   }
 
+  @override
+  void handleSuccessViewState(Success success) {
+    super.handleSuccessViewState(success);
+    if (success is GetAllRulesSuccess) {
+      if (success.rules?.isNotEmpty == true) {
+        listEmailRule.addAll(success.rules!);
+      }
+    } else if (success is DeleteEmailRuleSuccess) {
+      _handleDeleteEmailRuleSuccess(success);
+    } else if (success is CreateNewRuleFilterSuccess) {
+      _createNewRuleFilterSuccess(success);
+    } else if (success is EditEmailRuleFilterSuccess) {
+      _editEmailRuleFilterSuccess(success);
+    }
+  }
+
   void goToCreateNewRule(BuildContext context) async {
     final accountId = _accountDashBoardController.accountId.value;
     final session = _accountDashBoardController.sessionCurrent;

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

@@ -1,5 +1,7 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
+import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:flutter/material.dart';
@@ -76,14 +78,14 @@ class ForwardController extends BaseController {
   }
 
   @override
-  void onDone() {
+  void onReady() {
-    viewState.value.fold(
+    _getForward();
-      (failure) {
+    super.onReady();
-        if (failure is DeleteRecipientInForwardingFailure) {
-          cancelSelectionMode();
   }
-      },
+
-      (success) {
+  @override
+  void handleSuccessViewState(Success success) {
+    super.handleSuccessViewState(success);
     if (success is GetForwardSuccess) {
       currentForward.value = success.forward;
       listRecipientForward.value = currentForward.value!.listRecipientForward;
@@ -94,13 +96,14 @@ class ForwardController extends BaseController {
     } else if (success is EditLocalCopyInForwardingSuccess) {
       _handleEditLocalCopySuccess(success);
     }
-      });
   }
 
   @override
-  void onReady() {
+  void handleFailureViewState(Failure failure) {
-    _getForward();
+    super.handleFailureViewState(failure);
-    super.onReady();
+    if (failure is DeleteRecipientInForwardingFailure) {
+      cancelSelectionMode();
+    }
   }
 
   void _getForward() {

lib/features/manage_account/presentation/language_and_region/language_and_region_controller.dart

@@ -1,6 +1,7 @@
 
 import 'dart:ui';
 
+import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/base/base_controller.dart';
@@ -25,14 +26,11 @@ class LanguageAndRegionController extends BaseController {
   }
 
   @override
-  void onDone() {
+  void handleSuccessViewState(Success success) {
-    viewState.value.fold(
+    super.handleSuccessViewState(success);
-        (failure) => null,
-        (success) {
     if (success is SaveLanguageSuccess) {
       LocalizationService.changeLocale(success.localeStored.languageCode);
     }
-        });
   }
 
   void _setUpSupportedLanguages() {

lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_controller.dart

@@ -1,6 +1,5 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
-import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/utils/app_logger.dart';
@@ -66,30 +65,21 @@ class MailboxVisibilityController extends BaseMailboxController {
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleSuccessViewState(Success success) {
-    super.onData(newState);
+    super.handleSuccessViewState(success);
-    newState.fold((failure) => null, (success) {
     if (success is GetAllMailboxSuccess)  {
       currentMailboxState = success.currentMailboxState;
       _handleBuildTree(success.mailboxList);
     } else if (success is RefreshChangesAllMailboxSuccess) {
       currentMailboxState = success.currentMailboxState;
       refreshTree(success.mailboxList);
-      }
+    } else if (success is SubscribeMailboxSuccess) {
-    });
-  }
-
-  @override
-  void onDone() {
-    viewState.value.fold((failure) {}, (success) {
-      if (success is SubscribeMailboxSuccess) {
       _subscribeMailboxSuccess(success);
     } else if (success is SubscribeMultipleMailboxAllSuccess) {
       _handleUnsubscribeMultipleMailboxAllSuccess(success);
     } else if (success is SubscribeMultipleMailboxHasSomeSuccess) {
       _handleUnsubscribeMultipleMailboxHasSomeSuccess(success);
     }
-    });
   }
 
   @override

lib/features/manage_account/presentation/manage_account_dashboard_controller.dart

@@ -77,10 +77,8 @@ class ManageAccountDashBoardController extends ReloadableController {
   }
 
   @override
-  void onDone() {
+  void handleSuccessViewState(Success success) {
-    viewState.value.fold(
+    super.handleSuccessViewState(success);
-      (failure) {},
-      (success) {
     if (success is GetUserProfileSuccess) {
       userProfile.value = success.userProfile;
     } else if (success is GetAllVacationSuccess) {
@@ -91,8 +89,6 @@ class ManageAccountDashBoardController extends ReloadableController {
       _handleUpdateVacationSuccess(success);
     }
   }
-    );
-  }
 
   @override
   void handleReloaded(Session session) {

lib/features/manage_account/presentation/profiles/identities/identities_controller.dart

@@ -1,6 +1,8 @@
 
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
+import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/presentation/views/dialog/confirmation_dialog_builder.dart';
@@ -72,14 +74,8 @@ class IdentitiesController extends BaseController {
   }
 
   @override
-  void onDone() {
+  void handleSuccessViewState(Success success) {
-    viewState.value.fold(
+    super.handleSuccessViewState(success);
-      (failure) {
-        if (failure is DeleteIdentityFailure) {
-          _deleteIdentityFailure(failure);
-        }
-      },
-      (success) {
     if (success is GetAllIdentitiesSuccess) {
       _handleGetAllIdentitiesSuccess(success);
     } else if (success is CreateNewIdentitySuccess) {
@@ -94,7 +90,13 @@ class IdentitiesController extends BaseController {
       signatureSelected.value = success.signature;
     }
   }
-    );
+
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is DeleteIdentityFailure) {
+      _deleteIdentityFailure(failure);
+    }
   }
 
   void _registerObxStreamListener() {

lib/features/manage_account/presentation/vacation/vacation_controller.dart

@@ -75,18 +75,14 @@ class VacationController extends BaseController {
   }
 
   @override
-  void onDone() {
+  void handleSuccessViewState(Success success) {
-    viewState.value.fold(
+    super.handleSuccessViewState(success);
-      (failure) => null,
-      (success) {
     if (success is GetAllVacationSuccess) {
       _handleGetAllVacationSuccess(success);
     } else if (success is UpdateVacationSuccess) {
       _handleUpdateVacationSuccess(success);
     }
   }
-    );
-  }
 
   void _initWorker() {
     ever(_accountDashBoardController.vacationResponse, (vacation) {

lib/features/network_status_handle/presentation/network_connnection_controller.dart

@@ -40,9 +40,6 @@ class NetworkConnectionController extends BaseController {
     super.onClose();
   }
 
-  @override
-  void onDone() {}
-
   void _getCurrentNetworkConnectionState() async {
     final currentConnectionResult = await _connectivity.checkConnectivity();
     log('NetworkConnectionController::onReady():_getCurrentNetworkConnectionState: $currentConnectionResult');

lib/features/push_notification/presentation/controller/fcm_message_controller.dart

@@ -257,7 +257,7 @@ class FcmMessageController extends FcmBaseController {
 
   void _getSessionAction() {
     if (_getSessionInteractor != null) {
-      consumeState(_getSessionInteractor!.execute().asStream());
+      consumeState(_getSessionInteractor!.execute());
     } else {
       _clearRemoteMessageBackground();
       logError('FcmMessageController::_getSessionAction():_getSessionInteractor is null');

lib/features/quotas/presentation/quotas_controller.dart

@@ -45,22 +45,6 @@ class QuotasController extends BaseController {
     }
   }
 
-  @override
-  void onDone() {
-    viewState.value.fold(
-      (failure) {
-        if (failure is GetQuotasFailure) {
-          logError('QuotasController::onDone():[GetQuotasFailure]: ${failure.exception}');
-        }
-      },
-      (success) {
-        if (success is GetQuotasSuccess) {
-          _handleGetQuotasSuccess(success);
-        }
-      }
-    );
-  }
-
   void _handleGetQuotasSuccess(GetQuotasSuccess success) {
     try {
       final quotas = success.quotas.firstWhere((e) => e.resourceType == ResourceType.octets);
@@ -85,10 +69,6 @@ class QuotasController extends BaseController {
     }
   }
 
-  void covertBytesToGB() {
-
-  }
-
   void _initWorker() {
     accountIdWorker = ever(mailboxDashBoardController.accountId, (accountId) {
       if (accountId is AccountId && mailboxDashBoardController.sessionCurrent!= null) {
@@ -108,4 +88,12 @@ class QuotasController extends BaseController {
     accountIdWorker.call();
     super.onClose();
   }
+
+  @override
+  void handleSuccessViewState(Success success) {
+    super.handleSuccessViewState(success);
+    if (success is GetQuotasSuccess) {
+      _handleGetQuotasSuccess(success);
+    }
+  }
 }

lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart

@@ -1,10 +1,8 @@
 
-import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/build_utils.dart';
-import 'package:dartz/dartz.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
@@ -116,28 +114,17 @@ class RulesFilterCreatorController extends BaseMailboxController {
   }
 
   @override
-  void onDone() {
+  void handleSuccessViewState(Success success) async {
-    viewState.value.fold((failure) {}, (success) {
+    super.handleSuccessViewState(success);
-      if (success is GetAllRulesSuccess) {
+    if (success is GetAllMailboxSuccess) {
-        log('RulesFilterCreatorController::onDone():GetAllRulesSuccess: ${success.rules}');
+      await buildTree(success.mailboxList);
+      _setUpMailboxSelected();
+    } else if (success is GetAllRulesSuccess) {
+      log('RulesFilterCreatorController::handleSuccessViewState():GetAllRulesSuccess: ${success.rules}');
       if (success.rules?.isNotEmpty == true) {
         _listEmailRule = success.rules!;
       }
     }
-    });
-  }
-
-  @override
-  void onData(Either<Failure, Success> newState) {
-    super.onData(newState);
-    newState.fold(
-      (failure) => null,
-      (success) async {
-        if (success is GetAllMailboxSuccess) {
-          await buildTree(success.mailboxList);
-          _setUpMailboxSelected();
-        }
-      });
   }
 
   void _getAllRules() {

lib/features/search/email/presentation/search_email_controller.dart

@@ -134,17 +134,8 @@ class SearchEmailController extends BaseController
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleSuccessViewState(Success success) {
-    super.onData(newState);
+    super.handleSuccessViewState(success);
-    newState.fold(
-        (failure) {
-          if (failure is SearchEmailFailure) {
-            _searchEmailsFailure(failure);
-          } else if (failure is SearchMoreEmailFailure) {
-            _searchMoreEmailsFailure(failure);
-          }
-        },
-        (success) {
     if (success is SearchEmailSuccess) {
       _searchEmailsSuccess(success);
     } else if (success is SearchingMoreState) {
@@ -155,11 +146,16 @@ class SearchEmailController extends BaseController
       _refreshChangesSearchEmailsSuccess(success);
     }
   }
-    );
-  }
 
   @override
-  void onDone() {}
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is SearchEmailFailure) {
+      _searchEmailsFailure(failure);
+    } else if (failure is SearchMoreEmailFailure) {
+      _searchMoreEmailsFailure(failure);
+    }
+  }
 
   void _initializeDebounceTimeTextSearchChange() {
     _deBouncerTime = Debouncer<String>(

lib/features/search/mailbox/presentation/search_mailbox_controller.dart

@@ -7,7 +7,6 @@ import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/build_utils.dart';
-import 'package:dartz/dartz.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:get/get.dart';
@@ -107,14 +106,16 @@ class SearchMailboxController extends BaseMailboxController with MailboxActionHa
   }
 
   @override
-  void onDone() {
+  void handleFailureViewState(Failure failure) {
-    viewState.value.fold(_handleFailureViewState, _handleSuccessViewState);
+    super.handleFailureViewState(failure);
+    if (failure is SearchMailboxFailure) {
+      _handleSearchMailboxFailure(failure);
+    }
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleSuccessViewState(Success success) async {
-    super.onData(newState);
+    super.handleSuccessViewState(success);
-    newState.fold((failure) => null, (success) async {
     if (success is GetAllMailboxSuccess) {
       currentMailboxState = success.currentMailboxState;
       buildTree(success.mailboxList);
@@ -122,18 +123,7 @@ class SearchMailboxController extends BaseMailboxController with MailboxActionHa
       currentMailboxState = success.currentMailboxState;
       await refreshTree(success.mailboxList);
       searchMailboxAction();
-      }
+    } else if (success is SearchMailboxSuccess) {
-    });
-  }
-
-  void _handleFailureViewState(Failure failure) {
-    if (failure is SearchMailboxFailure) {
-      _handleSearchMailboxFailure(failure);
-    }
-  }
-
-  void _handleSuccessViewState(Success success) {
-    if (success is SearchMailboxSuccess) {
       _handleSearchMailboxSuccess(success);
     } else if (success is MarkAsMailboxReadAllSuccess) {
       _refreshMailboxChanges(mailboxState: success.currentMailboxState);

lib/features/session/domain/usecases/get_session_interactor.dart

@@ -1,4 +1,5 @@
-import 'package:core/core.dart';
+import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
 import 'package:tmail_ui_user/features/session/domain/repository/session_repository.dart';
 import 'package:tmail_ui_user/features/session/domain/state/get_session_state.dart';
@@ -8,12 +9,12 @@ class GetSessionInteractor {
 
   GetSessionInteractor(this.sessionRepository);
 
-  Future<Either<Failure, Success>> execute() async {
+  Stream<Either<Failure, Success>> execute() async* {
     try {
       final session = await sessionRepository.getSession();
-      return Right<Failure, Success>(GetSessionSuccess(session));
+      yield Right<Failure, Success>(GetSessionSuccess(session));
     } catch (e) {
-      return Left<Failure, Success>(GetSessionFailure(e));
+      yield Left<Failure, Success>(GetSessionFailure(e));
     }
   }
 }

lib/features/session/presentation/session_controller.dart

@@ -1,6 +1,7 @@
 import 'package:core/data/network/config/dynamic_url_interceptors.dart';
 import 'package:core/presentation/extensions/uri_extension.dart';
 import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:get/get.dart';
@@ -49,6 +50,23 @@ class SessionController extends ReloadableController {
     }
   }
 
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is GetSessionFailure) {
+      _handleSessionFailure(failure);
+      _goToLogin();
+    }
+  }
+
+  @override
+  void handleSuccessViewState(Success success) {
+    super.handleSuccessViewState(success);
+    if (success is GetSessionSuccess) {
+      _goToMailboxDashBoard(success);
+    }
+  }
+
   @override
   void handleReloaded(Session session) {
     pushAndPop(
@@ -57,15 +75,7 @@ class SessionController extends ReloadableController {
   }
 
   void _getSession() async {
-    await _getSessionInteractor.execute()
+    consumeState(_getSessionInteractor.execute());
-      .then((response) => response.fold(
-        (failure) {
-          _handleSessionFailure(failure);
-          _goToLogin();
-        },
-        (success) => success is GetSessionSuccess
-            ? _goToMailboxDashBoard(success)
-            : _goToLogin()));
   }
 
   void _handleSessionFailure(Failure failure) {
@@ -93,7 +103,7 @@ class SessionController extends ReloadableController {
   }
 
   bool _checkUrlError(dynamic sessionException) {
-    return sessionException is ConnectError || sessionException is BadGateway;
+    return sessionException is ConnectError || sessionException is BadGateway || sessionException is SocketError;
   }
 
   void _goToLogin() async {
@@ -121,7 +131,4 @@ class SessionController extends ReloadableController {
       _goToLogin();
     }
   }
-
-  @override
-  void onDone() {}
 }

lib/features/thread/presentation/thread_controller.dart

@@ -146,22 +146,8 @@ class ThreadController extends BaseController with EmailActionController {
   }
 
   @override
-  void onData(Either<Failure, Success> newState) {
+  void handleSuccessViewState(Success success) {
-    super.onData(newState);
+    super.handleSuccessViewState(success);
-    newState.fold(
-      (failure) {
-        if (failure is SearchEmailFailure) {
-          canSearchMore = false;
-          mailboxDashBoardController.emailsInCurrentMailbox.clear();
-        } else if (failure is SearchMoreEmailFailure || failure is LoadMoreEmailsFailure) {
-          _isLoadingMore = false;
-        } else if (failure is GetEmailByIdFailure) {
-          openingEmail.value = false;
-          _navigationRouter = null;
-          pushAndPop(AppRoutes.unknownRoutePage);
-        }
-      },
-      (success) {
     if (success is GetAllEmailSuccess) {
       _getAllEmailSuccess(success);
     } else if (success is RefreshChangesAllEmailSuccess) {
@@ -181,15 +167,26 @@ class ThreadController extends BaseController with EmailActionController {
       _openEmailDetailView(success.email);
     }
   }
-    );
+
+  @override
+  void handleFailureViewState(Failure failure) {
+    super.handleFailureViewState(failure);
+    if (failure is SearchEmailFailure) {
+      canSearchMore = false;
+      mailboxDashBoardController.emailsInCurrentMailbox.clear();
+    } else if (failure is SearchMoreEmailFailure || failure is LoadMoreEmailsFailure) {
+      _isLoadingMore = false;
+    } else if (failure is GetEmailByIdFailure) {
+      openingEmail.value = false;
+      _navigationRouter = null;
+      pushAndPop(AppRoutes.unknownRoutePage);
+    }
   }
 
   @override
-  void onDone() {}
+  void handleErrorViewState(Object error, StackTrace stackTrace) {
-
+    super.handleErrorViewState(error, stackTrace);
-  @override
+    _handleErrorGetAllOrRefreshChangesEmail(error, stackTrace);
-  void onError(error) {
-    _handleErrorGetAllOrRefreshChangesEmail(error);
   }
 
   void _registerObxStreamListener() {
@@ -337,13 +334,13 @@ class ThreadController extends BaseController with EmailActionController {
     _searchEmail();
   }
 
-  void _handleErrorGetAllOrRefreshChangesEmail(dynamic error) async {
+  void _handleErrorGetAllOrRefreshChangesEmail(Object error, StackTrace stackTrace) async {
     logError('ThreadController::_handleErrorGetAllOrRefreshChangesEmail():Error: $error');
     if (error is CannotCalculateChangesMethodResponseException) {
       await cachingManager.clearEmailCache();
       _getAllEmailAction();
     } else {
-      super.onError(error);
+      super.onError(error, stackTrace);
     }
   }
 

lib/features/upload/presentation/controller/upload_controller.dart

@@ -340,12 +340,8 @@ class UploadController extends BaseController {
   }
 
   @override
-  void onDone() {
+  void handleFailureViewState(Failure failure) async {
-    viewState.value.fold(_handleFailureViewState, _handleSuccessViewState);
+    super.handleFailureViewState(failure);
-  }
-
-  void _handleFailureViewState(Failure failure) async {
-    logError('UploadController::_handleFailureViewState():failure: $failure');
     if (failure is UploadAttachmentFailure) {
       if (failure.isInline) {
         if (currentContext != null && currentOverlayContext != null) {
@@ -367,8 +363,9 @@ class UploadController extends BaseController {
     }
   }
 
-  void _handleSuccessViewState(Success success) async {
+  @override
-    log('UploadController::_handleSuccessViewState():success: $success');
+  void handleSuccessViewState(Success success) async {
+    super.handleSuccessViewState(success);
     if (success is UploadAttachmentSuccess) {
       if (success.isInline) {
         _uploadingStateInlineFiles.add(success.uploadAttachment.toUploadFileState());

lib/main/exceptions/remote_exception.dart

@@ -8,6 +8,7 @@ abstract class RemoteException with EquatableMixin implements Exception {
   static const internalServerError = 'Internal Server Error';
   static const noNetworkError = 'No network error';
   static const badCredentials = 'Bad credentials';
+  static const socketException = 'Socket exception';
 
   final String? message;
   final int? code;
@@ -36,6 +37,13 @@ class ConnectError extends RemoteException {
   List<Object> get props => [];
 }
 
+class SocketError extends RemoteException {
+  const SocketError() : super(message: RemoteException.socketException);
+
+  @override
+  List<Object> get props => [];
+}
+
 class InternalServerError extends RemoteException {
   const InternalServerError() : super(message: RemoteException.internalServerError);
 

lib/main/exceptions/remote_exception_thrower.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:core/utils/app_logger.dart';
 import 'package:dio/dio.dart';
 import 'package:get/get_connect/http/src/status/http_status.dart';
@@ -20,7 +22,7 @@ class RemoteExceptionThrower extends ExceptionThrower {
       throw const NoNetworkError();
     } else {
       if (error is DioError) {
-        logError('RemoteExceptionThrower::throwException():type: ${error.type} | response: ${error.response}');
+        logError('RemoteExceptionThrower::throwException():type: ${error.type} | response: ${error.response} | error: ${error.error}');
         switch (error.type) {
           case DioErrorType.connectionTimeout:
             throw const ConnectError();
@@ -31,6 +33,8 @@ class RemoteExceptionThrower extends ExceptionThrower {
               throw BadGateway();
             } else if (error.response?.statusCode == HttpStatus.unauthorized) {
               throw const BadCredentialsException();
+            } else if (error.error is SocketException) {
+              throw const SocketError();
             } else {
               throw UnknownError(
                 code: error.response?.statusCode,