diff --git a/lib/features/cleanup/domain/state/cleanup_email_cache_state.dart b/lib/features/cleanup/domain/state/cleanup_email_cache_state.dart
index 3b26aa87e..18c6ac56a 100644
--- a/lib/features/cleanup/domain/state/cleanup_email_cache_state.dart
+++ b/lib/features/cleanup/domain/state/cleanup_email_cache_state.dart
@@ -9,10 +9,10 @@ class CleanupEmailCacheSuccess extends UIState {
 }
 
 class CleanupEmailCacheFailure extends FeatureFailure {
-  final exception;
+  final dynamic exception;
 
   CleanupEmailCacheFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/cleanup/domain/state/cleanup_recent_login_url_cache_state.dart b/lib/features/cleanup/domain/state/cleanup_recent_login_url_cache_state.dart
index 6d5c0105c..6a59df7ce 100644
--- a/lib/features/cleanup/domain/state/cleanup_recent_login_url_cache_state.dart
+++ b/lib/features/cleanup/domain/state/cleanup_recent_login_url_cache_state.dart
@@ -14,5 +14,5 @@ class CleanupRecentLoginUrlCacheFailure extends FeatureFailure {
   CleanupRecentLoginUrlCacheFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/cleanup/domain/state/cleanup_recent_login_username_cache_state.dart b/lib/features/cleanup/domain/state/cleanup_recent_login_username_cache_state.dart
index dcba4cb28..d426c9a69 100644
--- a/lib/features/cleanup/domain/state/cleanup_recent_login_username_cache_state.dart
+++ b/lib/features/cleanup/domain/state/cleanup_recent_login_username_cache_state.dart
@@ -14,5 +14,5 @@ class CleanupRecentLoginUsernameCacheFailure extends FeatureFailure {
   CleanupRecentLoginUsernameCacheFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/cleanup/domain/state/cleanup_recent_search_cache_state.dart b/lib/features/cleanup/domain/state/cleanup_recent_search_cache_state.dart
index 9a1dadbdb..3a913a045 100644
--- a/lib/features/cleanup/domain/state/cleanup_recent_search_cache_state.dart
+++ b/lib/features/cleanup/domain/state/cleanup_recent_search_cache_state.dart
@@ -14,5 +14,5 @@ class CleanupRecentSearchCacheFailure extends FeatureFailure {
   CleanupRecentSearchCacheFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/composer/domain/state/download_image_as_base64_state.dart b/lib/features/composer/domain/state/download_image_as_base64_state.dart
index fd0e5481d..0b783e198 100644
--- a/lib/features/composer/domain/state/download_image_as_base64_state.dart
+++ b/lib/features/composer/domain/state/download_image_as_base64_state.dart
@@ -29,5 +29,5 @@ class DownloadImageAsBase64Failure extends FeatureFailure {
   DownloadImageAsBase64Failure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/composer/domain/state/get_autocomplete_state.dart b/lib/features/composer/domain/state/get_autocomplete_state.dart
index f8b95c2c4..48888fbc6 100644
--- a/lib/features/composer/domain/state/get_autocomplete_state.dart
+++ b/lib/features/composer/domain/state/get_autocomplete_state.dart
@@ -17,5 +17,5 @@ class GetAutoCompleteFailure extends FeatureFailure {
   GetAutoCompleteFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/composer/domain/state/get_device_contact_suggestions_state.dart b/lib/features/composer/domain/state/get_device_contact_suggestions_state.dart
index ed645f11f..91174591b 100644
--- a/lib/features/composer/domain/state/get_device_contact_suggestions_state.dart
+++ b/lib/features/composer/domain/state/get_device_contact_suggestions_state.dart
@@ -17,5 +17,5 @@ class GetDeviceContactSuggestionsFailure extends FeatureFailure {
   GetDeviceContactSuggestionsFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/composer/domain/state/save_email_address_state.dart b/lib/features/composer/domain/state/save_email_address_state.dart
index e8ac4550d..a42c67757 100644
--- a/lib/features/composer/domain/state/save_email_address_state.dart
+++ b/lib/features/composer/domain/state/save_email_address_state.dart
@@ -14,5 +14,5 @@ class SaveEmailAddressFailure extends FeatureFailure {
   SaveEmailAddressFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/composer/domain/state/save_email_as_drafts_state.dart b/lib/features/composer/domain/state/save_email_as_drafts_state.dart
index d9a985bd3..3c12d0ea8 100644
--- a/lib/features/composer/domain/state/save_email_as_drafts_state.dart
+++ b/lib/features/composer/domain/state/save_email_as_drafts_state.dart
@@ -33,5 +33,5 @@ class SaveEmailAsDraftsFailure extends FeatureFailure {
   SaveEmailAsDraftsFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/composer/domain/state/update_email_drafts_state.dart b/lib/features/composer/domain/state/update_email_drafts_state.dart
index 9729723a2..22ac59f8d 100644
--- a/lib/features/composer/domain/state/update_email_drafts_state.dart
+++ b/lib/features/composer/domain/state/update_email_drafts_state.dart
@@ -33,5 +33,5 @@ class UpdateEmailDraftsFailure extends FeatureFailure {
   UpdateEmailDraftsFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/email/domain/state/download_attachment_for_web_state.dart b/lib/features/email/domain/state/download_attachment_for_web_state.dart
index 2c62ef9b0..8f1eec15d 100644
--- a/lib/features/email/domain/state/download_attachment_for_web_state.dart
+++ b/lib/features/email/domain/state/download_attachment_for_web_state.dart
@@ -60,5 +60,5 @@ class DownloadAttachmentForWebFailure extends FeatureFailure {
   DownloadAttachmentForWebFailure(this.taskId, this.exception);
 
   @override
-  List<Object> get props => [taskId, exception];
+  List<Object?> get props => [taskId, exception];
 }
\ No newline at end of file
diff --git a/lib/features/email/domain/state/download_attachments_state.dart b/lib/features/email/domain/state/download_attachments_state.dart
index 3e7f51e98..f60923963 100644
--- a/lib/features/email/domain/state/download_attachments_state.dart
+++ b/lib/features/email/domain/state/download_attachments_state.dart
@@ -11,10 +11,10 @@ class DownloadAttachmentsSuccess extends UIState {
 }
 
 class DownloadAttachmentsFailure extends FeatureFailure {
-  final exception;
+  final dynamic exception;
 
   DownloadAttachmentsFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/email/domain/state/export_attachment_state.dart b/lib/features/email/domain/state/export_attachment_state.dart
index 048f830bb..7d5dc7e5b 100644
--- a/lib/features/email/domain/state/export_attachment_state.dart
+++ b/lib/features/email/domain/state/export_attachment_state.dart
@@ -15,5 +15,5 @@ class ExportAttachmentFailure extends FeatureFailure {
   ExportAttachmentFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/email/domain/state/get_email_content_state.dart b/lib/features/email/domain/state/get_email_content_state.dart
index d35671ff6..4420f311d 100644
--- a/lib/features/email/domain/state/get_email_content_state.dart
+++ b/lib/features/email/domain/state/get_email_content_state.dart
@@ -32,5 +32,5 @@ class GetEmailContentFailure extends FeatureFailure {
   GetEmailContentFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/email/domain/state/get_stored_state_email_state.dart b/lib/features/email/domain/state/get_stored_state_email_state.dart
index 63612704a..5ddf82cd6 100644
--- a/lib/features/email/domain/state/get_stored_state_email_state.dart
+++ b/lib/features/email/domain/state/get_stored_state_email_state.dart
@@ -27,5 +27,5 @@ class GetStoredEmailStateFailure extends FeatureFailure {
   GetStoredEmailStateFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/email/domain/state/mark_as_email_read_state.dart b/lib/features/email/domain/state/mark_as_email_read_state.dart
index 968c8645b..de4a8644d 100644
--- a/lib/features/email/domain/state/mark_as_email_read_state.dart
+++ b/lib/features/email/domain/state/mark_as_email_read_state.dart
@@ -29,5 +29,5 @@ class MarkAsEmailReadFailure extends FeatureFailure {
   MarkAsEmailReadFailure(this.exception, this.readActions);
 
   @override
-  List<Object> get props => [exception, readActions];
+  List<Object?> get props => [exception, readActions];
 }
\ No newline at end of file
diff --git a/lib/features/email/domain/state/mark_as_email_star_state.dart b/lib/features/email/domain/state/mark_as_email_star_state.dart
index cf42559ef..d9619f125 100644
--- a/lib/features/email/domain/state/mark_as_email_star_state.dart
+++ b/lib/features/email/domain/state/mark_as_email_star_state.dart
@@ -28,5 +28,5 @@ class MarkAsStarEmailFailure extends FeatureFailure {
   MarkAsStarEmailFailure(this.exception, this.markStarAction);
 
   @override
-  List<Object> get props => [exception, markStarAction];
+  List<Object?> get props => [exception, markStarAction];
 }
\ No newline at end of file
diff --git a/lib/features/email/domain/state/move_to_mailbox_state.dart b/lib/features/email/domain/state/move_to_mailbox_state.dart
index 482c2928d..b2509ee4f 100644
--- a/lib/features/email/domain/state/move_to_mailbox_state.dart
+++ b/lib/features/email/domain/state/move_to_mailbox_state.dart
@@ -47,5 +47,5 @@ class MoveToMailboxFailure extends FeatureFailure {
   MoveToMailboxFailure(this.emailActionType, this.exception);
 
   @override
-  List<Object> get props => [emailActionType, exception];
+  List<Object?> get props => [emailActionType, exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/authenticate_oidc_on_browser_state.dart b/lib/features/login/domain/state/authenticate_oidc_on_browser_state.dart
index ec6cbeae4..d24b3ae9d 100644
--- a/lib/features/login/domain/state/authenticate_oidc_on_browser_state.dart
+++ b/lib/features/login/domain/state/authenticate_oidc_on_browser_state.dart
@@ -24,5 +24,5 @@ class AuthenticateOidcOnBrowserFailure extends FeatureFailure {
   AuthenticateOidcOnBrowserFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/authentication_user_state.dart b/lib/features/login/domain/state/authentication_user_state.dart
index bd0564876..22f29ff6d 100644
--- a/lib/features/login/domain/state/authentication_user_state.dart
+++ b/lib/features/login/domain/state/authentication_user_state.dart
@@ -23,5 +23,5 @@ class AuthenticationUserFailure extends FeatureFailure {
   AuthenticationUserFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/check_oidc_is_available_state.dart b/lib/features/login/domain/state/check_oidc_is_available_state.dart
index 0cc2439ac..8518d9e65 100644
--- a/lib/features/login/domain/state/check_oidc_is_available_state.dart
+++ b/lib/features/login/domain/state/check_oidc_is_available_state.dart
@@ -25,5 +25,5 @@ class CheckOIDCIsAvailableFailure extends FeatureFailure {
   CheckOIDCIsAvailableFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/delete_authority_oidc_state.dart b/lib/features/login/domain/state/delete_authority_oidc_state.dart
index 946e9658f..d75230cd4 100644
--- a/lib/features/login/domain/state/delete_authority_oidc_state.dart
+++ b/lib/features/login/domain/state/delete_authority_oidc_state.dart
@@ -13,5 +13,5 @@ class DeleteAuthorityOidcFailure extends FeatureFailure {
   DeleteAuthorityOidcFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/delete_credential_state.dart b/lib/features/login/domain/state/delete_credential_state.dart
index d9211905d..8388cacd4 100644
--- a/lib/features/login/domain/state/delete_credential_state.dart
+++ b/lib/features/login/domain/state/delete_credential_state.dart
@@ -8,10 +8,10 @@ class DeleteCredentialSuccess extends UIState {
 }
 
 class DeleteCredentialFailure extends FeatureFailure {
-  final exception;
+  final dynamic exception;
 
   DeleteCredentialFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/get_all_recent_login_url_latest_state.dart b/lib/features/login/domain/state/get_all_recent_login_url_latest_state.dart
index 3033f4b83..f19b07be0 100644
--- a/lib/features/login/domain/state/get_all_recent_login_url_latest_state.dart
+++ b/lib/features/login/domain/state/get_all_recent_login_url_latest_state.dart
@@ -18,5 +18,5 @@ class GetAllRecentLoginUrlLatestFailure extends FeatureFailure {
   GetAllRecentLoginUrlLatestFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/get_all_recent_login_username_state.dart b/lib/features/login/domain/state/get_all_recent_login_username_state.dart
index f8d305e97..4dea8a2d0 100644
--- a/lib/features/login/domain/state/get_all_recent_login_username_state.dart
+++ b/lib/features/login/domain/state/get_all_recent_login_username_state.dart
@@ -18,5 +18,5 @@ class GetAllRecentLoginUsernameLatestFailure extends FeatureFailure {
   GetAllRecentLoginUsernameLatestFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/get_authentication_info_state.dart b/lib/features/login/domain/state/get_authentication_info_state.dart
index cbebcc417..15eb83517 100644
--- a/lib/features/login/domain/state/get_authentication_info_state.dart
+++ b/lib/features/login/domain/state/get_authentication_info_state.dart
@@ -24,5 +24,5 @@ class GetAuthenticationInfoFailure extends FeatureFailure {
   GetAuthenticationInfoFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/get_credential_state.dart b/lib/features/login/domain/state/get_credential_state.dart
index 10d719908..44ee4ef88 100644
--- a/lib/features/login/domain/state/get_credential_state.dart
+++ b/lib/features/login/domain/state/get_credential_state.dart
@@ -10,14 +10,14 @@ class GetCredentialViewState extends UIState {
   GetCredentialViewState(this.baseUrl, this.userName, this.password);
 
   @override
-  List<Object> get props => [baseUrl, this.userName, this.password];
+  List<Object> get props => [baseUrl, userName, password];
 }
 
 class GetCredentialFailure extends FeatureFailure {
-  final exception;
+  final dynamic exception;
 
   GetCredentialFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/get_oidc_configuration_state.dart b/lib/features/login/domain/state/get_oidc_configuration_state.dart
index 8b00294a0..771328f00 100644
--- a/lib/features/login/domain/state/get_oidc_configuration_state.dart
+++ b/lib/features/login/domain/state/get_oidc_configuration_state.dart
@@ -25,5 +25,5 @@ class GetOIDCConfigurationFailure extends FeatureFailure {
   GetOIDCConfigurationFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/get_oidc_is_available_state.dart b/lib/features/login/domain/state/get_oidc_is_available_state.dart
index 7b455456e..5ec421d78 100644
--- a/lib/features/login/domain/state/get_oidc_is_available_state.dart
+++ b/lib/features/login/domain/state/get_oidc_is_available_state.dart
@@ -25,5 +25,5 @@ class GetOIDCIsAvailableFailure extends FeatureFailure {
   GetOIDCIsAvailableFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/get_token_oidc_state.dart b/lib/features/login/domain/state/get_token_oidc_state.dart
index 6a26c31e0..2d2d11ff3 100644
--- a/lib/features/login/domain/state/get_token_oidc_state.dart
+++ b/lib/features/login/domain/state/get_token_oidc_state.dart
@@ -26,5 +26,5 @@ class GetTokenOIDCFailure extends FeatureFailure {
   GetTokenOIDCFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/state/refresh_token_oidc_state.dart b/lib/features/login/domain/state/refresh_token_oidc_state.dart
index 55228f9d3..70b4767fb 100644
--- a/lib/features/login/domain/state/refresh_token_oidc_state.dart
+++ b/lib/features/login/domain/state/refresh_token_oidc_state.dart
@@ -17,5 +17,5 @@ class RefreshTokenOIDCFailure extends FeatureFailure {
   RefreshTokenOIDCFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox/domain/state/create_new_mailbox_state.dart b/lib/features/mailbox/domain/state/create_new_mailbox_state.dart
index e42828687..91c0e270a 100644
--- a/lib/features/mailbox/domain/state/create_new_mailbox_state.dart
+++ b/lib/features/mailbox/domain/state/create_new_mailbox_state.dart
@@ -24,5 +24,5 @@ class CreateNewMailboxFailure extends FeatureFailure {
   CreateNewMailboxFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox/domain/state/delete_multiple_mailbox_state.dart b/lib/features/mailbox/domain/state/delete_multiple_mailbox_state.dart
index 33627d209..88182b3b8 100644
--- a/lib/features/mailbox/domain/state/delete_multiple_mailbox_state.dart
+++ b/lib/features/mailbox/domain/state/delete_multiple_mailbox_state.dart
@@ -46,5 +46,5 @@ class DeleteMultipleMailboxFailure extends FeatureFailure {
   DeleteMultipleMailboxFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox/domain/state/get_all_mailboxes_state.dart b/lib/features/mailbox/domain/state/get_all_mailboxes_state.dart
index 1c5d4ac02..9274f46b2 100644
--- a/lib/features/mailbox/domain/state/get_all_mailboxes_state.dart
+++ b/lib/features/mailbox/domain/state/get_all_mailboxes_state.dart
@@ -21,5 +21,5 @@ class GetAllMailboxFailure extends FeatureFailure {
   GetAllMailboxFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox/domain/state/mark_as_mailbox_read_state.dart b/lib/features/mailbox/domain/state/mark_as_mailbox_read_state.dart
index 7f2b484cb..483e84b97 100644
--- a/lib/features/mailbox/domain/state/mark_as_mailbox_read_state.dart
+++ b/lib/features/mailbox/domain/state/mark_as_mailbox_read_state.dart
@@ -73,5 +73,5 @@ class MarkAsMailboxReadFailure extends FeatureFailure {
   MarkAsMailboxReadFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox/domain/state/move_mailbox_state.dart b/lib/features/mailbox/domain/state/move_mailbox_state.dart
index 8d776f468..b4648d842 100644
--- a/lib/features/mailbox/domain/state/move_mailbox_state.dart
+++ b/lib/features/mailbox/domain/state/move_mailbox_state.dart
@@ -39,5 +39,5 @@ class MoveMailboxFailure extends FeatureFailure {
   MoveMailboxFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox/domain/state/refresh_changes_all_mailboxes_state.dart b/lib/features/mailbox/domain/state/refresh_changes_all_mailboxes_state.dart
index 4444d4137..6e1997474 100644
--- a/lib/features/mailbox/domain/state/refresh_changes_all_mailboxes_state.dart
+++ b/lib/features/mailbox/domain/state/refresh_changes_all_mailboxes_state.dart
@@ -21,5 +21,5 @@ class RefreshChangesAllMailboxFailure extends FeatureFailure {
   RefreshChangesAllMailboxFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox/domain/state/rename_mailbox_state.dart b/lib/features/mailbox/domain/state/rename_mailbox_state.dart
index 5dba4081b..b4e046c4d 100644
--- a/lib/features/mailbox/domain/state/rename_mailbox_state.dart
+++ b/lib/features/mailbox/domain/state/rename_mailbox_state.dart
@@ -21,5 +21,5 @@ class RenameMailboxFailure extends FeatureFailure {
   RenameMailboxFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox/domain/state/search_mailbox_state.dart b/lib/features/mailbox/domain/state/search_mailbox_state.dart
index aec50e3e5..1a90df1ea 100644
--- a/lib/features/mailbox/domain/state/search_mailbox_state.dart
+++ b/lib/features/mailbox/domain/state/search_mailbox_state.dart
@@ -19,5 +19,5 @@ class SearchMailboxFailure extends FeatureFailure {
   SearchMailboxFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_creator/domain/state/verify_name_view_state.dart b/lib/features/mailbox_creator/domain/state/verify_name_view_state.dart
index f0b668d15..93e9b2a77 100644
--- a/lib/features/mailbox_creator/domain/state/verify_name_view_state.dart
+++ b/lib/features/mailbox_creator/domain/state/verify_name_view_state.dart
@@ -13,5 +13,5 @@ class VerifyNameFailure extends FeatureFailure {
 
   VerifyNameFailure(this.exception);
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/delete_last_time_dismissed_spam_reported_state.dart b/lib/features/mailbox_dashboard/domain/state/delete_last_time_dismissed_spam_reported_state.dart
index cdf2d116d..e22f8de0d 100644
--- a/lib/features/mailbox_dashboard/domain/state/delete_last_time_dismissed_spam_reported_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/delete_last_time_dismissed_spam_reported_state.dart
@@ -17,5 +17,5 @@ class DeleteLastTimeDismissedSpamReportedFailure extends FeatureFailure {
   DeleteLastTimeDismissedSpamReportedFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/delete_spam_report_state.dart b/lib/features/mailbox_dashboard/domain/state/delete_spam_report_state.dart
index 7f40ce636..5055347fa 100644
--- a/lib/features/mailbox_dashboard/domain/state/delete_spam_report_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/delete_spam_report_state.dart
@@ -17,5 +17,5 @@ class DeleteSpamReportStateFailure extends FeatureFailure {
   DeleteSpamReportStateFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/get_all_recent_search_latest_state.dart b/lib/features/mailbox_dashboard/domain/state/get_all_recent_search_latest_state.dart
index 2394bc574..276df975e 100644
--- a/lib/features/mailbox_dashboard/domain/state/get_all_recent_search_latest_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/get_all_recent_search_latest_state.dart
@@ -17,5 +17,5 @@ class GetAllRecentSearchLatestFailure extends FeatureFailure {
   GetAllRecentSearchLatestFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/get_app_dashboard_configuration_state.dart b/lib/features/mailbox_dashboard/domain/state/get_app_dashboard_configuration_state.dart
index 73316bbfb..188900a08 100644
--- a/lib/features/mailbox_dashboard/domain/state/get_app_dashboard_configuration_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/get_app_dashboard_configuration_state.dart
@@ -20,5 +20,5 @@ class GetAppDashboardConfigurationFailure extends FeatureFailure {
   GetAppDashboardConfigurationFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/get_composer_cache_state.dart b/lib/features/mailbox_dashboard/domain/state/get_composer_cache_state.dart
index 51ab42736..62cfd1044 100644
--- a/lib/features/mailbox_dashboard/domain/state/get_composer_cache_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/get_composer_cache_state.dart
@@ -17,5 +17,5 @@ class GetComposerCacheFailure extends FeatureFailure {
   GetComposerCacheFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/get_number_of_unread_spam_emails_state.dart b/lib/features/mailbox_dashboard/domain/state/get_number_of_unread_spam_emails_state.dart
index e5d3a19a1..a74170598 100644
--- a/lib/features/mailbox_dashboard/domain/state/get_number_of_unread_spam_emails_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/get_number_of_unread_spam_emails_state.dart
@@ -24,5 +24,5 @@ class GetUnreadSpamMailboxFailure extends FeatureFailure {
   GetUnreadSpamMailboxFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/get_spam_report_state.dart b/lib/features/mailbox_dashboard/domain/state/get_spam_report_state.dart
index 3d03b1708..75e909331 100644
--- a/lib/features/mailbox_dashboard/domain/state/get_spam_report_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/get_spam_report_state.dart
@@ -19,5 +19,5 @@ class GetSpamReportStateFailure extends FeatureFailure {
   GetSpamReportStateFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/get_user_profile_state.dart b/lib/features/mailbox_dashboard/domain/state/get_user_profile_state.dart
index 2dfa70149..3ad68ded7 100644
--- a/lib/features/mailbox_dashboard/domain/state/get_user_profile_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/get_user_profile_state.dart
@@ -16,5 +16,5 @@ class GetUserProfileFailure extends FeatureFailure {
   GetUserProfileFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/quick_search_email_state.dart b/lib/features/mailbox_dashboard/domain/state/quick_search_email_state.dart
index 37e933b41..713460a7d 100644
--- a/lib/features/mailbox_dashboard/domain/state/quick_search_email_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/quick_search_email_state.dart
@@ -17,5 +17,5 @@ class QuickSearchEmailFailure extends FeatureFailure {
   QuickSearchEmailFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/remove_composer_cache_state.dart b/lib/features/mailbox_dashboard/domain/state/remove_composer_cache_state.dart
index 72349c1d2..5ac492371 100644
--- a/lib/features/mailbox_dashboard/domain/state/remove_composer_cache_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/remove_composer_cache_state.dart
@@ -14,5 +14,5 @@ class RemoveComposerCacheFailure extends FeatureFailure {
   RemoveComposerCacheFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart b/lib/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart
index ffa29e646..b9f534335 100644
--- a/lib/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/remove_email_drafts_state.dart
@@ -19,5 +19,5 @@ class RemoveEmailDraftsFailure extends FeatureFailure {
   RemoveEmailDraftsFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/save_composer_cache_state.dart b/lib/features/mailbox_dashboard/domain/state/save_composer_cache_state.dart
index a2552f667..adf4ebc35 100644
--- a/lib/features/mailbox_dashboard/domain/state/save_composer_cache_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/save_composer_cache_state.dart
@@ -14,5 +14,5 @@ class SaveComposerCacheFailure extends FeatureFailure {
   SaveComposerCacheFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/save_recent_search_state.dart b/lib/features/mailbox_dashboard/domain/state/save_recent_search_state.dart
index 88a58ee0b..62d77c2b8 100644
--- a/lib/features/mailbox_dashboard/domain/state/save_recent_search_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/save_recent_search_state.dart
@@ -14,5 +14,5 @@ class SaveRecentSearchFailure extends FeatureFailure {
   SaveRecentSearchFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/store_last_time_dismissed_spam_reported_state.dart b/lib/features/mailbox_dashboard/domain/state/store_last_time_dismissed_spam_reported_state.dart
index 7a9509984..d8b1eddba 100644
--- a/lib/features/mailbox_dashboard/domain/state/store_last_time_dismissed_spam_reported_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/store_last_time_dismissed_spam_reported_state.dart
@@ -17,5 +17,5 @@ class StoreLastTimeDismissedSpamReportFailure extends FeatureFailure {
   StoreLastTimeDismissedSpamReportFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/state/store_spam_report_state.dart b/lib/features/mailbox_dashboard/domain/state/store_spam_report_state.dart
index 318082d88..b6240f535 100644
--- a/lib/features/mailbox_dashboard/domain/state/store_spam_report_state.dart
+++ b/lib/features/mailbox_dashboard/domain/state/store_spam_report_state.dart
@@ -19,5 +19,5 @@ class StoreSpamReportStateFailure extends FeatureFailure {
   StoreSpamReportStateFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/add_recipient_in_forwarding_state.dart b/lib/features/manage_account/domain/state/add_recipient_in_forwarding_state.dart
index b47b00b55..acb36f6fc 100644
--- a/lib/features/manage_account/domain/state/add_recipient_in_forwarding_state.dart
+++ b/lib/features/manage_account/domain/state/add_recipient_in_forwarding_state.dart
@@ -17,5 +17,5 @@ class AddRecipientsInForwardingFailure extends FeatureFailure {
   AddRecipientsInForwardingFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/create_new_identity_state.dart b/lib/features/manage_account/domain/state/create_new_identity_state.dart
index ce8794f17..6483b5052 100644
--- a/lib/features/manage_account/domain/state/create_new_identity_state.dart
+++ b/lib/features/manage_account/domain/state/create_new_identity_state.dart
@@ -19,5 +19,5 @@ class CreateNewIdentityFailure extends FeatureFailure {
   CreateNewIdentityFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/create_new_rule_filter_state.dart b/lib/features/manage_account/domain/state/create_new_rule_filter_state.dart
index 7ea0758a5..b1fc64e25 100644
--- a/lib/features/manage_account/domain/state/create_new_rule_filter_state.dart
+++ b/lib/features/manage_account/domain/state/create_new_rule_filter_state.dart
@@ -18,5 +18,5 @@ class CreateNewRuleFilterFailure extends FeatureFailure {
   CreateNewRuleFilterFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/delete_email_rule_state.dart b/lib/features/manage_account/domain/state/delete_email_rule_state.dart
index 8f99bafdc..82f6157a1 100644
--- a/lib/features/manage_account/domain/state/delete_email_rule_state.dart
+++ b/lib/features/manage_account/domain/state/delete_email_rule_state.dart
@@ -16,5 +16,5 @@ class DeleteEmailRuleFailure extends FeatureFailure {
   DeleteEmailRuleFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/delete_identity_state.dart b/lib/features/manage_account/domain/state/delete_identity_state.dart
index e5a098fa5..e4beea8f4 100644
--- a/lib/features/manage_account/domain/state/delete_identity_state.dart
+++ b/lib/features/manage_account/domain/state/delete_identity_state.dart
@@ -16,5 +16,5 @@ class DeleteIdentityFailure extends FeatureFailure {
   DeleteIdentityFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/delete_recipient_in_forwarding_state.dart b/lib/features/manage_account/domain/state/delete_recipient_in_forwarding_state.dart
index 5040b89a4..2af7df7e2 100644
--- a/lib/features/manage_account/domain/state/delete_recipient_in_forwarding_state.dart
+++ b/lib/features/manage_account/domain/state/delete_recipient_in_forwarding_state.dart
@@ -25,5 +25,5 @@ class DeleteRecipientInForwardingFailure extends FeatureFailure {
   DeleteRecipientInForwardingFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/edit_email_rule_filter_state.dart b/lib/features/manage_account/domain/state/edit_email_rule_filter_state.dart
index ce4a8095d..bb0a7f909 100644
--- a/lib/features/manage_account/domain/state/edit_email_rule_filter_state.dart
+++ b/lib/features/manage_account/domain/state/edit_email_rule_filter_state.dart
@@ -18,5 +18,5 @@ class EditEmailRuleFilterFailure extends FeatureFailure {
   EditEmailRuleFilterFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/edit_identity_state.dart b/lib/features/manage_account/domain/state/edit_identity_state.dart
index 1be2e1055..e598cd87f 100644
--- a/lib/features/manage_account/domain/state/edit_identity_state.dart
+++ b/lib/features/manage_account/domain/state/edit_identity_state.dart
@@ -16,5 +16,5 @@ class EditIdentityFailure extends FeatureFailure {
   EditIdentityFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/edit_local_copy_in_forwarding_state.dart b/lib/features/manage_account/domain/state/edit_local_copy_in_forwarding_state.dart
index 4602fe028..e7699ce36 100644
--- a/lib/features/manage_account/domain/state/edit_local_copy_in_forwarding_state.dart
+++ b/lib/features/manage_account/domain/state/edit_local_copy_in_forwarding_state.dart
@@ -17,5 +17,5 @@ class EditLocalCopyInForwardingFailure extends FeatureFailure {
   EditLocalCopyInForwardingFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/get_all_identities_state.dart b/lib/features/manage_account/domain/state/get_all_identities_state.dart
index 205fba488..0530a13f9 100644
--- a/lib/features/manage_account/domain/state/get_all_identities_state.dart
+++ b/lib/features/manage_account/domain/state/get_all_identities_state.dart
@@ -20,5 +20,5 @@ class GetAllIdentitiesFailure extends FeatureFailure {
   GetAllIdentitiesFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/get_all_rules_state.dart b/lib/features/manage_account/domain/state/get_all_rules_state.dart
index e1320da18..05a217347 100644
--- a/lib/features/manage_account/domain/state/get_all_rules_state.dart
+++ b/lib/features/manage_account/domain/state/get_all_rules_state.dart
@@ -16,5 +16,5 @@ class GetAllRulesFailure extends FeatureFailure {
   GetAllRulesFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/get_all_vacation_state.dart b/lib/features/manage_account/domain/state/get_all_vacation_state.dart
index f8d5df82c..075601353 100644
--- a/lib/features/manage_account/domain/state/get_all_vacation_state.dart
+++ b/lib/features/manage_account/domain/state/get_all_vacation_state.dart
@@ -25,5 +25,5 @@ class GetAllVacationFailure extends FeatureFailure {
   GetAllVacationFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/get_forward_state.dart b/lib/features/manage_account/domain/state/get_forward_state.dart
index 1102a406e..a29f77bd9 100644
--- a/lib/features/manage_account/domain/state/get_forward_state.dart
+++ b/lib/features/manage_account/domain/state/get_forward_state.dart
@@ -16,5 +16,5 @@ class GetForwardFailure extends FeatureFailure {
   GetForwardFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/log_out_oidc_state.dart b/lib/features/manage_account/domain/state/log_out_oidc_state.dart
index 4801a724a..e1c63299b 100644
--- a/lib/features/manage_account/domain/state/log_out_oidc_state.dart
+++ b/lib/features/manage_account/domain/state/log_out_oidc_state.dart
@@ -16,5 +16,5 @@ class LogoutOidcFailure extends FeatureFailure {
   LogoutOidcFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/save_language_state.dart b/lib/features/manage_account/domain/state/save_language_state.dart
index 1accaf9a1..c71b3bc92 100644
--- a/lib/features/manage_account/domain/state/save_language_state.dart
+++ b/lib/features/manage_account/domain/state/save_language_state.dart
@@ -26,5 +26,5 @@ class SaveLanguageFailure extends FeatureFailure {
   SaveLanguageFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/domain/state/update_vacation_state.dart b/lib/features/manage_account/domain/state/update_vacation_state.dart
index e2c3c6500..cefd58cf2 100644
--- a/lib/features/manage_account/domain/state/update_vacation_state.dart
+++ b/lib/features/manage_account/domain/state/update_vacation_state.dart
@@ -25,5 +25,5 @@ class UpdateVacationFailure extends FeatureFailure {
   UpdateVacationFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/delete_email_state_to_refresh_state.dart b/lib/features/push_notification/domain/state/delete_email_state_to_refresh_state.dart
index 0850245b1..4f8d2789c 100644
--- a/lib/features/push_notification/domain/state/delete_email_state_to_refresh_state.dart
+++ b/lib/features/push_notification/domain/state/delete_email_state_to_refresh_state.dart
@@ -18,5 +18,5 @@ class DeleteEmailStateToRefreshFailure extends FeatureFailure {
   DeleteEmailStateToRefreshFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/delete_mailbox_state_to_refresh_state.dart b/lib/features/push_notification/domain/state/delete_mailbox_state_to_refresh_state.dart
index 7c6f8df65..0f1b0fa3d 100644
--- a/lib/features/push_notification/domain/state/delete_mailbox_state_to_refresh_state.dart
+++ b/lib/features/push_notification/domain/state/delete_mailbox_state_to_refresh_state.dart
@@ -18,5 +18,5 @@ class DeleteMailboxStateToRefreshFailure extends FeatureFailure {
   DeleteMailboxStateToRefreshFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/destroy_subscription_state.dart b/lib/features/push_notification/domain/state/destroy_subscription_state.dart
index d1de79b2c..8fbe00669 100644
--- a/lib/features/push_notification/domain/state/destroy_subscription_state.dart
+++ b/lib/features/push_notification/domain/state/destroy_subscription_state.dart
@@ -20,5 +20,5 @@ class DestroySubscriptionFailure extends FeatureFailure {
   DestroySubscriptionFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/get_email_state_to_refresh_state.dart b/lib/features/push_notification/domain/state/get_email_state_to_refresh_state.dart
index ffe2b1059..09572f1f4 100644
--- a/lib/features/push_notification/domain/state/get_email_state_to_refresh_state.dart
+++ b/lib/features/push_notification/domain/state/get_email_state_to_refresh_state.dart
@@ -21,5 +21,5 @@ class GetEmailStateToRefreshFailure extends FeatureFailure {
   GetEmailStateToRefreshFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/get_fcm_subscription_local.dart b/lib/features/push_notification/domain/state/get_fcm_subscription_local.dart
index 1b274b1bd..28441ead2 100644
--- a/lib/features/push_notification/domain/state/get_fcm_subscription_local.dart
+++ b/lib/features/push_notification/domain/state/get_fcm_subscription_local.dart
@@ -21,5 +21,5 @@ class GetFCMSubscriptionLocalFailure extends FeatureFailure {
   GetFCMSubscriptionLocalFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/get_mailbox_state_to_refresh_state.dart b/lib/features/push_notification/domain/state/get_mailbox_state_to_refresh_state.dart
index f5adaff5d..92630a008 100644
--- a/lib/features/push_notification/domain/state/get_mailbox_state_to_refresh_state.dart
+++ b/lib/features/push_notification/domain/state/get_mailbox_state_to_refresh_state.dart
@@ -21,5 +21,5 @@ class GetMailboxStateToRefreshFailure extends FeatureFailure {
   GetMailboxStateToRefreshFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/get_stored_email_delivery_state.dart b/lib/features/push_notification/domain/state/get_stored_email_delivery_state.dart
index dc12355e4..df2b43fd2 100644
--- a/lib/features/push_notification/domain/state/get_stored_email_delivery_state.dart
+++ b/lib/features/push_notification/domain/state/get_stored_email_delivery_state.dart
@@ -21,5 +21,5 @@ class GetStoredEmailDeliveryStateFailure extends FeatureFailure {
   GetStoredEmailDeliveryStateFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/register_new_token_state.dart b/lib/features/push_notification/domain/state/register_new_token_state.dart
index 97f819be3..8af418d86 100644
--- a/lib/features/push_notification/domain/state/register_new_token_state.dart
+++ b/lib/features/push_notification/domain/state/register_new_token_state.dart
@@ -21,5 +21,5 @@ class RegisterNewTokenFailure extends FeatureFailure {
   RegisterNewTokenFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/store_email_delivery_state.dart b/lib/features/push_notification/domain/state/store_email_delivery_state.dart
index 00bbbc170..638092629 100644
--- a/lib/features/push_notification/domain/state/store_email_delivery_state.dart
+++ b/lib/features/push_notification/domain/state/store_email_delivery_state.dart
@@ -18,5 +18,5 @@ class StoreEmailDeliveryStateFailure extends FeatureFailure {
   StoreEmailDeliveryStateFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/store_email_state_to_refresh_state.dart b/lib/features/push_notification/domain/state/store_email_state_to_refresh_state.dart
index 234394dea..75a5b567a 100644
--- a/lib/features/push_notification/domain/state/store_email_state_to_refresh_state.dart
+++ b/lib/features/push_notification/domain/state/store_email_state_to_refresh_state.dart
@@ -18,5 +18,5 @@ class StoreEmailStateToRefreshFailure extends FeatureFailure {
   StoreEmailStateToRefreshFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/push_notification/domain/state/store_mailbox_state_to_refresh_state.dart b/lib/features/push_notification/domain/state/store_mailbox_state_to_refresh_state.dart
index e8f39f44c..fc48f5240 100644
--- a/lib/features/push_notification/domain/state/store_mailbox_state_to_refresh_state.dart
+++ b/lib/features/push_notification/domain/state/store_mailbox_state_to_refresh_state.dart
@@ -18,5 +18,5 @@ class StoreMailboxStateToRefreshFailure extends FeatureFailure {
   StoreMailboxStateToRefreshFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/quotas/domain/state/get_quotas_state.dart b/lib/features/quotas/domain/state/get_quotas_state.dart
index bce2b9923..7c2ff2e43 100644
--- a/lib/features/quotas/domain/state/get_quotas_state.dart
+++ b/lib/features/quotas/domain/state/get_quotas_state.dart
@@ -21,5 +21,5 @@ class GetQuotasFailure extends FeatureFailure {
   GetQuotasFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
diff --git a/lib/features/session/domain/state/get_session_state.dart b/lib/features/session/domain/state/get_session_state.dart
index 511ee2b30..548a8f266 100644
--- a/lib/features/session/domain/state/get_session_state.dart
+++ b/lib/features/session/domain/state/get_session_state.dart
@@ -16,5 +16,5 @@ class GetSessionFailure extends FeatureFailure {
   GetSessionFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/empty_trash_folder_state.dart b/lib/features/thread/domain/state/empty_trash_folder_state.dart
index 6363f613b..33af68601 100644
--- a/lib/features/thread/domain/state/empty_trash_folder_state.dart
+++ b/lib/features/thread/domain/state/empty_trash_folder_state.dart
@@ -19,5 +19,5 @@ class EmptyTrashFolderFailure extends FeatureFailure {
   EmptyTrashFolderFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/get_all_email_state.dart b/lib/features/thread/domain/state/get_all_email_state.dart
index dd8a28fef..de00ead0d 100644
--- a/lib/features/thread/domain/state/get_all_email_state.dart
+++ b/lib/features/thread/domain/state/get_all_email_state.dart
@@ -18,5 +18,5 @@ class GetAllEmailFailure extends FeatureFailure {
   GetAllEmailFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/get_email_by_id_state.dart b/lib/features/thread/domain/state/get_email_by_id_state.dart
index 1bca59403..3b3b8996e 100644
--- a/lib/features/thread/domain/state/get_email_by_id_state.dart
+++ b/lib/features/thread/domain/state/get_email_by_id_state.dart
@@ -19,5 +19,5 @@ class GetEmailByIdFailure extends FeatureFailure {
   GetEmailByIdFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/load_more_emails_state.dart b/lib/features/thread/domain/state/load_more_emails_state.dart
index 3825443bd..9fd03d838 100644
--- a/lib/features/thread/domain/state/load_more_emails_state.dart
+++ b/lib/features/thread/domain/state/load_more_emails_state.dart
@@ -16,5 +16,5 @@ class LoadMoreEmailsFailure extends FeatureFailure {
   LoadMoreEmailsFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/mark_as_multiple_email_read_state.dart b/lib/features/thread/domain/state/mark_as_multiple_email_read_state.dart
index 5351a06ee..1ab1fa597 100644
--- a/lib/features/thread/domain/state/mark_as_multiple_email_read_state.dart
+++ b/lib/features/thread/domain/state/mark_as_multiple_email_read_state.dart
@@ -55,5 +55,5 @@ class MarkAsMultipleEmailReadFailure extends FeatureFailure {
   MarkAsMultipleEmailReadFailure(this.exception, this.readActions);
 
   @override
-  List<Object> get props => [exception, readActions];
+  List<Object?> get props => [exception, readActions];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/mark_as_star_multiple_email_state.dart b/lib/features/thread/domain/state/mark_as_star_multiple_email_state.dart
index 3696a8d83..48a2ae2d5 100644
--- a/lib/features/thread/domain/state/mark_as_star_multiple_email_state.dart
+++ b/lib/features/thread/domain/state/mark_as_star_multiple_email_state.dart
@@ -55,5 +55,5 @@ class MarkAsStarMultipleEmailFailure extends FeatureFailure {
   MarkAsStarMultipleEmailFailure(this.exception, this.markStarAction);
 
   @override
-  List<Object> get props => [exception, markStarAction];
+  List<Object?> get props => [exception, markStarAction];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/move_multiple_email_to_mailbox_state.dart b/lib/features/thread/domain/state/move_multiple_email_to_mailbox_state.dart
index c753fbea1..53efae282 100644
--- a/lib/features/thread/domain/state/move_multiple_email_to_mailbox_state.dart
+++ b/lib/features/thread/domain/state/move_multiple_email_to_mailbox_state.dart
@@ -90,5 +90,5 @@ class MoveMultipleEmailToMailboxFailure extends FeatureFailure {
   MoveMultipleEmailToMailboxFailure(this.exception, this.emailActionType, this.moveAction);
 
   @override
-  List<Object> get props => [exception, emailActionType, moveAction];
+  List<Object?> get props => [exception, emailActionType, moveAction];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/refresh_changes_all_email_state.dart b/lib/features/thread/domain/state/refresh_changes_all_email_state.dart
index 296f718c9..11441f20f 100644
--- a/lib/features/thread/domain/state/refresh_changes_all_email_state.dart
+++ b/lib/features/thread/domain/state/refresh_changes_all_email_state.dart
@@ -18,5 +18,5 @@ class RefreshChangesAllEmailFailure extends FeatureFailure {
   RefreshChangesAllEmailFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/search_email_state.dart b/lib/features/thread/domain/state/search_email_state.dart
index 3baf53c8c..42ba9fe1c 100644
--- a/lib/features/thread/domain/state/search_email_state.dart
+++ b/lib/features/thread/domain/state/search_email_state.dart
@@ -25,5 +25,5 @@ class SearchEmailFailure extends FeatureFailure {
   SearchEmailFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/thread/domain/state/search_more_email_state.dart b/lib/features/thread/domain/state/search_more_email_state.dart
index 5a6b9342e..06623da61 100644
--- a/lib/features/thread/domain/state/search_more_email_state.dart
+++ b/lib/features/thread/domain/state/search_more_email_state.dart
@@ -26,5 +26,5 @@ class SearchMoreEmailFailure extends FeatureFailure {
   SearchMoreEmailFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
\ No newline at end of file
diff --git a/lib/features/upload/domain/state/local_file_picker_state.dart b/lib/features/upload/domain/state/local_file_picker_state.dart
index e4a943b23..0bbb92837 100644
--- a/lib/features/upload/domain/state/local_file_picker_state.dart
+++ b/lib/features/upload/domain/state/local_file_picker_state.dart
@@ -12,12 +12,12 @@ class LocalFilePickerSuccess extends UIState {
 }
 
 class LocalFilePickerFailure extends FeatureFailure {
-  final exception;
+  final dynamic exception;
 
   LocalFilePickerFailure(this.exception);
 
   @override
-  List<Object> get props => [exception];
+  List<Object?> get props => [exception];
 }
 
 class LocalFilePickerCancel extends FeatureFailure {