Merge branch 'staging' into add-xtz

lib/electrumx_rpc/cached_electrumx.dart

@@ -167,8 +167,8 @@ class CachedElectrumX {
       Set<String> cachedSerials =
           _list == null ? {} : List<String>.from(_list).toSet();
 
-      // startNumber is broken currently
+      final startNumber =
-      final startNumber = 0; // cachedSerials.length;
+          cachedSerials.length - 10; // 10 being some arbitrary buffer
 
       final serials = await electrumXClient.getUsedCoinSerials(
         startNumber: startNumber,

lib/pages/send_view/confirm_transaction_view.dart

@@ -89,6 +89,11 @@ class _ConfirmTransactionViewState
   late final FocusNode _noteFocusNode;
   late final TextEditingController noteController;
 
+
+  late final FocusNode _onChainNoteFocusNode;
+  late final TextEditingController onChainNoteController;
+
+
   Future<void> _attemptSend(BuildContext context) async {
     final manager =
         ref.read(walletsChangeNotifierProvider).getManager(walletId);
@@ -138,6 +143,9 @@ class _ConfirmTransactionViewState
           txidFuture = (manager.wallet as FiroWallet)
               .confirmSendPublic(txData: transactionInfo);
         } else {
+          if (coin == Coin.epicCash) {
+            transactionInfo["onChainNote"] = onChainNoteController.text;
+          }
           txidFuture = manager.confirmSend(txData: transactionInfo);
         }
       }
@@ -272,14 +280,21 @@ class _ConfirmTransactionViewState
     _noteFocusNode = FocusNode();
     noteController = TextEditingController();
     noteController.text = transactionInfo["note"] as String? ?? "";
+
+    _onChainNoteFocusNode = FocusNode();
+    onChainNoteController = TextEditingController();
+    onChainNoteController.text = transactionInfo["onChainNote"] as String? ?? "";
+
     super.initState();
   }
 
   @override
   void dispose() {
     noteController.dispose();
+    onChainNoteController.dispose();
 
     _noteFocusNode.dispose();
+    _onChainNoteFocusNode.dispose();
     super.dispose();
   }
 
@@ -840,8 +855,64 @@ class _ConfirmTransactionViewState
                   mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
+                    if (coin == Coin.epicCash)
+                      Text(
+                        "On chain Note (optional)",
+                        style: STextStyles.smallMed12(context),
+                        textAlign: TextAlign.left,
+                      ),
+                    if (coin == Coin.epicCash)
+                      const SizedBox(
+                        height: 8,
+                      ),
+                    if (coin == Coin.epicCash)
+                      ClipRRect(
+                        borderRadius: BorderRadius.circular(
+                          Constants.size.circularBorderRadius,
+                        ),
+                        child: TextField(
+                          autocorrect: Util.isDesktop ? false : true,
+                          enableSuggestions: Util.isDesktop ? false : true,
+                          maxLength: 256,
+                          controller: onChainNoteController,
+                          focusNode: _onChainNoteFocusNode,
+                          style: STextStyles.field(context),
+                          onChanged: (_) => setState(() {}),
+                          decoration: standardInputDecoration(
+                            "Type something...",
+                            _onChainNoteFocusNode,
+                            context,
+                          ).copyWith(
+                            suffixIcon: onChainNoteController.text.isNotEmpty
+                                ? Padding(
+                              padding:
+                              const EdgeInsets.only(right: 0),
+                              child: UnconstrainedBox(
+                                child: Row(
+                                  children: [
+                                    TextFieldIconButton(
+                                      child: const XIcon(),
+                                      onTap: () async {
+                                        setState(() {
+                                          onChainNoteController.text = "";
+                                        });
+                                      },
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            )
+                                : null,
+                          ),
+                        ),
+                      ),
+                    if (coin == Coin.epicCash)
+                      const SizedBox(
+                        height: 12,
+                      ),
                     Text(
-                      "Note (optional)",
+                      (coin == Coin.epicCash) ? "Local Note (optional)"
+                          : "Note (optional)",
                       style:
                           STextStyles.desktopTextExtraSmall(context).copyWith(
                         color: Theme.of(context)

lib/pages/special/firo_rescan_recovery_error_dialog.dart

@@ -0,0 +1,307 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:stackwallet/pages/pinpad_views/lock_screen_view.dart';
+import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart';
+import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_wallet_warning_view.dart';
+import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_delete_wallet_dialog.dart';
+import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/unlock_wallet_keys_desktop.dart';
+import 'package:stackwallet/providers/global/wallets_provider.dart';
+import 'package:stackwallet/route_generator.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/utilities/assets.dart';
+import 'package:stackwallet/utilities/text_styles.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/widgets/background.dart';
+import 'package:stackwallet/widgets/conditional_parent.dart';
+import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackwallet/widgets/custom_buttons/blue_text_button.dart';
+import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
+import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart';
+import 'package:stackwallet/widgets/desktop/primary_button.dart';
+import 'package:stackwallet/widgets/desktop/secondary_button.dart';
+import 'package:stackwallet/widgets/stack_dialog.dart';
+import 'package:tuple/tuple.dart';
+
+enum FiroRescanRecoveryErrorViewOption {
+  retry,
+  showMnemonic,
+  deleteWallet;
+}
+
+class FiroRescanRecoveryErrorView extends ConsumerStatefulWidget {
+  const FiroRescanRecoveryErrorView({
+    super.key,
+    required this.walletId,
+  });
+
+  static const String routeName = "/firoRescanRecoveryErrorView";
+
+  final String walletId;
+
+  @override
+  ConsumerState<FiroRescanRecoveryErrorView> createState() =>
+      _FiroRescanRecoveryErrorViewState();
+}
+
+class _FiroRescanRecoveryErrorViewState
+    extends ConsumerState<FiroRescanRecoveryErrorView> {
+  @override
+  Widget build(BuildContext context) {
+    return WillPopScope(
+      onWillPop: () async => false,
+      child: ConditionalParent(
+        condition: Util.isDesktop,
+        builder: (child) {
+          return DesktopScaffold(
+            appBar: DesktopAppBar(
+              background: Theme.of(context).extension<StackColors>()!.popupBG,
+              isCompactHeight: true,
+              // useSpacers: false,
+              trailing: Padding(
+                padding: const EdgeInsets.only(right: 16),
+                child: CustomTextButton(
+                  text: "Delete wallet",
+                  onTap: () async {
+                    final result = await showDialog<bool?>(
+                      context: context,
+                      barrierDismissible: false,
+                      builder: (context) => Navigator(
+                        initialRoute: DesktopDeleteWalletDialog.routeName,
+                        onGenerateRoute: RouteGenerator.generateRoute,
+                        onGenerateInitialRoutes: (_, __) {
+                          return [
+                            RouteGenerator.generateRoute(
+                              RouteSettings(
+                                name: DesktopDeleteWalletDialog.routeName,
+                                arguments: widget.walletId,
+                              ),
+                            ),
+                          ];
+                        },
+                      ),
+                    );
+
+                    if (result == true) {
+                      if (context.mounted) {
+                        Navigator.of(context).pop();
+                        Navigator.of(context).pop();
+                      }
+                    }
+                  },
+                ),
+              ),
+            ),
+            body: SizedBox(width: 328, child: child),
+          );
+        },
+        child: ConditionalParent(
+          condition: !Util.isDesktop,
+          builder: (child) {
+            return Background(
+              child: Scaffold(
+                backgroundColor:
+                    Theme.of(context).extension<StackColors>()!.background,
+                appBar: AppBar(
+                  automaticallyImplyLeading: false,
+                  actions: [
+                    Padding(
+                      padding: const EdgeInsets.only(
+                        top: 10,
+                        bottom: 10,
+                        right: 10,
+                      ),
+                      child: AspectRatio(
+                        aspectRatio: 1,
+                        child: AppBarIconButton(
+                          semanticsLabel: "Delete wallet button. "
+                              "Start process of deleting current wallet.",
+                          key: const Key("walletViewRadioButton"),
+                          size: 36,
+                          shadows: const [],
+                          color: Theme.of(context)
+                              .extension<StackColors>()!
+                              .background,
+                          icon: SvgPicture.asset(
+                            Assets.svg.trash,
+                            width: 20,
+                            height: 20,
+                            color: Theme.of(context)
+                                .extension<StackColors>()!
+                                .topNavIconPrimary,
+                          ),
+                          onPressed: () async {
+                            await showDialog<void>(
+                              barrierDismissible: true,
+                              context: context,
+                              builder: (_) => StackDialog(
+                                title:
+                                    "Do you want to delete ${ref.read(walletsChangeNotifierProvider).getManager(widget.walletId).walletName}?",
+                                leftButton: TextButton(
+                                  style: Theme.of(context)
+                                      .extension<StackColors>()!
+                                      .getSecondaryEnabledButtonStyle(context),
+                                  onPressed: () {
+                                    Navigator.pop(context);
+                                  },
+                                  child: Text(
+                                    "Cancel",
+                                    style: STextStyles.button(context).copyWith(
+                                        color: Theme.of(context)
+                                            .extension<StackColors>()!
+                                            .accentColorDark),
+                                  ),
+                                ),
+                                rightButton: TextButton(
+                                  style: Theme.of(context)
+                                      .extension<StackColors>()!
+                                      .getPrimaryEnabledButtonStyle(context),
+                                  onPressed: () {
+                                    Navigator.pop(context);
+                                    Navigator.push(
+                                      context,
+                                      RouteGenerator.getRoute(
+                                        shouldUseMaterialRoute:
+                                            RouteGenerator.useMaterialPageRoute,
+                                        builder: (_) => LockscreenView(
+                                          routeOnSuccessArguments:
+                                              widget.walletId,
+                                          showBackButton: true,
+                                          routeOnSuccess:
+                                              DeleteWalletWarningView.routeName,
+                                          biometricsCancelButtonString:
+                                              "CANCEL",
+                                          biometricsLocalizedReason:
+                                              "Authenticate to delete wallet",
+                                          biometricsAuthenticationTitle:
+                                              "Delete wallet",
+                                        ),
+                                        settings: const RouteSettings(
+                                            name: "/deleteWalletLockscreen"),
+                                      ),
+                                    );
+                                  },
+                                  child: Text(
+                                    "Delete",
+                                    style: STextStyles.button(context),
+                                  ),
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+                body: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: child,
+                ),
+              ),
+            );
+          },
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              if (!Util.isDesktop) const Spacer(),
+              Text(
+                "Failed to rescan firo wallet",
+                style: STextStyles.pageTitleH2(context),
+              ),
+              Util.isDesktop
+                  ? const SizedBox(
+                      height: 60,
+                    )
+                  : const Spacer(),
+              BranchedParent(
+                condition: Util.isDesktop,
+                conditionBranchBuilder: (children) => Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: children,
+                ),
+                otherBranchBuilder: (children) => Row(
+                  children: [
+                    Expanded(child: children[0]),
+                    children[1],
+                    Expanded(child: children[2]),
+                  ],
+                ),
+                children: [
+                  SecondaryButton(
+                    label: "Show mnemonic",
+                    buttonHeight: Util.isDesktop ? ButtonHeight.l : null,
+                    onPressed: () async {
+                      if (Util.isDesktop) {
+                        await showDialog<void>(
+                          context: context,
+                          barrierDismissible: false,
+                          builder: (context) => Navigator(
+                            initialRoute: UnlockWalletKeysDesktop.routeName,
+                            onGenerateRoute: RouteGenerator.generateRoute,
+                            onGenerateInitialRoutes: (_, __) {
+                              return [
+                                RouteGenerator.generateRoute(
+                                  RouteSettings(
+                                    name: UnlockWalletKeysDesktop.routeName,
+                                    arguments: widget.walletId,
+                                  ),
+                                )
+                              ];
+                            },
+                          ),
+                        );
+                      } else {
+                        final mnemonic = await ref
+                            .read(walletsChangeNotifierProvider)
+                            .getManager(widget.walletId)
+                            .mnemonic;
+
+                        if (mounted) {
+                          await Navigator.push(
+                            context,
+                            RouteGenerator.getRoute(
+                              shouldUseMaterialRoute:
+                                  RouteGenerator.useMaterialPageRoute,
+                              builder: (_) => LockscreenView(
+                                routeOnSuccessArguments:
+                                    Tuple2(widget.walletId, mnemonic),
+                                showBackButton: true,
+                                routeOnSuccess: WalletBackupView.routeName,
+                                biometricsCancelButtonString: "CANCEL",
+                                biometricsLocalizedReason:
+                                    "Authenticate to view recovery phrase",
+                                biometricsAuthenticationTitle:
+                                    "View recovery phrase",
+                              ),
+                              settings: const RouteSettings(
+                                  name: "/viewRecoverPhraseLockscreen"),
+                            ),
+                          );
+                        }
+                      }
+                    },
+                  ),
+                  const SizedBox(
+                    width: 16,
+                    height: 16,
+                  ),
+                  PrimaryButton(
+                    label: "Retry",
+                    buttonHeight: Util.isDesktop ? ButtonHeight.l : null,
+                    onPressed: () {
+                      Navigator.of(context).pop(
+                        true,
+                      );
+                    },
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/wallet_view/wallet_view.dart

@@ -31,6 +31,7 @@ import 'package:stackwallet/pages/receive_view/receive_view.dart';
 import 'package:stackwallet/pages/send_view/send_view.dart';
 import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart';
 import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_settings_view.dart';
+import 'package:stackwallet/pages/special/firo_rescan_recovery_error_dialog.dart';
 import 'package:stackwallet/pages/token_view/my_tokens_view.dart';
 import 'package:stackwallet/pages/wallet_view/sub_widgets/transactions_list.dart';
 import 'package:stackwallet/pages/wallet_view/sub_widgets/wallet_summary.dart';
@@ -119,6 +120,36 @@ class _WalletViewState extends ConsumerState<WalletView> {
   late StreamSubscription<dynamic> _nodeStatusSubscription;
 
   bool _rescanningOnOpen = false;
+  bool _lelantusRescanRecovery = false;
+
+  Future<void> _firoRescanRecovery() async {
+    final success = await (ref.read(managerProvider).wallet as FiroWallet)
+        .firoRescanRecovery();
+
+    if (success) {
+      // go into wallet
+      WidgetsBinding.instance.addPostFrameCallback(
+        (_) => setState(() {
+          _rescanningOnOpen = false;
+          _lelantusRescanRecovery = false;
+        }),
+      );
+    } else {
+      // show error message dialog w/ options
+      if (mounted) {
+        final shouldRetry = await Navigator.of(context).pushNamed(
+          FiroRescanRecoveryErrorView.routeName,
+          arguments: walletId,
+        );
+
+        if (shouldRetry is bool && shouldRetry) {
+          await _firoRescanRecovery();
+        }
+      } else {
+        return await _firoRescanRecovery();
+      }
+    }
+  }
 
   @override
   void initState() {
@@ -134,7 +165,14 @@ class _WalletViewState extends ConsumerState<WalletView> {
       _shouldDisableAutoSyncOnLogOut = false;
     }
 
-    if (ref.read(managerProvider).rescanOnOpenVersion == Constants.rescanV1) {
+    if (ref.read(managerProvider).coin == Coin.firo &&
+        (ref.read(managerProvider).wallet as FiroWallet)
+            .lelantusCoinIsarRescanRequired) {
+      _rescanningOnOpen = true;
+      _lelantusRescanRecovery = true;
+      _firoRescanRecovery();
+    } else if (ref.read(managerProvider).rescanOnOpenVersion ==
+        Constants.rescanV1) {
       _rescanningOnOpen = true;
       ref.read(managerProvider).fullRescan(20, 1000).then(
             (_) => ref.read(managerProvider).resetRescanOnOpen().then(
@@ -212,6 +250,10 @@ class _WalletViewState extends ConsumerState<WalletView> {
   DateTime? _cachedTime;
 
   Future<bool> _onWillPop() async {
+    if (_rescanningOnOpen || _lelantusRescanRecovery) {
+      return false;
+    }
+
     final now = DateTime.now();
     const timeout = Duration(milliseconds: 1500);
     if (_cachedTime == null || now.difference(_cachedTime!) > timeout) {
@@ -434,33 +476,37 @@ class _WalletViewState extends ConsumerState<WalletView> {
                   eventBus: null,
                   textColor:
                       Theme.of(context).extension<StackColors>()!.textDark,
-                  actionButton: SecondaryButton(
+                  actionButton: _lelantusRescanRecovery
-                    label: "Cancel",
+                      ? null
-                    onPressed: () async {
+                      : SecondaryButton(
-                      await showDialog<void>(
+                          label: "Cancel",
-                        context: context,
+                          onPressed: () async {
-                        builder: (context) => StackDialog(
+                            await showDialog<void>(
-                          title: "Warning!",
+                              context: context,
-                          message: "Skipping this process can completely"
+                              builder: (context) => StackDialog(
-                              " break your wallet. It is only meant to be done in"
+                                title: "Warning!",
-                              " emergency situations where the migration fails"
+                                message: "Skipping this process can completely"
-                              " and will not let you continue. Still skip?",
+                                    " break your wallet. It is only meant to be done in"
-                          leftButton: SecondaryButton(
+                                    " emergency situations where the migration fails"
-                            label: "Cancel",
+                                    " and will not let you continue. Still skip?",
-                            onPressed:
+                                leftButton: SecondaryButton(
-                                Navigator.of(context, rootNavigator: true).pop,
+                                  label: "Cancel",
-                          ),
+                                  onPressed:
-                          rightButton: SecondaryButton(
+                                      Navigator.of(context, rootNavigator: true)
-                            label: "Ok",
+                                          .pop,
-                            onPressed: () {
+                                ),
-                              Navigator.of(context, rootNavigator: true).pop();
+                                rightButton: SecondaryButton(
-                              setState(() => _rescanningOnOpen = false);
+                                  label: "Ok",
-                            },
+                                  onPressed: () {
-                          ),
+                                    Navigator.of(context, rootNavigator: true)
+                                        .pop();
+                                    setState(() => _rescanningOnOpen = false);
+                                  },
+                                ),
+                              ),
+                            );
+                          },
                         ),
-                      );
-                    },
-                  ),
                 ),
               )
             ],

lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_wallet_view.dart

@@ -17,6 +17,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:stackwallet/pages/add_wallet_views/add_token_view/edit_wallet_tokens_view.dart';
+import 'package:stackwallet/pages/special/firo_rescan_recovery_error_dialog.dart';
 import 'package:stackwallet/pages/token_view/my_tokens_view.dart';
 import 'package:stackwallet/pages/wallet_view/sub_widgets/transactions_list.dart';
 import 'package:stackwallet/pages/wallet_view/transaction_views/all_transactions_view.dart';
@@ -30,6 +31,7 @@ import 'package:stackwallet/providers/global/auto_swb_service_provider.dart';
 import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/providers/ui/transaction_filter_provider.dart';
 import 'package:stackwallet/services/coins/banano/banano_wallet.dart';
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
 import 'package:stackwallet/services/event_bus/events/global/wallet_sync_status_changed_event.dart';
 import 'package:stackwallet/services/event_bus/global_event_bus.dart';
 import 'package:stackwallet/themes/coin_icon_provider.dart';
@@ -78,6 +80,7 @@ class _DesktopWalletViewState extends ConsumerState<DesktopWalletView> {
 
   late final bool _shouldDisableAutoSyncOnLogOut;
   bool _rescanningOnOpen = false;
+  bool _lelantusRescanRecovery = false;
 
   Future<void> onBackPressed() async {
     await _logout();
@@ -103,6 +106,38 @@ class _DesktopWalletViewState extends ConsumerState<DesktopWalletView> {
     ref.read(managerProvider.notifier).isActiveWallet = false;
   }
 
+  Future<void> _firoRescanRecovery() async {
+    final success = await (ref
+            .read(walletsChangeNotifierProvider)
+            .getManager(widget.walletId)
+            .wallet as FiroWallet)
+        .firoRescanRecovery();
+
+    if (success) {
+      // go into wallet
+      WidgetsBinding.instance.addPostFrameCallback(
+        (_) => setState(() {
+          _rescanningOnOpen = false;
+          _lelantusRescanRecovery = false;
+        }),
+      );
+    } else {
+      // show error message dialog w/ options
+      if (mounted) {
+        final shouldRetry = await Navigator.of(context).pushNamed(
+          FiroRescanRecoveryErrorView.routeName,
+          arguments: widget.walletId,
+        );
+
+        if (shouldRetry is bool && shouldRetry) {
+          await _firoRescanRecovery();
+        }
+      } else {
+        return await _firoRescanRecovery();
+      }
+    }
+  }
+
   @override
   void initState() {
     controller = TextEditingController();
@@ -124,7 +159,13 @@ class _DesktopWalletViewState extends ConsumerState<DesktopWalletView> {
       _shouldDisableAutoSyncOnLogOut = false;
     }
 
-    if (ref.read(managerProvider).coin != Coin.ethereum &&
+    if (ref.read(managerProvider).coin == Coin.firo &&
+        (ref.read(managerProvider).wallet as FiroWallet)
+            .lelantusCoinIsarRescanRequired) {
+      _rescanningOnOpen = true;
+      _lelantusRescanRecovery = true;
+      _firoRescanRecovery();
+    } else if (ref.read(managerProvider).coin != Coin.ethereum &&
         ref.read(managerProvider).rescanOnOpenVersion == Constants.rescanV1) {
       _rescanningOnOpen = true;
       ref.read(managerProvider).fullRescan(20, 1000).then(
@@ -172,83 +213,86 @@ class _DesktopWalletViewState extends ConsumerState<DesktopWalletView> {
                 subMessage: "This only needs to run once per wallet",
                 eventBus: null,
                 textColor: Theme.of(context).extension<StackColors>()!.textDark,
-                actionButton: SecondaryButton(
+                actionButton: _lelantusRescanRecovery
-                  label: "Skip",
+                    ? null
-                  buttonHeight: ButtonHeight.l,
+                    : SecondaryButton(
-                  onPressed: () async {
+                        label: "Skip",
-                    await showDialog<void>(
+                        buttonHeight: ButtonHeight.l,
-                      context: context,
+                        onPressed: () async {
-                      builder: (context) => DesktopDialog(
+                          await showDialog<void>(
-                        maxWidth: 500,
+                            context: context,
-                        maxHeight: double.infinity,
+                            builder: (context) => DesktopDialog(
-                        child: Column(
+                              maxWidth: 500,
-                          children: [
+                              maxHeight: double.infinity,
-                            Padding(
+                              child: Column(
-                              padding: const EdgeInsets.only(left: 32),
-                              child: Row(
-                                mainAxisAlignment:
-                                    MainAxisAlignment.spaceBetween,
                                 children: [
-                                  Text(
+                                  Padding(
-                                    "Warning!",
+                                    padding: const EdgeInsets.only(left: 32),
-                                    style: STextStyles.desktopH3(context),
+                                    child: Row(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.spaceBetween,
+                                      children: [
+                                        Text(
+                                          "Warning!",
+                                          style: STextStyles.desktopH3(context),
+                                        ),
+                                        const DesktopDialogCloseButton(),
+                                      ],
+                                    ),
                                   ),
-                                  const DesktopDialogCloseButton(),
+                                  Padding(
-                                ],
+                                    padding: const EdgeInsets.symmetric(
-                              ),
+                                        horizontal: 32),
-                            ),
+                                    child: Text(
-                            Padding(
+                                      "Skipping this process can completely"
-                              padding:
+                                      " break your wallet. It is only meant to be done in"
-                                  const EdgeInsets.symmetric(horizontal: 32),
+                                      " emergency situations where the migration fails"
-                              child: Text(
+                                      " and will not let you continue. Still skip?",
-                                "Skipping this process can completely"
+                                      style:
-                                " break your wallet. It is only meant to be done in"
+                                          STextStyles.desktopTextSmall(context),
-                                " emergency situations where the migration fails"
-                                " and will not let you continue. Still skip?",
-                                style: STextStyles.desktopTextSmall(context),
-                              ),
-                            ),
-                            const SizedBox(
-                              height: 32,
-                            ),
-                            Padding(
-                              padding: const EdgeInsets.all(32),
-                              child: Row(
-                                children: [
-                                  Expanded(
-                                    child: SecondaryButton(
-                                      label: "Cancel",
-                                      buttonHeight: ButtonHeight.l,
-                                      onPressed: Navigator.of(context,
-                                              rootNavigator: true)
-                                          .pop,
                                     ),
                                   ),
                                   const SizedBox(
-                                    width: 16,
+                                    height: 32,
                                   ),
-                                  Expanded(
+                                  Padding(
-                                    child: PrimaryButton(
+                                    padding: const EdgeInsets.all(32),
-                                      label: "Ok",
+                                    child: Row(
-                                      buttonHeight: ButtonHeight.l,
+                                      children: [
-                                      onPressed: () {
+                                        Expanded(
-                                        Navigator.of(context,
+                                          child: SecondaryButton(
-                                                rootNavigator: true)
+                                            label: "Cancel",
-                                            .pop();
+                                            buttonHeight: ButtonHeight.l,
-                                        setState(
+                                            onPressed: Navigator.of(context,
-                                            () => _rescanningOnOpen = false);
+                                                    rootNavigator: true)
-                                      },
+                                                .pop,
+                                          ),
+                                        ),
+                                        const SizedBox(
+                                          width: 16,
+                                        ),
+                                        Expanded(
+                                          child: PrimaryButton(
+                                            label: "Ok",
+                                            buttonHeight: ButtonHeight.l,
+                                            onPressed: () {
+                                              Navigator.of(context,
+                                                      rootNavigator: true)
+                                                  .pop();
+                                              setState(() =>
+                                                  _rescanningOnOpen = false);
+                                            },
+                                          ),
+                                        ),
+                                      ],
                                     ),
-                                  ),
+                                  )
                                 ],
                               ),
-                            )
+                            ),
-                          ],
+                          );
-                        ),
+                        },
                       ),
-                    );
-                  },
-                ),
               ),
             )
           ],

lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart

@@ -105,6 +105,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
   final _baseFocus = FocusNode();
 
   String? _note;
+  String? _onChainNote;
 
   Amount? _amountToSend;
   Amount? _cachedAmountToSend;
@@ -354,6 +355,9 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
         } else {
           txData["address"] = _address;
           txData["note"] = _note ?? "";
+          if (coin == Coin.epicCash) {
+            txData['onChainNote'] = _onChainNote ?? "";
+          }
         }
         // pop building dialog
         Navigator.of(

lib/route_generator.dart

@@ -118,6 +118,7 @@ import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_set
 import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/rename_wallet_view.dart';
 import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/wallet_settings_wallet_settings_view.dart';
 import 'package:stackwallet/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/xpub_view.dart';
+import 'package:stackwallet/pages/special/firo_rescan_recovery_error_dialog.dart';
 import 'package:stackwallet/pages/stack_privacy_calls.dart';
 import 'package:stackwallet/pages/token_view/my_tokens_view.dart';
 import 'package:stackwallet/pages/token_view/token_contract_details_view.dart';
@@ -264,6 +265,20 @@ class RouteGenerator {
         }
         return _routeError("${settings.name} invalid args: ${args.toString()}");
 
+      case FiroRescanRecoveryErrorView.routeName:
+        if (args is String) {
+          return getRoute(
+            shouldUseMaterialRoute: useMaterialPageRoute,
+            builder: (_) => FiroRescanRecoveryErrorView(
+              walletId: args,
+            ),
+            settings: RouteSettings(
+              name: settings.name,
+            ),
+          );
+        }
+        return _routeError("${settings.name} invalid args: ${args.toString()}");
+
       case WalletsView.routeName:
         return getRoute(
             shouldUseMaterialRoute: useMaterialPageRoute,

lib/services/coins/firo/firo_wallet.dart

@@ -21,6 +21,7 @@ import 'package:decimal/decimal.dart';
 import 'package:flutter/foundation.dart';
 import 'package:isar/isar.dart';
 import 'package:lelantus/lelantus.dart';
+import 'package:stackwallet/db/hive/db.dart';
 import 'package:stackwallet/db/isar/main_db.dart';
 import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart';
 import 'package:stackwallet/electrumx_rpc/electrumx.dart';
@@ -1895,14 +1896,44 @@ class FiroWallet extends CoinServiceAPI
     await Future.wait([
       updateCachedId(walletId),
       updateCachedIsFavorite(false),
+      setLelantusCoinIsarRescanRequiredDone(),
     ]);
   }
 
+  static const String _lelantusCoinIsarRescanRequired =
+      "lelantusCoinIsarRescanRequired";
+
+  Future<void> setLelantusCoinIsarRescanRequiredDone() async {
+    await DB.instance.put<dynamic>(
+      boxName: walletId,
+      key: _lelantusCoinIsarRescanRequired,
+      value: false,
+    );
+  }
+
+  bool get lelantusCoinIsarRescanRequired =>
+      DB.instance.get(
+        boxName: walletId,
+        key: _lelantusCoinIsarRescanRequired,
+      ) as bool? ??
+      true;
+
+  Future<bool> firoRescanRecovery() async {
+    try {
+      await fullRescan(50, 1000);
+      await setLelantusCoinIsarRescanRequiredDone();
+      return true;
+    } catch (_) {
+      return false;
+    }
+  }
+
   @override
   Future<void> initializeExisting() async {
     Logging.instance.log(
-        "initializeExisting() $_walletId ${coin.prettyName} wallet.",
+      "initializeExisting() $_walletId ${coin.prettyName} wallet.",
-        level: LogLevel.Info);
+      level: LogLevel.Info,
+    );
 
     if (getCachedId() == null) {
       throw Exception(
@@ -3601,6 +3632,81 @@ class FiroWallet extends CoinServiceAPI
 
         txnsData.add(Tuple2(tx, transactionAddress));
 
+        // Master node payment =====================================
+      } else if (inputList.length == 1 &&
+          inputList.first["coinbase"] is String) {
+        List<isar_models.Input> ins = [
+          isar_models.Input(
+            txid: inputList.first["coinbase"] as String,
+            vout: -1,
+            scriptSig: null,
+            scriptSigAsm: null,
+            isCoinbase: true,
+            sequence: inputList.first['sequence'] as int?,
+            innerRedeemScriptAsm: null,
+          ),
+        ];
+
+        // parse outputs
+        List<isar_models.Output> outs = [];
+        for (final output in outputList) {
+          // get value
+          final value = Amount.fromDecimal(
+            Decimal.parse(output["value"].toString()),
+            fractionDigits: coin.decimals,
+          );
+
+          // get output address
+          final address = output["scriptPubKey"]?["addresses"]?[0] as String? ??
+              output["scriptPubKey"]?["address"] as String?;
+          if (address != null) {
+            outputAddresses.add(address);
+
+            // if output was to my wallet, add value to amount received
+            if (receivingAddresses.contains(address)) {
+              amountReceivedInWallet += value;
+            }
+          }
+
+          outs.add(
+            isar_models.Output(
+              scriptPubKey: output['scriptPubKey']?['hex'] as String?,
+              scriptPubKeyAsm: output['scriptPubKey']?['asm'] as String?,
+              scriptPubKeyType: output['scriptPubKey']?['type'] as String?,
+              scriptPubKeyAddress: address ?? "",
+              value: value.raw.toInt(),
+            ),
+          );
+        }
+
+        // this is the address initially used to fetch the txid
+        isar_models.Address transactionAddress =
+            txObject["address"] as isar_models.Address;
+
+        final tx = isar_models.Transaction(
+          walletId: walletId,
+          txid: txObject["txid"] as String,
+          timestamp: txObject["blocktime"] as int? ??
+              (DateTime.now().millisecondsSinceEpoch ~/ 1000),
+          type: isar_models.TransactionType.incoming,
+          subType: isar_models.TransactionSubType.none,
+          // amount may overflow. Deprecated. Use amountString
+          amount: amountReceivedInWallet.raw.toInt(),
+          amountString: amountReceivedInWallet.toJsonString(),
+          fee: 0,
+          height: txObject["height"] as int?,
+          isCancelled: false,
+          isLelantus: false,
+          slateId: null,
+          otherData: null,
+          nonce: null,
+          inputs: ins,
+          outputs: outs,
+          numberOfMessages: null,
+        );
+
+        txnsData.add(Tuple2(tx, transactionAddress));
+
         // Assume non lelantus transaction =====================================
       } else {
         // parse inputs
@@ -4098,6 +4204,7 @@ class FiroWallet extends CoinServiceAPI
         maxNumberOfIndexesToCheck,
         false,
       );
+      await setLelantusCoinIsarRescanRequiredDone();
 
       await compute(
         _setTestnetWrapper,

pubspec.yaml

@@ -11,7 +11,7 @@ description: Stack Wallet
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.7.17+184
+version: 1.7.17+185
 
 environment:
   sdk: ">=3.0.2 <4.0.0"