Revert "version bump to 3.13.9, auth working on mac (#1367)" (#1397)

This reverts commit e6b4b08c24.

.github/workflows/pr_test_build.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v1
         with:
-          flutter-version: "3.13.9"
+          flutter-version: "3.10.x"
           channel: stable
 
       - name: Install package dependencies

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.8.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         jcenter()

cw_bitcoin/pubspec.yaml

@@ -39,14 +39,11 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
   build_resolvers: ^2.0.9
   mobx_codegen: ^2.0.7
   hive_generator: ^1.1.3
 
-dependency_overrides:
-  watcher: ^1.1.0
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 

cw_bitcoin_cash/pubspec.yaml

@@ -39,13 +39,10 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
   mobx_codegen: ^2.0.7
   hive_generator: ^1.1.3
 
-dependency_overrides:
-  watcher: ^1.1.0
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 

cw_core/pubspec.yaml

@@ -28,14 +28,11 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
   build_resolvers: ^2.0.9
   mobx_codegen: ^2.0.7
   hive_generator: ^2.0.1
 
-dependency_overrides:
-  watcher: ^1.1.0
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 

cw_ethereum/pubspec.yaml

@@ -22,11 +22,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
-
-dependency_overrides:
-  watcher: ^1.1.0
-
 flutter:
   # assets:
   #   - images/a_dot_burr.jpeg

cw_evm/pubspec.yaml

@@ -27,14 +27,11 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
   mobx_codegen: ^2.0.7
   hive_generator: ^1.1.3
   flutter_lints: ^2.0.0
 
-dependency_overrides:
-  watcher: ^1.1.0
-
 flutter:
   # assets:
   #   - images/a_dot_burr.jpeg

cw_haven/pubspec.yaml

@@ -24,14 +24,11 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
   mobx_codegen: ^2.0.7
   build_resolvers: ^2.0.9
   hive_generator: ^1.1.3
 
-dependency_overrides:
-  watcher: ^1.1.0
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 

cw_monero/pubspec.yaml

@@ -26,14 +26,11 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
   build_resolvers: ^2.0.9
   mobx_codegen: ^2.0.7
   hive_generator: ^1.1.3
 
-dependency_overrides:
-  watcher: ^1.1.0
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 

cw_nano/pubspec.yaml

@@ -32,13 +32,10 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
   mobx_codegen: ^2.0.7
   hive_generator: ^1.1.3
 
-dependency_overrides:
-  watcher: ^1.1.0
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 

cw_polygon/pubspec.yaml

@@ -28,10 +28,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^2.0.0
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
-
-dependency_overrides:
-  watcher: ^1.1.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

cw_solana/pubspec.yaml

@@ -26,13 +26,10 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^2.0.0
-  build_runner: ^2.4.7
+  build_runner: ^2.1.11
   mobx_codegen: ^2.0.7
   hive_generator: ^1.1.3
 
-dependency_overrides:
-  watcher: ^1.1.0
-
 flutter:
   # assets:
   #   - images/a_dot_burr.jpeg

lib/entities/biometric_auth.dart

@@ -1,28 +1,32 @@
+import 'package:local_auth/local_auth.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_local_authentication/flutter_local_authentication.dart';
+import 'package:cake_wallet/generated/i18n.dart';
 
 class BiometricAuth {
-  final _flutterLocalAuthenticationPlugin = FlutterLocalAuthentication();
+  final _localAuth = LocalAuthentication();
 
   Future<bool> isAuthenticated() async {
     try {
-      final authenticated = await _flutterLocalAuthenticationPlugin.authenticate();
+      return await _localAuth.authenticate(
-      return authenticated;
+          localizedReason: S.current.biometric_auth_reason,
-    } catch (e) {
+          options: AuthenticationOptions(
+            biometricOnly: true,
+            useErrorDialogs: true,
+            stickyAuth: false));
+    } on PlatformException catch (e) {
       print(e);
     }
+
     return false;
   }
 
   Future<bool> canCheckBiometrics() async {
-    bool canAuthenticate;
     try {
-      canAuthenticate = await _flutterLocalAuthenticationPlugin.canAuthenticate();
+      return await _localAuth.canCheckBiometrics;
-    } catch (error) {
+    } on PlatformException catch (e) {
-      print("Exception checking support. $error");
+      print(e);
-      canAuthenticate = false;
     }
 
-    return canAuthenticate;
+    return false;
   }
 }

lib/locales/hausa_intl.dart

@@ -751,50 +751,6 @@ class HaMaterialLocalizations extends GlobalMaterialLocalizations {
 
   @override
   String get scrimOnTapHintRaw => "Scrip on Tap";
-
-  @override
-  // TODO: implement collapsedHint
-  String get collapsedHint => "collapsedHint";
-
-  @override
-  // TODO: implement expandedHint
-  String get expandedHint => "expandedHint";
-
-  @override
-  // TODO: implement expansionTileCollapsedHint
-  String get expansionTileCollapsedHint => "expansionTileCollapsedHint";
-
-  @override
-  // TODO: implement expansionTileCollapsedTapHint
-  String get expansionTileCollapsedTapHint => "expansionTileCollapsedTapHint";
-
-  @override
-  // TODO: implement expansionTileExpandedHint
-  String get expansionTileExpandedHint => "expansionTileExpandedHint";
-
-  @override
-  // TODO: implement expansionTileExpandedTapHint
-  String get expansionTileExpandedTapHint => "expansionTileExpandedTapHint";
-
-  @override
-  // TODO: implement scanTextButtonLabel
-  String get scanTextButtonLabel => "scanTextButtonLabel";
-
-  @override
-  // TODO: implement lookUpButtonLabel
-  String get lookUpButtonLabel => "lookUpButtonLabel";
-
-  @override
-  // TODO: implement menuDismissLabel
-  String get menuDismissLabel => "menuDismissLabel";
-
-  @override
-  // TODO: implement searchWebButtonLabel
-  String get searchWebButtonLabel => "searchWebButtonLabel";
-
-  @override
-  // TODO: implement shareButtonLabel
-  String get shareButtonLabel => "shareButtonLabel";
 }
 
 /// Cupertino Support
@@ -999,24 +955,4 @@ class HaCupertinoLocalizations extends GlobalCupertinoLocalizations {
 
   @override
   String get noSpellCheckReplacementsLabel => "";
-
-  @override
-  // TODO: implement clearButtonLabel
-  String get clearButtonLabel => "clearButtonLabel";
-
-  @override
-  // TODO: implement lookUpButtonLabel
-  String get lookUpButtonLabel => "lookUpButtonLabel";
-
-  @override
-  // TODO: implement menuDismissLabel
-  String get menuDismissLabel => "menuDismissLabel";
-
-  @override
-  // TODO: implement searchWebButtonLabel
-  String get searchWebButtonLabel => "searchWebButtonLabel";
-
-  @override
-  // TODO: implement shareButtonLabel
-  String get shareButtonLabel => "shareButtonLabel";
 }

lib/locales/yoruba_intl.dart

@@ -1,3 +1,4 @@
+
 import 'dart:async';
 
 import 'package:flutter/cupertino.dart';
@@ -750,50 +751,6 @@ class YoMaterialLocalizations extends GlobalMaterialLocalizations {
 
   @override
   String get scrimOnTapHintRaw => "Scrip on Tap";
-
-  @override
-  // TODO: implement collapsedHint
-  String get collapsedHint => "collapsedHint";
-
-  @override
-  // TODO: implement expandedHint
-  String get expandedHint => "expandedHint";
-
-  @override
-  // TODO: implement expansionTileCollapsedHint
-  String get expansionTileCollapsedHint => "expansionTileCollapsedHint";
-
-  @override
-  // TODO: implement expansionTileCollapsedTapHint
-  String get expansionTileCollapsedTapHint => "expansionTileCollapsedTapHint";
-
-  @override
-  // TODO: implement expansionTileExpandedHint
-  String get expansionTileExpandedHint => "expansionTileExpandedHint";
-
-  @override
-  // TODO: implement expansionTileExpandedTapHint
-  String get expansionTileExpandedTapHint => "expansionTileExpandedTapHint";
-
-  @override
-  // TODO: implement scanTextButtonLabel
-  String get scanTextButtonLabel => "scanTextButtonLabel";
-
-  @override
-  // TODO: implement lookUpButtonLabel
-  String get lookUpButtonLabel => "lookUpButtonLabel";
-
-  @override
-  // TODO: implement menuDismissLabel
-  String get menuDismissLabel => "menuDismissLabel";
-
-  @override
-  // TODO: implement searchWebButtonLabel
-  String get searchWebButtonLabel => "searchWebButtonLabel";
-
-  @override
-  // TODO: implement shareButtonLabel
-  String get shareButtonLabel => "shareButtonLabel";
 }
 
 /// Cupertino Support
@@ -998,24 +955,4 @@ class YoCupertinoLocalizations extends GlobalCupertinoLocalizations {
 
   @override
   String get noSpellCheckReplacementsLabel => "";
-
-  @override
-  // TODO: implement clearButtonLabel
-  String get clearButtonLabel => "clearButtonLabel";
-
-  @override
-  // TODO: implement lookUpButtonLabel
-  String get lookUpButtonLabel => "lookUpButtonLabel";
-
-  @override
-  // TODO: implement menuDismissLabel
-  String get menuDismissLabel => "menuDismissLabel";
-
-  @override
-  // TODO: implement searchWebButtonLabel
-  String get searchWebButtonLabel => "searchWebButtonLabel";
-
-  @override
-  // TODO: implement shareButtonLabel
-  String get shareButtonLabel => "shareButtonLabel";
 }

lib/src/screens/settings/security_backup_page.dart

@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/entities/pin_code_required_duration.dart';
 import 'package:cake_wallet/routes.dart';
@@ -60,7 +58,7 @@ class SecurityBackupPage extends BasePage {
                   .shouldRequireTOTP2FAForAllSecurityAndBackupSettings,
             ),
           ),
-          if (DeviceInfo.instance.isMobile || Platform.isMacOS || Platform.isLinux)
+          if (DeviceInfo.instance.isMobile)
             Observer(builder: (_) {
               return SettingsSwitcherCell(
                   title: S.current.settings_allow_biometrical_authentication,

lib/src/screens/settings/tor_page.dart

@@ -146,7 +146,7 @@ class ConnectScreen extends StatelessWidget {
           ElevatedButton(
             onPressed: connect,
             style: ElevatedButton.styleFrom(
-              // primary: Colors.blue,
+              primary: Colors.blue,
               padding: EdgeInsets.symmetric(horizontal: 40, vertical: 15),
               shape: RoundedRectangleBorder(
                 borderRadius: BorderRadius.circular(30),
@@ -211,7 +211,7 @@ class DisconnectScreen extends StatelessWidget {
           ElevatedButton(
             onPressed: disconnect,
             style: ElevatedButton.styleFrom(
-              // primary: Colors.red,
+              primary: Colors.red,
               padding: EdgeInsets.symmetric(horizontal: 40, vertical: 15),
               shape: RoundedRectangleBorder(
                 borderRadius: BorderRadius.circular(30),

lib/src/widgets/validable_annotated_editable_text.dart

@@ -1,14 +1,8 @@
+import 'package:cake_wallet/core/seed_validator.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 
-
+class Annotation extends Comparable<Annotation> {
-extension Compare<T> on Comparable<T> {
-  bool operator <=(T other) => compareTo(other) <= 0;
-  bool operator >=(T other) => compareTo(other) >= 0;
-  bool operator <(T other) => compareTo(other) < 0;
-  bool operator >(T other) => compareTo(other) > 0;
-}
-
-class Annotation implements Comparable<Annotation> {
   Annotation({required this.range, required this.style});
 
   final TextRange range;
@@ -18,7 +12,7 @@ class Annotation implements Comparable<Annotation> {
   int compareTo(Annotation other) => range.start.compareTo(other.range.start);
 }
 
-class TextAnnotation implements Comparable<TextAnnotation> {
+class TextAnnotation extends Comparable<TextAnnotation> {
   TextAnnotation({required this.text, required this.style});
 
   final TextStyle style;

lib/view_model/auth_view_model.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
-import 'package:flutter_local_authentication/flutter_local_authentication.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/view_model/auth_state.dart';
@@ -106,14 +105,16 @@ abstract class AuthViewModelBase with Store {
 
   @action
   Future<void> biometricAuth() async {
-    final _flutterLocalAuthenticationPlugin = FlutterLocalAuthentication();
-
     try {
-      final authenticated = await _flutterLocalAuthenticationPlugin.authenticate();
+      final canBiometricAuth = await _biometricAuth.canCheckBiometrics();
-      if (!authenticated) {
+
-        throw Exception('Biometric authentication failed');
+      if (canBiometricAuth) {
-      }
+        final isAuthenticated = await _biometricAuth.isAuthenticated();
+
+        if (isAuthenticated) {
           state = ExecutedSuccessfullyState();
+        }
+      }
     } catch (e) {
       state = FailureState(e.toString());
     }

pubspec_base.yaml

@@ -33,8 +33,8 @@ dependencies:
   dio: ^4.0.6
   hive: ^2.2.3
   hive_flutter: ^1.1.0
+  local_auth: ^2.1.0
   local_auth_android: 1.0.21
-  flutter_local_authentication: ^1.2.0
   package_info: ^2.0.0
   #package_info_plus: ^1.4.2
   devicelocale:

pubspec_description.yaml

@@ -4,4 +4,4 @@ version: 0.0.0
 publish_to: none
 
 environment:
-  sdk: ">=3.1.0 <4.0.0"
+  sdk: ">=2.17.5 <3.0.0"