Merge pull request #783 from atsign-foundation/feat/onboarding_fixes_…

…windows fix: windows onboarding fixes
atsign-foundation · Jan 10, 2024 · 169a89f · 169a89f
2 parents 7b3d076 + 5e15e70
commit 169a89f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_home_screen.dart
@@ -537,11 +537,11 @@ class _AtOnboardingHomeScreenState extends State<AtOnboardingHomeScreen> {
   Future<String?> _desktopKeyPicker() async {
     try {
       XFile? file = await openFile(
-        acceptedTypeGroups: const [
+        acceptedTypeGroups: [
           // General file extensions
-          XTypeGroup(extensions: ['atKeys', 'atkeys']),
+          const XTypeGroup(extensions: ['atKeys', 'atkeys']),
           // Apple specific UTIs
-          XTypeGroup(uniformTypeIdentifiers: ['com.atsign.atkeys']),
+          XTypeGroup(uniformTypeIdentifiers: Platform.isMacOS ? ['com.atsign.atkeys'] : null),
         ],
       );
       return file?.path;

diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart
@@ -8,6 +8,7 @@ import 'package:at_onboarding_flutter/screen/at_onboarding_intro_screen.dart';
 import 'package:at_onboarding_flutter/services/at_onboarding_config.dart';
 import 'package:at_onboarding_flutter/services/onboarding_service.dart';
 import 'package:at_onboarding_flutter/utils/at_onboarding_dimens.dart';
+import 'package:at_onboarding_flutter/utils/at_onboarding_error_util.dart';
 import 'package:at_onboarding_flutter/widgets/at_onboarding_button.dart';
 import 'package:at_onboarding_flutter/widgets/at_onboarding_dialog.dart';
 import 'package:at_sync_ui_flutter/at_sync_material.dart';
@@ -93,10 +94,11 @@ class _AtOnboardingStartScreenState extends State<AtOnboardingStartScreen> {
         Navigator.pop(context, result);
       } else {
         if (!mounted) return;
+        var message = AtOnboardingErrorToString().getErrorMessage(e);
         Navigator.pop(
           context,
           AtOnboardingResult.error(
-            message: "$e",
+            message: message,
           ),
         );
       }