Merge pull request #1145 from cypherstack/factorn

Factorn

Author: julian-CStack

asset_sources/default_themes/stack_duo/dark.zip

@@ -101,7 +101,8 @@ class Address extends CryptoCurrencyAddress {
   }
 
   @override
-  String toString() => "{ "
+  String toString() =>
+      "{ "
       "id: $id, "
       "walletId: $walletId, "
       "value: $value, "
@@ -130,10 +131,7 @@ class Address extends CryptoCurrencyAddress {
     return jsonEncode(result);
   }
 
-  static Address fromJsonString(
-    String jsonString, {
-    String? overrideWalletId,
-  }) {
+  static Address fromJsonString(String jsonString, {String? overrideWalletId}) {
     final json = jsonDecode(jsonString);
     final derivationPathString = json["derivationPath"] as String?;
 
@@ -176,7 +174,8 @@ enum AddressType {
   p2tr,
   solana,
   cardanoShelley,
-  xelis;
+  xelis,
+  fact0rn;
 
   String get readableName {
     switch (this) {
@@ -216,6 +215,8 @@ enum AddressType {
         return "Cardano Shelley";
       case AddressType.xelis:
         return "Xelis";
+      case AddressType.fact0rn:
+        return "FACT0RN";
     }
   }
 }

asset_sources/default_themes/stack_duo/light.zip

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:barcode_scan2/barcode_scan2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -14,6 +13,7 @@ import '../../../../providers/providers.dart';
 import '../../../../services/frost.dart';
 import '../../../../themes/stack_colors.dart';
 import '../../../../utilities/assets.dart';
+import '../../../../utilities/barcode_scanner_interface.dart';
 import '../../../../utilities/constants.dart';
 import '../../../../utilities/logger.dart';
 import '../../../../utilities/show_loading.dart';
@@ -212,7 +212,7 @@ class _RestoreFrostMsWalletViewState
           await Future<void>.delayed(const Duration(milliseconds: 75));
         }
 
-        final qrResult = await BarcodeScanner.scan();
+        final qrResult = await ref.read(pBarcodeScanner).scan();
 
         configFieldController.text = qrResult.rawContent;
 
@@ -238,11 +238,26 @@ class _RestoreFrostMsWalletViewState
         }
       }
     } on PlatformException catch (e, s) {
-      Logging.instance.w(
-        "Failed to get camera permissions while trying to scan qr code: ",
-        error: e,
-        stackTrace: s,
-      );
+      if (mounted) {
+        try {
+          await checkCamPermDeniedMobileAndOpenAppSettings(
+            context,
+            logging: Logging.instance,
+          );
+        } catch (e, s) {
+          Logging.instance.e(
+            "Failed to check cam permissions",
+            error: e,
+            stackTrace: s,
+          );
+        }
+      } else {
+        Logging.instance.w(
+          "Failed to get camera permissions while trying to scan qr code: ",
+          error: e,
+          stackTrace: s,
+        );
+      }
     }
   }
 

asset_sources/default_themes/stack_wallet/dark.zip

@@ -15,7 +15,6 @@ import '../../../providers/global/secure_store_provider.dart';
 import '../../../providers/providers.dart';
 import '../../../themes/stack_colors.dart';
 import '../../../utilities/assets.dart';
-import '../../../utilities/barcode_scanner_interface.dart';
 import '../../../utilities/clipboard_interface.dart';
 import '../../../utilities/constants.dart';
 import '../../../utilities/text_styles.dart';
@@ -50,7 +49,7 @@ class RestoreViewOnlyWalletView extends ConsumerStatefulWidget {
     required this.coin,
     required this.restoreBlockHeight,
     this.enableLelantusScanning = false,
-    this.barcodeScanner = const BarcodeScannerWrapper(),
+
     this.clipboard = const ClipboardWrapper(),
   });
 
@@ -60,7 +59,6 @@ class RestoreViewOnlyWalletView extends ConsumerStatefulWidget {
   final CryptoCurrency coin;
   final int restoreBlockHeight;
   final bool enableLelantusScanning;
-  final BarcodeScannerInterface barcodeScanner;
   final ClipboardInterface clipboard;
 
   @override

asset_sources/default_themes/stack_wallet/light.zip

@@ -78,7 +78,7 @@ class RestoreWalletView extends ConsumerStatefulWidget {
     required this.mnemonicPassphrase,
     required this.restoreBlockHeight,
     this.enableLelantusScanning = false,
-    this.barcodeScanner = const BarcodeScannerWrapper(),
+
     this.clipboard = const ClipboardWrapper(),
   });
 
@@ -91,7 +91,6 @@ class RestoreWalletView extends ConsumerStatefulWidget {
   final int restoreBlockHeight;
   final bool enableLelantusScanning;
 
-  final BarcodeScannerInterface barcodeScanner;
   final ClipboardInterface clipboard;
 
   @override
@@ -111,8 +110,6 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
   final List<FormInputStatus> _inputStatuses = [];
   // final List<FocusNode> _focusNodes = [];
 
-  late final BarcodeScannerInterface scanner;
-
   late final TextSelectionControls textSelectionControls;
 
   bool _hideSeedWords = false;
@@ -162,7 +159,6 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
             ? CustomCupertinoTextSelectionControls(onPaste: onControlsPaste)
             : CustomMaterialTextSelectionControls(onPaste: onControlsPaste);
 
-    scanner = widget.barcodeScanner;
     for (int i = 0; i < _seedWordCount; i++) {
       _controllers.add(TextEditingController());
       _inputStatuses.add(FormInputStatus.empty);
@@ -608,7 +604,7 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
 
   Future<void> scanMnemonicQr() async {
     try {
-      final qrResult = await scanner.scan();
+      final qrResult = await ref.read(pBarcodeScanner).scan();
 
       final results = AddressUtils.decodeQRSeedData(qrResult.rawContent);
 
@@ -625,11 +621,26 @@ class _RestoreWalletViewState extends ConsumerState<RestoreWalletView> {
       }
     } on PlatformException catch (e, s) {
       // likely failed to get camera permissions
-      Logging.instance.e(
-        "Restore wallet qr scan failed: $e",
-        error: e,
-        stackTrace: s,
-      );
+      if (mounted) {
+        try {
+          await checkCamPermDeniedMobileAndOpenAppSettings(
+            context,
+            logging: Logging.instance,
+          );
+        } catch (e, s) {
+          Logging.instance.e(
+            "Failed to check cam permissions",
+            error: e,
+            stackTrace: s,
+          );
+        }
+      } else {
+        Logging.instance.e(
+          "Restore wallet qr scan failed: $e",
+          error: e,
+          stackTrace: s,
+        );
+      }
     }
   }
 

lib/models/isar/models/blockchain_data/address.dart

@@ -21,7 +21,6 @@ import '../../../providers/ui/address_book_providers/contact_name_is_not_empty_s
 import '../../../providers/ui/address_book_providers/valid_contact_state_provider.dart';
 import '../../../themes/stack_colors.dart';
 import '../../../utilities/assets.dart';
-import '../../../utilities/barcode_scanner_interface.dart';
 import '../../../utilities/clipboard_interface.dart';
 import '../../../utilities/constants.dart';
 import '../../../utilities/text_styles.dart';
@@ -43,13 +42,11 @@ import 'new_contact_address_entry_form.dart';
 class AddAddressBookEntryView extends ConsumerStatefulWidget {
   const AddAddressBookEntryView({
     super.key,
-    this.barcodeScanner = const BarcodeScannerWrapper(),
     this.clipboard = const ClipboardWrapper(),
   });
 
   static const String routeName = "/addAddressBookEntry";
 
-  final BarcodeScannerInterface barcodeScanner;
   final ClipboardInterface clipboard;
 
   @override
@@ -63,7 +60,6 @@ class _AddAddressBookEntryViewState
   late final FocusNode nameFocusNode;
   late final ScrollController scrollController;
 
-  late final BarcodeScannerInterface scanner;
   late final ClipboardInterface clipboard;
 
   Emoji? _selectedEmoji;
@@ -72,7 +68,7 @@ class _AddAddressBookEntryViewState
   @override
   initState() {
     ref.refresh(addressEntryDataProviderFamilyRefresher);
-    scanner = widget.barcodeScanner;
+
     clipboard = widget.clipboard;
 
     nameController = TextEditingController();
@@ -114,7 +110,6 @@ class _AddAddressBookEntryViewState
         key: Key("contactAddressEntryForm_$id"),
         id: ref.read(addressEntryDataProvider(id)).id,
         clipboard: clipboard,
-        barcodeScanner: scanner,
       ),
     );
     setState(() {});

lib/pages/add_wallet_views/frost_ms/restore/restore_frost_ms_wallet_view.dart

@@ -18,7 +18,6 @@ import '../../../providers/ui/address_book_providers/address_entry_data_provider
 import '../../../providers/ui/address_book_providers/valid_contact_state_provider.dart';
 import '../../../themes/stack_colors.dart';
 import '../../../utilities/assets.dart';
-import '../../../utilities/barcode_scanner_interface.dart';
 import '../../../utilities/clipboard_interface.dart';
 import '../../../utilities/text_styles.dart';
 import '../../../utilities/util.dart';
@@ -33,15 +32,13 @@ class AddNewContactAddressView extends ConsumerStatefulWidget {
   const AddNewContactAddressView({
     super.key,
     required this.contactId,
-    this.barcodeScanner = const BarcodeScannerWrapper(),
     this.clipboard = const ClipboardWrapper(),
   });
 
   static const String routeName = "/addNewContactAddress";
 
   final String contactId;
 
-  final BarcodeScannerInterface barcodeScanner;
   final ClipboardInterface clipboard;
 
   @override
@@ -53,13 +50,12 @@ class _AddNewContactAddressViewState
     extends ConsumerState<AddNewContactAddressView> {
   late final String contactId;
 
-  late final BarcodeScannerInterface barcodeScanner;
   late final ClipboardInterface clipboard;
 
   @override
   void initState() {
     contactId = widget.contactId;
-    barcodeScanner = widget.barcodeScanner;
+
     clipboard = widget.clipboard;
 
     super.initState();
@@ -173,11 +169,7 @@ class _AddNewContactAddressViewState
             ],
           ),
           const SizedBox(height: 16),
-          NewContactAddressEntryForm(
-            id: 0,
-            barcodeScanner: barcodeScanner,
-            clipboard: clipboard,
-          ),
+          NewContactAddressEntryForm(id: 0, clipboard: clipboard),
           const SizedBox(height: 16),
           const Spacer(),
           Row(