Merge branch 'main' of https://github.com/steel97/veil_wallet

steel97 · Dec 2, 2023 · 1bb9a9d · 1bb9a9d
2 parents 1efb37f + 4e5192b
commit 1bb9a9d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/lib/src/core/func_checker.dart b/lib/src/core/func_checker.dart
@@ -0,0 +1,16 @@
+import 'dart:io';
+import 'package:local_auth/local_auth.dart';
+
+var auth = LocalAuthentication();
+
+Future<bool> checkBiometricsSupport()  async{
+  if(Platform.isLinux || Platform.isFuchsia) {
+    return false;
+  }
+
+  final bool canAuthenticateWithBiometrics =
+    await auth.canCheckBiometrics;
+  final bool canAuthenticate = canAuthenticateWithBiometrics ||
+    await auth.isDeviceSupported();
+  return canAuthenticate;
+}
diff --git a/lib/src/core/wallet_helper.dart b/lib/src/core/wallet_helper.dart
@@ -98,12 +98,13 @@ class WalletHelper {
         continue;
       }
 
-      reconstructedWallets.add(rndWalletId.toString());
-      await storageService.writeSecureData(
-          StorageItem(prefsWalletsStorage, reconstructedWallets.join(',')));
       break;
     }
 
+    reconstructedWallets.add(rndWalletId.toString());
+    await storageService.writeSecureData(
+    StorageItem(prefsWalletsStorage, reconstructedWallets.join(',')));
+
     // 2. save wallet name
     await storageService.writeSecureData(
         StorageItem(prefsWalletNames + rndWalletId.toString(), walletName));

diff --git a/lib/src/views/import_seed.dart b/lib/src/views/import_seed.dart
@@ -2,9 +2,9 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:local_auth/local_auth.dart';
 import 'package:veil_light_plugin/veil_light.dart';
 import 'package:veil_wallet/src/core/constants.dart';
+import 'package:veil_wallet/src/core/func_checker.dart';
 import 'package:veil_wallet/src/core/screen.dart';
 import 'package:veil_wallet/src/core/wallet_helper.dart';
 import 'package:veil_wallet/src/helpers/responsive.dart';
@@ -48,7 +48,7 @@ class _ImportSeedState extends State<ImportSeed> {
         canPop: false,
         child: BackLayout(
             title: AppLocalizations.of(context)?.importSeedTitle,
-            back: () {
+            back: _importLoading ? null : () {
               _backAction();
             },
             child: Form(
@@ -174,13 +174,7 @@ class _ImportSeedState extends State<ImportSeed> {
                                       .add(element.text.toLowerCase().trim());
                                 }
 
-                                var auth = LocalAuthentication();
-                                final bool canAuthenticateWithBiometrics =
-                                    await auth.canCheckBiometrics;
-                                final bool canAuthenticate =
-                                    canAuthenticateWithBiometrics ||
-                                        await auth.isDeviceSupported();
-
+                                final bool canAuthenticate = await checkBiometricsSupport();
                                 if (BaseStaticState.prevScreen ==
                                         Screen.settings ||
                                     !canAuthenticate) {

diff --git a/lib/src/views/new_wallet_verify_seed.dart b/lib/src/views/new_wallet_verify_seed.dart
@@ -2,9 +2,9 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:local_auth/local_auth.dart';
 import 'package:veil_light_plugin/veil_light.dart';
 import 'package:veil_wallet/src/core/constants.dart';
+import 'package:veil_wallet/src/core/func_checker.dart';
 import 'package:veil_wallet/src/core/screen.dart';
 import 'package:veil_wallet/src/core/wallet_helper.dart';
 import 'package:veil_wallet/src/helpers/responsive.dart';
@@ -30,7 +30,7 @@ class _NewWalletVerifySeedState extends State<NewWalletVerifySeed> {
     return PopScope(
         child: BackLayout(
             title: AppLocalizations.of(context)?.verifySeedPhraseTitle,
-            back: () {
+            back: _createLoading ? null : () {
               Navigator.of(context).push(_createBackRoute());
             },
             child: Form(
@@ -120,13 +120,7 @@ class _NewWalletVerifySeedState extends State<NewWalletVerifySeed> {
                                 }
 
                                 // move to biometrics if not opened from settings
-                                var auth = LocalAuthentication();
-                                final bool canAuthenticateWithBiometrics =
-                                    await auth.canCheckBiometrics;
-                                final bool canAuthenticate =
-                                    canAuthenticateWithBiometrics ||
-                                        await auth.isDeviceSupported();
-
+                                final bool canAuthenticate = await checkBiometricsSupport();
                                 if (BaseStaticState.prevScreen ==
                                         Screen.settings ||
                                     !canAuthenticate) {

diff --git a/lib/src/views/settings.dart b/lib/src/views/settings.dart
@@ -5,6 +5,7 @@ import 'package:local_auth/local_auth.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:veil_wallet/src/core/constants.dart';
+import 'package:veil_wallet/src/core/func_checker.dart';
 import 'package:veil_wallet/src/core/locale_entry.dart';
 import 'package:veil_wallet/src/core/node_entry.dart';
 import 'package:veil_wallet/src/core/screen.dart';
@@ -45,12 +46,6 @@ class _SettingsState extends State<Settings> {
   String _localeTmp = '';
   String _selectedNode = defaultNodeAddress;
 
-  Future<bool> checkBiometricsPossible() async {
-    var auth = LocalAuthentication();
-    final bool canAuthenticateWithBiometrics = await auth.canCheckBiometrics;
-    return canAuthenticateWithBiometrics || await auth.isDeviceSupported();
-  }
-
   @override
   void initState() {
     super.initState();
@@ -78,7 +73,7 @@ class _SettingsState extends State<Settings> {
 
     _darkMode = context.read<WalletState>().darkMode;
 
-    var biometricsPossibleFeature = checkBiometricsPossible();
+    var biometricsPossibleFeature = checkBiometricsSupport();
 
     List<Widget> authActions = [];