Change error prompts

lib/domain/app/update_failure.dart

@@ -14,9 +14,9 @@ sealed class UpdateFailure with _$UpdateFailure, Failure {
   ]) = UpdateUnexpectedFailure;
 
   @override
-  String present(TranslationsEn t) {
+  ({String type, String? message}) present(TranslationsEn t) {
     return switch (this) {
-      UpdateUnexpectedFailure() => t.failure.unexpected,
+      UpdateUnexpectedFailure() => (type: t.failure.unexpected, message: null),
     };
   }
 }

lib/domain/connectivity/connection_failure.dart

@@ -25,15 +25,20 @@ sealed class ConnectionFailure with _$ConnectionFailure, Failure {
       CoreConnectionFailure;
 
   @override
-  String present(TranslationsEn t) {
+  ({String type, String? message}) present(TranslationsEn t) {
     return switch (this) {
-      UnexpectedConnectionFailure() => t.failure.connectivity.unexpected,
+      UnexpectedConnectionFailure() => (
-      MissingVpnPermission(:final message) =>
+          type: t.failure.connectivity.unexpected,
-        t.failure.connectivity.missingVpnPermission +
+          message: null
-            (message == null ? "" : ": $message"),
+        ),
-      MissingNotificationPermission(:final message) =>
+      MissingVpnPermission(:final message) => (
-        t.failure.connectivity.missingNotificationPermission +
+          type: t.failure.connectivity.missingVpnPermission,
-            (message == null ? "" : ": $message"),
+          message: message
+        ),
+      MissingNotificationPermission(:final message) => (
+          type: t.failure.connectivity.missingNotificationPermission,
+          message: message
+        ),
       CoreConnectionFailure(:final failure) => failure.present(t),
     };
   }

lib/domain/core_service_failure.dart

@@ -42,19 +42,32 @@ sealed class CoreServiceFailure with _$CoreServiceFailure, Failure {
       };
 
   @override
-  String present(TranslationsEn t) {
+  ({String type, String? message}) present(TranslationsEn t) {
     return switch (this) {
-      UnexpectedCoreServiceFailure() => t.failure.singbox.unexpected,
+      UnexpectedCoreServiceFailure() => (
-      CoreServiceNotRunning(:final message) =>
+          type: t.failure.singbox.unexpected,
-        t.failure.singbox.serviceNotRunning +
+          message: null
-            (message == null ? "" : ": $message"),
+        ),
-      InvalidConfig(:final message) =>
+      CoreServiceNotRunning(:final message) => (
-        t.failure.singbox.invalidConfig + (message == null ? "" : ": $message"),
+          type: t.failure.singbox.serviceNotRunning,
-      CoreServiceCreateFailure(:final message) =>
+          message: message
-        t.failure.singbox.create + (message == null ? "" : ": $message"),
+        ),
-      CoreServiceStartFailure(:final message) =>
+      InvalidConfig(:final message) => (
-        t.failure.singbox.start + (message == null ? "" : ": $message"),
+          type: t.failure.singbox.invalidConfig,
-      CoreServiceOtherFailure(:final message) => message ?? "",
+          message: message
+        ),
+      CoreServiceCreateFailure(:final message) => (
+          type: t.failure.singbox.create,
+          message: message
+        ),
+      CoreServiceStartFailure(:final message) => (
+          type: t.failure.singbox.start,
+          message: message
+        ),
+      CoreServiceOtherFailure(:final message) => (
+          type: t.failure.singbox.unexpected,
+          message: message
+        ),
     };
   }
 }

lib/domain/failures.dart

@@ -2,12 +2,20 @@ import 'package:hiddify/core/locale/locale.dart';
 
 // TODO: rewrite
 mixin Failure {
-  String present(TranslationsEn t);
+  ({String type, String? message}) present(TranslationsEn t);
 }
 
 extension ErrorPresenter on TranslationsEn {
-  String presentError(Object error) {
+  String printError(Object error) {
-    if (error case Failure()) return error.present(this);
+    if (error case Failure()) {
+      final err = error.present(this);
+      return err.type + (err.message == null ? "" : ": ${err.message}");
+    }
     return failure.unexpected;
   }
+
+  ({String type, String? message}) presentError(Object error) {
+    if (error case Failure()) return error.present(this);
+    return (type: failure.unexpected, message: null);
+  }
 }

lib/domain/profiles/profiles_failure.dart

@@ -19,13 +19,20 @@ sealed class ProfileFailure with _$ProfileFailure, Failure {
       ProfileInvalidConfigFailure;
 
   @override
-  String present(TranslationsEn t) {
+  ({String type, String? message}) present(TranslationsEn t) {
     return switch (this) {
-      ProfileUnexpectedFailure() => t.failure.profiles.unexpected,
+      ProfileUnexpectedFailure() => (
-      ProfileNotFoundFailure() => t.failure.profiles.notFound,
+          type: t.failure.profiles.unexpected,
-      ProfileInvalidConfigFailure(:final message) =>
+          message: null
-        t.failure.profiles.invalidConfig +
+        ),
-            (message == null ? "" : ": $message"),
+      ProfileNotFoundFailure() => (
+          type: t.failure.profiles.notFound,
+          message: null
+        ),
+      ProfileInvalidConfigFailure(:final message) => (
+          type: t.failure.profiles.invalidConfig,
+          message: message
+        ),
     };
   }
 }

lib/features/about/view/about_page.dart

@@ -33,7 +33,7 @@ class AboutPage extends HookConsumerWidget {
         if (next case AsyncData(:final value)) {
           switch (value.latestVersion) {
             case AsyncError(:final error):
-              CustomToast.error(t.presentError(error)).show(context);
+              CustomToast.error(t.printError(error)).show(context);
             default:
               if (value.newVersionAvailable) {
                 await NewVersionDialog(

lib/features/common/profile_tile.dart

@@ -31,7 +31,7 @@ class ProfileTile extends HookConsumerWidget {
 
     final selectActiveMutation = useMutation(
       initialOnFailure: (err) {
-        CustomToast.error(t.presentError(err)).show(context);
+        CustomToast.error(t.printError(err)).show(context);
       },
     );
 
@@ -146,7 +146,8 @@ class ProfileActionButton extends HookConsumerWidget {
 
     final updateProfileMutation = useMutation(
       initialOnFailure: (err) {
-        CustomToast.error(t.presentError(err)).show(context);
+        // CustomToast.error(t.printError(err)).show(context);
+        CustomAlertDialog.fromErr(t.presentError(err)).show(context);
       },
       initialOnSuccess: () =>
           CustomToast.success(t.profile.update.successMsg).show(context),
@@ -204,14 +205,14 @@ class ProfileActionsMenu extends HookConsumerWidget {
 
     final updateProfileMutation = useMutation(
       initialOnFailure: (err) {
-        CustomToast.error(t.presentError(err)).show(context);
+        CustomAlertDialog.fromErr(t.presentError(err)).show(context);
       },
       initialOnSuccess: () =>
           CustomToast.success(t.profile.update.successMsg).show(context),
     );
     final deleteProfileMutation = useMutation(
       initialOnFailure: (err) {
-        CustomToast.error(t.presentError(err)).show(context);
+        CustomAlertDialog.fromErr(t.presentError(err)).show(context);
       },
     );
 

lib/features/home/view/home_page.dart

@@ -67,7 +67,7 @@ class HomePage extends HookConsumerWidget {
                     _ => const EmptyProfilesHomeBody(),
                   },
                 AsyncError(:final error) =>
-                  SliverErrorBodyPlaceholder(t.presentError(error)),
+                  SliverErrorBodyPlaceholder(t.printError(error)),
                 _ => const SliverToBoxAdapter(),
               },
             ],

lib/features/home/widgets/connection_button.dart

@@ -24,13 +24,12 @@ class ConnectionButton extends HookConsumerWidget {
       connectivityControllerProvider,
       (_, next) {
         if (next case AsyncError(:final error)) {
-          CustomToast.error(t.presentError(error)).show(context);
+          CustomAlertDialog.fromErr(t.presentError(error)).show(context);
         }
         if (next
             case AsyncData(value: Disconnected(:final connectionFailure?))) {
-          CustomAlertDialog(
+          CustomAlertDialog.fromErr(t.presentError(connectionFailure))
-            message: connectionFailure.present(t),
+              .show(context);
-          ).show(context);
         }
       },
     );

lib/features/logs/view/logs_page.dart

@@ -138,7 +138,7 @@ class LogsPage extends HookConsumerWidget with PresLogger {
               NestedTabAppBar(
                 title: Text(t.logs.pageTitle.titleCase),
               ),
-              SliverErrorBodyPlaceholder(t.presentError(error)),
+              SliverErrorBodyPlaceholder(t.printError(error)),
             ],
           ),
         );

lib/features/profile_detail/view/profile_detail_page.dart

@@ -38,7 +38,7 @@ class ProfileDetailPage extends HookConsumerWidget with PresLogger {
         if (asyncSave case AsyncData(value: final save)) {
           switch (save) {
             case MutationFailure(:final failure):
-              CustomToast.error(t.presentError(failure)).show(context);
+              CustomToast.error(t.printError(failure)).show(context);
             case MutationSuccess():
               CustomToast.success(t.profile.save.successMsg.sentenceCase)
                   .show(context);
@@ -58,7 +58,7 @@ class ProfileDetailPage extends HookConsumerWidget with PresLogger {
         if (asyncSave case AsyncData(value: final delete)) {
           switch (delete) {
             case MutationFailure(:final failure):
-              CustomToast.error(t.presentError(failure)).show(context);
+              CustomToast.error(t.printError(failure)).show(context);
             case MutationSuccess():
               CustomToast.success(t.profile.delete.successMsg.sentenceCase)
                   .show(context);

lib/features/profiles/view/add_profile_modal.dart

@@ -30,7 +30,8 @@ class AddProfileModal extends HookConsumerWidget {
     final addProfileMutation = useMutation(
       initialOnFailure: (err) {
         mutationTriggered.value = false;
-        CustomToast.error(t.presentError(err)).show(context);
+        // CustomToast.error(t.presentError(err)).show(context);
+        CustomAlertDialog.fromErr(t.presentError(err)).show(context);
       },
       initialOnSuccess: () {
         CustomToast.success(t.profile.save.successMsg.sentenceCase)

lib/features/profiles/view/profiles_modal.dart

@@ -38,7 +38,7 @@ class ProfilesModal extends HookConsumerWidget {
                   itemCount: profiles.length,
                 ),
               AsyncError(:final error) => SliverErrorBodyPlaceholder(
-                  t.presentError(error),
+                  t.printError(error),
                 ),
               AsyncLoading() => const SliverLoadingBodyPlaceholder(),
               _ => const SliverToBoxAdapter(),

lib/features/proxies/view/proxies_page.dart

@@ -22,7 +22,7 @@ class ProxiesPage extends HookConsumerWidget with PresLogger {
 
     final selectActiveProxyMutation = useMutation(
       initialOnFailure: (error) =>
-          CustomToast.error(t.presentError(error)).show(context),
+          CustomToast.error(t.printError(error)).show(context),
     );
 
     switch (asyncProxies) {
@@ -148,7 +148,7 @@ class ProxiesPage extends HookConsumerWidget with PresLogger {
                 title: Text(t.proxies.pageTitle.titleCase),
               ),
               SliverErrorBodyPlaceholder(
-                t.presentError(error),
+                t.printError(error),
                 icon: null,
               ),
             ],

lib/utils/alerts.dart

@@ -11,6 +11,12 @@ class CustomAlertDialog extends StatelessWidget {
   final String? title;
   final String message;
 
+  factory CustomAlertDialog.fromErr(({String type, String? message}) err) =>
+      CustomAlertDialog(
+        title: err.message == null ? null : err.type,
+        message: err.message ?? err.type,
+      );
+
   Future<void> show(BuildContext context) async {
     await showDialog(
       context: context,