From 3fc241b72e81d207e6f953fa32b34fc9830990a0 Mon Sep 17 00:00:00 2001
From: Diego Salazar <diego@cypherstack.com>
Date: Tue, 16 May 2023 12:27:39 -0600
Subject: [PATCH 01/87] Bump version (v1.0.6, build 10)

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index db089f07f..dc6019587 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Stack Duo
 # 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.0.6+9
+version: 1.0.6+10
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

From 8e53198efa25e843f9f3ca584036f68052da3759 Mon Sep 17 00:00:00 2001
From: ryleedavis <rylee@cypherstack.com>
Date: Tue, 16 May 2023 13:36:59 -0600
Subject: [PATCH 02/87] fix eye icon overflow error on desktop

(cherry picked from commit bb5ada8178d7bee87995ab24f4aaca40b5605fce)
---
 lib/pages_desktop_specific/password/desktop_login_view.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages_desktop_specific/password/desktop_login_view.dart b/lib/pages_desktop_specific/password/desktop_login_view.dart
index 1ea7e1da7..5df99914c 100644
--- a/lib/pages_desktop_specific/password/desktop_login_view.dart
+++ b/lib/pages_desktop_specific/password/desktop_login_view.dart
@@ -246,7 +246,7 @@ class _DesktopLoginViewState extends ConsumerState<DesktopLoginView> {
                           ),
                           suffixIcon: UnconstrainedBox(
                             child: SizedBox(
-                              height: 70,
+                              height: 40,
                               child: Row(
                                 children: [
                                   const SizedBox(

From 15df131ac639d3bef60209a3a270e28d653163a8 Mon Sep 17 00:00:00 2001
From: ryleedavis <rylee@cypherstack.com>
Date: Tue, 16 May 2023 15:38:18 -0600
Subject: [PATCH 03/87] fix support page icon color

(cherry picked from commit e463560a5f7b27ecd93e8856ad6647e01e8ce743)
---
 lib/pages/settings_views/global_settings_view/support_view.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/settings_views/global_settings_view/support_view.dart b/lib/pages/settings_views/global_settings_view/support_view.dart
index 7f41c4516..7a47e10c7 100644
--- a/lib/pages/settings_views/global_settings_view/support_view.dart
+++ b/lib/pages/settings_views/global_settings_view/support_view.dart
@@ -190,7 +190,7 @@ class AboutItem extends StatelessWidget {
                       height: iconSize,
                       color: Theme.of(context)
                           .extension<StackColors>()!
-                          .bottomNavIconIcon,
+                          .topNavIconPrimary,
                     ),
                   ),
                   const SizedBox(

From 2e39da391db5be99e62ed316a65dbd439a4e98a7 Mon Sep 17 00:00:00 2001
From: Diego Salazar <diego@cypherstack.com>
Date: Tue, 23 May 2023 18:23:06 -0600
Subject: [PATCH 04/87] Bump version (1.0.7, build 11)

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index dc6019587..45a583ea5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Stack Duo
 # 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.0.6+10
+version: 1.0.7+11
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

From f6dc4bf9f7a598ee79a6614be98922ce131fa2e1 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 18 May 2023 12:52:48 -0600
Subject: [PATCH 05/87] v2 theme assets

---
 crypto_plugins/flutter_libmonero              |    2 +-
 lib/models/isar/stack_theme.dart              | 1302 ++--
 lib/models/isar/stack_theme.g.dart            | 6131 +++++++++++++----
 lib/notifications/notification_card.dart      |    6 +-
 .../exchange_view/trade_details_view.dart     |   14 +-
 .../wallet_view/sub_widgets/tx_icon.dart      |    4 +-
 .../desktop_all_trades_view.dart              |    7 +-
 lib/themes/coin_icon_provider.dart            |   19 +-
 lib/themes/coin_image_provider.dart           |   39 +-
 lib/themes/theme_providers.dart               |    8 +
 lib/widgets/trade_card.dart                   |    8 +-
 test/sample_data/theme_json_v2.dart           |  252 +
 12 files changed, 5969 insertions(+), 1823 deletions(-)
 create mode 100644 test/sample_data/theme_json_v2.dart

diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero
index fbc366564..ec68d72ce 160000
--- a/crypto_plugins/flutter_libmonero
+++ b/crypto_plugins/flutter_libmonero
@@ -1 +1 @@
-Subproject commit fbc366564fd5180ed6154cc447821e3b83e93dbf
+Subproject commit ec68d72ce6e529be045e263373518e9a86119be8
diff --git a/lib/models/isar/stack_theme.dart b/lib/models/isar/stack_theme.dart
index 75e1cda4d..f072feb02 100644
--- a/lib/models/isar/stack_theme.dart
+++ b/lib/models/isar/stack_theme.dart
@@ -16,13 +16,13 @@ class StackTheme {
 
   /// id of theme on themes server
   @Index(unique: true, replace: true)
-  final String themeId;
+  late final String themeId;
 
   /// the theme name that will be displayed in app
-  final String name;
+  late final String name;
 
   // system brightness
-  final String brightnessString;
+  late final String brightnessString;
 
   /// convenience enum conversion for stored [brightnessString]
   @ignore
@@ -44,7 +44,7 @@ class StackTheme {
   Color get background => _background ??= Color(backgroundInt);
   @ignore
   Color? _background;
-  final int backgroundInt;
+  late final int backgroundInt;
 
   // ==== backgroundAppBar =====================================================
 
@@ -53,7 +53,7 @@ class StackTheme {
       _backgroundAppBar ??= Color(backgroundAppBarInt);
   @ignore
   Color? _backgroundAppBar;
-  final int backgroundAppBarInt;
+  late final int backgroundAppBarInt;
 
   // ==== gradientBackground =====================================================
 
@@ -73,7 +73,7 @@ class StackTheme {
 
   @ignore
   Gradient? _gradientBackground;
-  final String? gradientBackgroundString;
+  late final String? gradientBackgroundString;
 
   // ==== boxShadows =====================================================
 
@@ -86,7 +86,7 @@ class StackTheme {
       );
   @ignore
   BoxShadow? _standardBoxShadow;
-  final String standardBoxShadowString;
+  late final String standardBoxShadowString;
 
   @ignore
   BoxShadow? get homeViewButtonBarBoxShadow {
@@ -105,7 +105,7 @@ class StackTheme {
 
   @ignore
   BoxShadow? _homeViewButtonBarBoxShadow;
-  final String? homeViewButtonBarBoxShadowString;
+  late final String? homeViewButtonBarBoxShadowString;
 
   // ==== overlay =====================================================
 
@@ -113,7 +113,7 @@ class StackTheme {
   Color get overlay => _overlay ??= Color(overlayInt);
   @ignore
   Color? _overlay;
-  final int overlayInt;
+  late final int overlayInt;
 
   // ==== accentColorBlue =====================================================
 
@@ -123,7 +123,7 @@ class StackTheme {
       );
   @ignore
   Color? _accentColorBlue;
-  final int accentColorBlueInt;
+  late final int accentColorBlueInt;
 
   // ==== accentColorGreen =====================================================
 
@@ -133,7 +133,7 @@ class StackTheme {
       );
   @ignore
   Color? _accentColorGreen;
-  final int accentColorGreenInt;
+  late final int accentColorGreenInt;
 
   // ==== accentColorYellow =====================================================
 
@@ -143,7 +143,7 @@ class StackTheme {
       );
   @ignore
   Color? _accentColorYellow;
-  final int accentColorYellowInt;
+  late final int accentColorYellowInt;
 
   // ==== accentColorRed =====================================================
 
@@ -153,7 +153,7 @@ class StackTheme {
       );
   @ignore
   Color? _accentColorRed;
-  final int accentColorRedInt;
+  late final int accentColorRedInt;
 
   // ==== accentColorOrange =====================================================
 
@@ -163,7 +163,7 @@ class StackTheme {
       );
   @ignore
   Color? _accentColorOrange;
-  final int accentColorOrangeInt;
+  late final int accentColorOrangeInt;
 
   // ==== accentColorDark =====================================================
 
@@ -173,7 +173,7 @@ class StackTheme {
       );
   @ignore
   Color? _accentColorDark;
-  final int accentColorDarkInt;
+  late final int accentColorDarkInt;
 
   // ==== shadow =====================================================
 
@@ -183,7 +183,7 @@ class StackTheme {
       );
   @ignore
   Color? _shadow;
-  final int shadowInt;
+  late final int shadowInt;
 
   // ==== textDark =====================================================
 
@@ -193,7 +193,7 @@ class StackTheme {
       );
   @ignore
   Color? _textDark;
-  final int textDarkInt;
+  late final int textDarkInt;
 
   // ==== textDark2 =====================================================
 
@@ -203,7 +203,7 @@ class StackTheme {
       );
   @ignore
   Color? _textDark2;
-  final int textDark2Int;
+  late final int textDark2Int;
 
   // ==== textDark3 =====================================================
 
@@ -213,7 +213,7 @@ class StackTheme {
       );
   @ignore
   Color? _textDark3;
-  final int textDark3Int;
+  late final int textDark3Int;
 
   // ==== textSubtitle1 =====================================================
 
@@ -223,7 +223,7 @@ class StackTheme {
       );
   @ignore
   Color? _textSubtitle1;
-  final int textSubtitle1Int;
+  late final int textSubtitle1Int;
 
   // ==== textSubtitle2 =====================================================
 
@@ -233,7 +233,7 @@ class StackTheme {
       );
   @ignore
   Color? _textSubtitle2;
-  final int textSubtitle2Int;
+  late final int textSubtitle2Int;
 
   // ==== textSubtitle3 =====================================================
 
@@ -243,7 +243,7 @@ class StackTheme {
       );
   @ignore
   Color? _textSubtitle3;
-  final int textSubtitle3Int;
+  late final int textSubtitle3Int;
 
   // ==== textSubtitle4 =====================================================
 
@@ -253,7 +253,7 @@ class StackTheme {
       );
   @ignore
   Color? _textSubtitle4;
-  final int textSubtitle4Int;
+  late final int textSubtitle4Int;
 
   // ==== textSubtitle5 =====================================================
 
@@ -263,7 +263,7 @@ class StackTheme {
       );
   @ignore
   Color? _textSubtitle5;
-  final int textSubtitle5Int;
+  late final int textSubtitle5Int;
 
   // ==== textSubtitle6 =====================================================
 
@@ -273,7 +273,7 @@ class StackTheme {
       );
   @ignore
   Color? _textSubtitle6;
-  final int textSubtitle6Int;
+  late final int textSubtitle6Int;
 
   // ==== textWhite =====================================================
 
@@ -283,7 +283,7 @@ class StackTheme {
       );
   @ignore
   Color? _textWhite;
-  final int textWhiteInt;
+  late final int textWhiteInt;
 
   // ==== textFavoriteCard =====================================================
 
@@ -293,7 +293,7 @@ class StackTheme {
       );
   @ignore
   Color? _textFavoriteCard;
-  final int textFavoriteCardInt;
+  late final int textFavoriteCardInt;
 
   // ==== textError =====================================================
 
@@ -303,7 +303,7 @@ class StackTheme {
       );
   @ignore
   Color? _textError;
-  final int textErrorInt;
+  late final int textErrorInt;
 
   // ==== textRestore =====================================================
 
@@ -313,7 +313,7 @@ class StackTheme {
       );
   @ignore
   Color? _textRestore;
-  final int textRestoreInt;
+  late final int textRestoreInt;
 
   // ==== buttonBackPrimary =====================================================
 
@@ -323,7 +323,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonBackPrimary;
-  final int buttonBackPrimaryInt;
+  late final int buttonBackPrimaryInt;
 
   // ==== buttonBackSecondary =====================================================
 
@@ -333,7 +333,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonBackSecondary;
-  final int buttonBackSecondaryInt;
+  late final int buttonBackSecondaryInt;
 
   // ==== buttonBackPrimaryDisabled =====================================================
 
@@ -343,7 +343,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonBackPrimaryDisabled;
-  final int buttonBackPrimaryDisabledInt;
+  late final int buttonBackPrimaryDisabledInt;
 
   // ==== buttonBackSecondaryDisabled =====================================================
 
@@ -354,7 +354,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonBackSecondaryDisabled;
-  final int buttonBackSecondaryDisabledInt;
+  late final int buttonBackSecondaryDisabledInt;
 
   // ==== buttonBackBorder =====================================================
 
@@ -364,7 +364,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonBackBorder;
-  final int buttonBackBorderInt;
+  late final int buttonBackBorderInt;
 
   // ==== buttonBackBorderDisabled =====================================================
 
@@ -374,7 +374,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonBackBorderDisabled;
-  final int buttonBackBorderDisabledInt;
+  late final int buttonBackBorderDisabledInt;
 
   // ==== buttonBackBorderSecondary =====================================================
 
@@ -384,7 +384,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonBackBorderSecondary;
-  final int buttonBackBorderSecondaryInt;
+  late final int buttonBackBorderSecondaryInt;
 
   // ==== buttonBackBorderSecondaryDisabled =====================================================
 
@@ -395,7 +395,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonBackBorderSecondaryDisabled;
-  final int buttonBackBorderSecondaryDisabledInt;
+  late final int buttonBackBorderSecondaryDisabledInt;
 
   // ==== numberBackDefault =====================================================
 
@@ -405,7 +405,7 @@ class StackTheme {
       );
   @ignore
   Color? _numberBackDefault;
-  final int numberBackDefaultInt;
+  late final int numberBackDefaultInt;
 
   // ==== numpadBackDefault =====================================================
 
@@ -415,7 +415,7 @@ class StackTheme {
       );
   @ignore
   Color? _numpadBackDefault;
-  final int numpadBackDefaultInt;
+  late final int numpadBackDefaultInt;
 
   // ==== bottomNavBack =====================================================
 
@@ -425,7 +425,7 @@ class StackTheme {
       );
   @ignore
   Color? _bottomNavBack;
-  final int bottomNavBackInt;
+  late final int bottomNavBackInt;
 
   // ==== buttonTextPrimary =====================================================
 
@@ -435,7 +435,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonTextPrimary;
-  final int buttonTextPrimaryInt;
+  late final int buttonTextPrimaryInt;
 
   // ==== buttonTextSecondary =====================================================
 
@@ -445,7 +445,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonTextSecondary;
-  final int buttonTextSecondaryInt;
+  late final int buttonTextSecondaryInt;
 
   // ==== buttonTextPrimaryDisabled =====================================================
 
@@ -455,7 +455,7 @@ class StackTheme {
       );
   @ignore
   Color? _buttonTextPrimaryDisabled;
-  final int buttonTextPrimaryDisabledInt;
+  late final int buttonTextPrimaryDisabledInt;
 
   // ==== buttonTextSecondaryDisabled =====================================================
 
@@ -464,7 +464,7 @@ class StackTheme {
       _buttonTextSecondaryDisabled ??= Color(buttonTextSecondaryDisabledInt);
   @ignore
   Color? _buttonTextSecondaryDisabled;
-  final int buttonTextSecondaryDisabledInt;
+  late final int buttonTextSecondaryDisabledInt;
 
   // ==== buttonTextBorder =====================================================
 
@@ -473,7 +473,7 @@ class StackTheme {
       _buttonTextBorder ??= Color(buttonTextBorderInt);
   @ignore
   Color? _buttonTextBorder;
-  final int buttonTextBorderInt;
+  late final int buttonTextBorderInt;
 
   // ==== buttonTextDisabled =====================================================
 
@@ -482,7 +482,7 @@ class StackTheme {
       _buttonTextDisabled ??= Color(buttonTextDisabledInt);
   @ignore
   Color? _buttonTextDisabled;
-  final int buttonTextDisabledInt;
+  late final int buttonTextDisabledInt;
 
   // ==== buttonTextBorderless =====================================================
 
@@ -491,7 +491,7 @@ class StackTheme {
       _buttonTextBorderless ??= Color(buttonTextBorderlessInt);
   @ignore
   Color? _buttonTextBorderless;
-  final int buttonTextBorderlessInt;
+  late final int buttonTextBorderlessInt;
 
   // ==== buttonTextBorderlessDisabled =====================================================
 
@@ -500,7 +500,7 @@ class StackTheme {
       _buttonTextBorderlessDisabled ??= Color(buttonTextBorderlessDisabledInt);
   @ignore
   Color? _buttonTextBorderlessDisabled;
-  final int buttonTextBorderlessDisabledInt;
+  late final int buttonTextBorderlessDisabledInt;
 
   // ==== numberTextDefault =====================================================
 
@@ -509,7 +509,7 @@ class StackTheme {
       _numberTextDefault ??= Color(numberTextDefaultInt);
   @ignore
   Color? _numberTextDefault;
-  final int numberTextDefaultInt;
+  late final int numberTextDefaultInt;
 
   // ==== numpadTextDefault =====================================================
 
@@ -518,7 +518,7 @@ class StackTheme {
       _numpadTextDefault ??= Color(numpadTextDefaultInt);
   @ignore
   Color? _numpadTextDefault;
-  final int numpadTextDefaultInt;
+  late final int numpadTextDefaultInt;
 
   // ==== bottomNavText =====================================================
 
@@ -526,7 +526,7 @@ class StackTheme {
   Color get bottomNavText => _bottomNavText ??= Color(bottomNavTextInt);
   @ignore
   Color? _bottomNavText;
-  final int bottomNavTextInt;
+  late final int bottomNavTextInt;
 
   // ==== customTextButtonEnabledText =====================================================
 
@@ -535,7 +535,7 @@ class StackTheme {
       _customTextButtonEnabledText ??= Color(customTextButtonEnabledTextInt);
   @ignore
   Color? _customTextButtonEnabledText;
-  final int customTextButtonEnabledTextInt;
+  late final int customTextButtonEnabledTextInt;
 
   // ==== customTextButtonDisabledText =====================================================
 
@@ -544,7 +544,7 @@ class StackTheme {
       _customTextButtonDisabledText ??= Color(customTextButtonDisabledTextInt);
   @ignore
   Color? _customTextButtonDisabledText;
-  final int customTextButtonDisabledTextInt;
+  late final int customTextButtonDisabledTextInt;
 
   // ==== switchBGOn =====================================================
 
@@ -552,7 +552,7 @@ class StackTheme {
   Color get switchBGOn => _switchBGOn ??= Color(switchBGOnInt);
   @ignore
   Color? _switchBGOn;
-  final int switchBGOnInt;
+  late final int switchBGOnInt;
 
   // ==== switchBGOff =====================================================
 
@@ -560,7 +560,7 @@ class StackTheme {
   Color get switchBGOff => _switchBGOff ??= Color(switchBGOffInt);
   @ignore
   Color? _switchBGOff;
-  final int switchBGOffInt;
+  late final int switchBGOffInt;
 
   // ==== switchBGDisabled =====================================================
 
@@ -569,7 +569,7 @@ class StackTheme {
       _switchBGDisabled ??= Color(switchBGDisabledInt);
   @ignore
   Color? _switchBGDisabled;
-  final int switchBGDisabledInt;
+  late final int switchBGDisabledInt;
 
   // ==== switchCircleOn =====================================================
 
@@ -577,7 +577,7 @@ class StackTheme {
   Color get switchCircleOn => _switchCircleOn ??= Color(switchCircleOnInt);
   @ignore
   Color? _switchCircleOn;
-  final int switchCircleOnInt;
+  late final int switchCircleOnInt;
 
   // ==== switchCircleOff =====================================================
 
@@ -585,7 +585,7 @@ class StackTheme {
   Color get switchCircleOff => _switchCircleOff ??= Color(switchCircleOffInt);
   @ignore
   Color? _switchCircleOff;
-  final int switchCircleOffInt;
+  late final int switchCircleOffInt;
 
   // ==== switchCircleDisabled =====================================================
 
@@ -594,7 +594,7 @@ class StackTheme {
       _switchCircleDisabled ??= Color(switchCircleDisabledInt);
   @ignore
   Color? _switchCircleDisabled;
-  final int switchCircleDisabledInt;
+  late final int switchCircleDisabledInt;
 
   // ==== stepIndicatorBGCheck =====================================================
 
@@ -603,7 +603,7 @@ class StackTheme {
       _stepIndicatorBGCheck ??= Color(stepIndicatorBGCheckInt);
   @ignore
   Color? _stepIndicatorBGCheck;
-  final int stepIndicatorBGCheckInt;
+  late final int stepIndicatorBGCheckInt;
 
   // ==== stepIndicatorBGNumber =====================================================
 
@@ -612,7 +612,7 @@ class StackTheme {
       _stepIndicatorBGNumber ??= Color(stepIndicatorBGNumberInt);
   @ignore
   Color? _stepIndicatorBGNumber;
-  final int stepIndicatorBGNumberInt;
+  late final int stepIndicatorBGNumberInt;
 
   // ==== stepIndicatorBGInactive =====================================================
 
@@ -621,7 +621,7 @@ class StackTheme {
       _stepIndicatorBGInactive ??= Color(stepIndicatorBGInactiveInt);
   @ignore
   Color? _stepIndicatorBGInactive;
-  final int stepIndicatorBGInactiveInt;
+  late final int stepIndicatorBGInactiveInt;
 
   // ==== stepIndicatorBGLines =====================================================
 
@@ -630,7 +630,7 @@ class StackTheme {
       _stepIndicatorBGLines ??= Color(stepIndicatorBGLinesInt);
   @ignore
   Color? _stepIndicatorBGLines;
-  final int stepIndicatorBGLinesInt;
+  late final int stepIndicatorBGLinesInt;
 
   // ==== stepIndicatorBGLinesInactive =====================================================
 
@@ -639,7 +639,7 @@ class StackTheme {
       _stepIndicatorBGLinesInactive ??= Color(stepIndicatorBGLinesInactiveInt);
   @ignore
   Color? _stepIndicatorBGLinesInactive;
-  final int stepIndicatorBGLinesInactiveInt;
+  late final int stepIndicatorBGLinesInactiveInt;
 
   // ==== stepIndicatorIconText =====================================================
 
@@ -648,7 +648,7 @@ class StackTheme {
       _stepIndicatorIconText ??= Color(stepIndicatorIconTextInt);
   @ignore
   Color? _stepIndicatorIconText;
-  final int stepIndicatorIconTextInt;
+  late final int stepIndicatorIconTextInt;
 
   // ==== stepIndicatorIconNumber =====================================================
 
@@ -657,7 +657,7 @@ class StackTheme {
       _stepIndicatorIconNumber ??= Color(stepIndicatorIconNumberInt);
   @ignore
   Color? _stepIndicatorIconNumber;
-  final int stepIndicatorIconNumberInt;
+  late final int stepIndicatorIconNumberInt;
 
   // ==== stepIndicatorIconInactive =====================================================
 
@@ -666,7 +666,7 @@ class StackTheme {
       _stepIndicatorIconInactive ??= Color(stepIndicatorIconInactiveInt);
   @ignore
   Color? _stepIndicatorIconInactive;
-  final int stepIndicatorIconInactiveInt;
+  late final int stepIndicatorIconInactiveInt;
 
   // ==== checkboxBGChecked =====================================================
 
@@ -675,7 +675,7 @@ class StackTheme {
       _checkboxBGChecked ??= Color(checkboxBGCheckedInt);
   @ignore
   Color? _checkboxBGChecked;
-  final int checkboxBGCheckedInt;
+  late final int checkboxBGCheckedInt;
 
   // ==== checkboxBorderEmpty =====================================================
 
@@ -684,7 +684,7 @@ class StackTheme {
       _checkboxBorderEmpty ??= Color(checkboxBorderEmptyInt);
   @ignore
   Color? _checkboxBorderEmpty;
-  final int checkboxBorderEmptyInt;
+  late final int checkboxBorderEmptyInt;
 
   // ==== checkboxBGDisabled =====================================================
 
@@ -693,7 +693,7 @@ class StackTheme {
       _checkboxBGDisabled ??= Color(checkboxBGDisabledInt);
   @ignore
   Color? _checkboxBGDisabled;
-  final int checkboxBGDisabledInt;
+  late final int checkboxBGDisabledInt;
 
   // ==== checkboxIconChecked =====================================================
 
@@ -702,7 +702,7 @@ class StackTheme {
       _checkboxIconChecked ??= Color(checkboxIconCheckedInt);
   @ignore
   Color? _checkboxIconChecked;
-  final int checkboxIconCheckedInt;
+  late final int checkboxIconCheckedInt;
 
   // ==== checkboxIconDisabled =====================================================
 
@@ -711,7 +711,7 @@ class StackTheme {
       _checkboxIconDisabled ??= Color(checkboxIconDisabledInt);
   @ignore
   Color? _checkboxIconDisabled;
-  final int checkboxIconDisabledInt;
+  late final int checkboxIconDisabledInt;
 
   // ==== checkboxTextLabel =====================================================
 
@@ -720,7 +720,7 @@ class StackTheme {
       _checkboxTextLabel ??= Color(checkboxTextLabelInt);
   @ignore
   Color? _checkboxTextLabel;
-  final int checkboxTextLabelInt;
+  late final int checkboxTextLabelInt;
 
   // ==== snackBarBackSuccess =====================================================
 
@@ -729,7 +729,7 @@ class StackTheme {
       _snackBarBackSuccess ??= Color(snackBarBackSuccessInt);
   @ignore
   Color? _snackBarBackSuccess;
-  final int snackBarBackSuccessInt;
+  late final int snackBarBackSuccessInt;
 
   // ==== snackBarBackError =====================================================
 
@@ -738,7 +738,7 @@ class StackTheme {
       _snackBarBackError ??= Color(snackBarBackErrorInt);
   @ignore
   Color? _snackBarBackError;
-  final int snackBarBackErrorInt;
+  late final int snackBarBackErrorInt;
 
   // ==== snackBarBackInfo =====================================================
 
@@ -747,7 +747,7 @@ class StackTheme {
       _snackBarBackInfo ??= Color(snackBarBackInfoInt);
   @ignore
   Color? _snackBarBackInfo;
-  final int snackBarBackInfoInt;
+  late final int snackBarBackInfoInt;
 
   // ==== snackBarTextSuccess =====================================================
 
@@ -756,7 +756,7 @@ class StackTheme {
       _snackBarTextSuccess ??= Color(snackBarTextSuccessInt);
   @ignore
   Color? _snackBarTextSuccess;
-  final int snackBarTextSuccessInt;
+  late final int snackBarTextSuccessInt;
 
   // ==== snackBarTextError =====================================================
 
@@ -765,7 +765,7 @@ class StackTheme {
       _snackBarTextError ??= Color(snackBarTextErrorInt);
   @ignore
   Color? _snackBarTextError;
-  final int snackBarTextErrorInt;
+  late final int snackBarTextErrorInt;
 
   // ==== snackBarTextInfo =====================================================
 
@@ -774,7 +774,7 @@ class StackTheme {
       _snackBarTextInfo ??= Color(snackBarTextInfoInt);
   @ignore
   Color? _snackBarTextInfo;
-  final int snackBarTextInfoInt;
+  late final int snackBarTextInfoInt;
 
   // ==== bottomNavIconBack =====================================================
 
@@ -783,7 +783,7 @@ class StackTheme {
       _bottomNavIconBack ??= Color(bottomNavIconBackInt);
   @ignore
   Color? _bottomNavIconBack;
-  final int bottomNavIconBackInt;
+  late final int bottomNavIconBackInt;
 
   // ==== bottomNavIconIcon =====================================================
 
@@ -792,7 +792,7 @@ class StackTheme {
       _bottomNavIconIcon ??= Color(bottomNavIconIconInt);
   @ignore
   Color? _bottomNavIconIcon;
-  final int bottomNavIconIconInt;
+  late final int bottomNavIconIconInt;
 
   // ==== bottomNavIconIcon highlighted =====================================================
 
@@ -801,7 +801,7 @@ class StackTheme {
       _bottomNavIconIconHighlighted ??= Color(bottomNavIconIconHighlightedInt);
   @ignore
   Color? _bottomNavIconIconHighlighted;
-  final int bottomNavIconIconHighlightedInt;
+  late final int bottomNavIconIconHighlightedInt;
 
   // ==== topNavIconPrimary =====================================================
 
@@ -810,7 +810,7 @@ class StackTheme {
       _topNavIconPrimary ??= Color(topNavIconPrimaryInt);
   @ignore
   Color? _topNavIconPrimary;
-  final int topNavIconPrimaryInt;
+  late final int topNavIconPrimaryInt;
 
   // ==== topNavIconGreen =====================================================
 
@@ -818,7 +818,7 @@ class StackTheme {
   Color get topNavIconGreen => _topNavIconGreen ??= Color(topNavIconGreenInt);
   @ignore
   Color? _topNavIconGreen;
-  final int topNavIconGreenInt;
+  late final int topNavIconGreenInt;
 
   // ==== topNavIconYellow =====================================================
 
@@ -827,7 +827,7 @@ class StackTheme {
       _topNavIconYellow ??= Color(topNavIconYellowInt);
   @ignore
   Color? _topNavIconYellow;
-  final int topNavIconYellowInt;
+  late final int topNavIconYellowInt;
 
   // ==== topNavIconRed =====================================================
 
@@ -835,7 +835,7 @@ class StackTheme {
   Color get topNavIconRed => _topNavIconRed ??= Color(topNavIconRedInt);
   @ignore
   Color? _topNavIconRed;
-  final int topNavIconRedInt;
+  late final int topNavIconRedInt;
 
   // ==== settingsIconBack =====================================================
 
@@ -844,7 +844,7 @@ class StackTheme {
       _settingsIconBack ??= Color(settingsIconBackInt);
   @ignore
   Color? _settingsIconBack;
-  final int settingsIconBackInt;
+  late final int settingsIconBackInt;
 
   // ==== settingsIconIcon =====================================================
 
@@ -853,7 +853,7 @@ class StackTheme {
       _settingsIconIcon ??= Color(settingsIconIconInt);
   @ignore
   Color? _settingsIconIcon;
-  final int settingsIconIconInt;
+  late final int settingsIconIconInt;
 
   // ==== settingsIconBack2 =====================================================
 
@@ -862,7 +862,7 @@ class StackTheme {
       _settingsIconBack2 ??= Color(settingsIconBack2Int);
   @ignore
   Color? _settingsIconBack2;
-  final int settingsIconBack2Int;
+  late final int settingsIconBack2Int;
 
   // ==== settingsIconElement =====================================================
 
@@ -871,7 +871,7 @@ class StackTheme {
       _settingsIconElement ??= Color(settingsIconElementInt);
   @ignore
   Color? _settingsIconElement;
-  final int settingsIconElementInt;
+  late final int settingsIconElementInt;
 
   // ==== textFieldActiveBG =====================================================
 
@@ -880,7 +880,7 @@ class StackTheme {
       _textFieldActiveBG ??= Color(textFieldActiveBGInt);
   @ignore
   Color? _textFieldActiveBG;
-  final int textFieldActiveBGInt;
+  late final int textFieldActiveBGInt;
 
   // ==== textFieldDefaultBG =====================================================
 
@@ -889,7 +889,7 @@ class StackTheme {
       _textFieldDefaultBG ??= Color(textFieldDefaultBGInt);
   @ignore
   Color? _textFieldDefaultBG;
-  final int textFieldDefaultBGInt;
+  late final int textFieldDefaultBGInt;
 
   // ==== textFieldErrorBG =====================================================
 
@@ -898,7 +898,7 @@ class StackTheme {
       _textFieldErrorBG ??= Color(textFieldErrorBGInt);
   @ignore
   Color? _textFieldErrorBG;
-  final int textFieldErrorBGInt;
+  late final int textFieldErrorBGInt;
 
   // ==== textFieldSuccessBG =====================================================
 
@@ -907,7 +907,7 @@ class StackTheme {
       _textFieldSuccessBG ??= Color(textFieldSuccessBGInt);
   @ignore
   Color? _textFieldSuccessBG;
-  final int textFieldSuccessBGInt;
+  late final int textFieldSuccessBGInt;
 
   // ==== textFieldErrorBorder =====================================================
 
@@ -916,7 +916,7 @@ class StackTheme {
       _textFieldErrorBorder ??= Color(textFieldErrorBorderInt);
   @ignore
   Color? _textFieldErrorBorder;
-  final int textFieldErrorBorderInt;
+  late final int textFieldErrorBorderInt;
 
   // ==== textFieldSuccessBorder =====================================================
 
@@ -925,7 +925,7 @@ class StackTheme {
       _textFieldSuccessBorder ??= Color(textFieldSuccessBorderInt);
   @ignore
   Color? _textFieldSuccessBorder;
-  final int textFieldSuccessBorderInt;
+  late final int textFieldSuccessBorderInt;
 
   // ==== textFieldActiveSearchIconLeft =====================================================
 
@@ -934,7 +934,7 @@ class StackTheme {
       Color(textFieldActiveSearchIconLeftInt);
   @ignore
   Color? _textFieldActiveSearchIconLeft;
-  final int textFieldActiveSearchIconLeftInt;
+  late final int textFieldActiveSearchIconLeftInt;
 
   // ==== textFieldDefaultSearchIconLeft =====================================================
 
@@ -944,7 +944,7 @@ class StackTheme {
           Color(textFieldDefaultSearchIconLeftInt);
   @ignore
   Color? _textFieldDefaultSearchIconLeft;
-  final int textFieldDefaultSearchIconLeftInt;
+  late final int textFieldDefaultSearchIconLeftInt;
 
   // ==== textFieldErrorSearchIconLeft =====================================================
 
@@ -953,7 +953,7 @@ class StackTheme {
       _textFieldErrorSearchIconLeft ??= Color(textFieldErrorSearchIconLeftInt);
   @ignore
   Color? _textFieldErrorSearchIconLeft;
-  final int textFieldErrorSearchIconLeftInt;
+  late final int textFieldErrorSearchIconLeftInt;
 
   // ==== textFieldSuccessSearchIconLeft =====================================================
 
@@ -963,7 +963,7 @@ class StackTheme {
           Color(textFieldSuccessSearchIconLeftInt);
   @ignore
   Color? _textFieldSuccessSearchIconLeft;
-  final int textFieldSuccessSearchIconLeftInt;
+  late final int textFieldSuccessSearchIconLeftInt;
 
   // ==== textFieldActiveText =====================================================
 
@@ -972,7 +972,7 @@ class StackTheme {
       _textFieldActiveText ??= Color(textFieldActiveTextInt);
   @ignore
   Color? _textFieldActiveText;
-  final int textFieldActiveTextInt;
+  late final int textFieldActiveTextInt;
 
   // ==== textFieldDefaultText =====================================================
 
@@ -981,7 +981,7 @@ class StackTheme {
       _textFieldDefaultText ??= Color(textFieldDefaultTextInt);
   @ignore
   Color? _textFieldDefaultText;
-  final int textFieldDefaultTextInt;
+  late final int textFieldDefaultTextInt;
 
   // ==== textFieldErrorText =====================================================
 
@@ -990,7 +990,7 @@ class StackTheme {
       _textFieldErrorText ??= Color(textFieldErrorTextInt);
   @ignore
   Color? _textFieldErrorText;
-  final int textFieldErrorTextInt;
+  late final int textFieldErrorTextInt;
 
   // ==== textFieldSuccessText =====================================================
 
@@ -999,7 +999,7 @@ class StackTheme {
       _textFieldSuccessText ??= Color(textFieldSuccessTextInt);
   @ignore
   Color? _textFieldSuccessText;
-  final int textFieldSuccessTextInt;
+  late final int textFieldSuccessTextInt;
 
   // ==== textFieldActiveLabel =====================================================
 
@@ -1008,7 +1008,7 @@ class StackTheme {
       _textFieldActiveLabel ??= Color(textFieldActiveLabelInt);
   @ignore
   Color? _textFieldActiveLabel;
-  final int textFieldActiveLabelInt;
+  late final int textFieldActiveLabelInt;
 
   // ==== textFieldErrorLabel =====================================================
 
@@ -1017,7 +1017,7 @@ class StackTheme {
       _textFieldErrorLabel ??= Color(textFieldErrorLabelInt);
   @ignore
   Color? _textFieldErrorLabel;
-  final int textFieldErrorLabelInt;
+  late final int textFieldErrorLabelInt;
 
   // ==== textFieldSuccessLabel =====================================================
 
@@ -1026,7 +1026,7 @@ class StackTheme {
       _textFieldSuccessLabel ??= Color(textFieldSuccessLabelInt);
   @ignore
   Color? _textFieldSuccessLabel;
-  final int textFieldSuccessLabelInt;
+  late final int textFieldSuccessLabelInt;
 
   // ==== textFieldActiveSearchIconRight =====================================================
 
@@ -1036,7 +1036,7 @@ class StackTheme {
           Color(textFieldActiveSearchIconRightInt);
   @ignore
   Color? _textFieldActiveSearchIconRight;
-  final int textFieldActiveSearchIconRightInt;
+  late final int textFieldActiveSearchIconRightInt;
 
   // ==== textFieldDefaultSearchIconRight =====================================================
 
@@ -1046,7 +1046,7 @@ class StackTheme {
           Color(textFieldDefaultSearchIconRightInt);
   @ignore
   Color? _textFieldDefaultSearchIconRight;
-  final int textFieldDefaultSearchIconRightInt;
+  late final int textFieldDefaultSearchIconRightInt;
 
   // ==== textFieldErrorSearchIconRight =====================================================
 
@@ -1055,7 +1055,7 @@ class StackTheme {
       Color(textFieldErrorSearchIconRightInt);
   @ignore
   Color? _textFieldErrorSearchIconRight;
-  final int textFieldErrorSearchIconRightInt;
+  late final int textFieldErrorSearchIconRightInt;
 
   // ==== textFieldSuccessSearchIconRight =====================================================
 
@@ -1065,7 +1065,7 @@ class StackTheme {
           Color(textFieldSuccessSearchIconRightInt);
   @ignore
   Color? _textFieldSuccessSearchIconRight;
-  final int textFieldSuccessSearchIconRightInt;
+  late final int textFieldSuccessSearchIconRightInt;
 
   // ==== settingsItem2ActiveBG =====================================================
 
@@ -1074,7 +1074,7 @@ class StackTheme {
       _settingsItem2ActiveBG ??= Color(settingsItem2ActiveBGInt);
   @ignore
   Color? _settingsItem2ActiveBG;
-  final int settingsItem2ActiveBGInt;
+  late final int settingsItem2ActiveBGInt;
 
   // ==== settingsItem2ActiveText =====================================================
 
@@ -1083,7 +1083,7 @@ class StackTheme {
       _settingsItem2ActiveText ??= Color(settingsItem2ActiveTextInt);
   @ignore
   Color? _settingsItem2ActiveText;
-  final int settingsItem2ActiveTextInt;
+  late final int settingsItem2ActiveTextInt;
 
   // ==== settingsItem2ActiveSub =====================================================
 
@@ -1092,7 +1092,7 @@ class StackTheme {
       _settingsItem2ActiveSub ??= Color(settingsItem2ActiveSubInt);
   @ignore
   Color? _settingsItem2ActiveSub;
-  final int settingsItem2ActiveSubInt;
+  late final int settingsItem2ActiveSubInt;
 
   // ==== radioButtonIconBorder =====================================================
 
@@ -1101,7 +1101,7 @@ class StackTheme {
       _radioButtonIconBorder ??= Color(radioButtonIconBorderInt);
   @ignore
   Color? _radioButtonIconBorder;
-  final int radioButtonIconBorderInt;
+  late final int radioButtonIconBorderInt;
 
   // ==== radioButtonIconBorderDisabled =====================================================
 
@@ -1110,7 +1110,7 @@ class StackTheme {
       Color(radioButtonIconBorderDisabledInt);
   @ignore
   Color? _radioButtonIconBorderDisabled;
-  final int radioButtonIconBorderDisabledInt;
+  late final int radioButtonIconBorderDisabledInt;
 
   // ==== radioButtonBorderEnabled =====================================================
 
@@ -1119,7 +1119,7 @@ class StackTheme {
       _radioButtonBorderEnabled ??= Color(radioButtonBorderEnabledInt);
   @ignore
   Color? _radioButtonBorderEnabled;
-  final int radioButtonBorderEnabledInt;
+  late final int radioButtonBorderEnabledInt;
 
   // ==== radioButtonBorderDisabled =====================================================
 
@@ -1128,7 +1128,7 @@ class StackTheme {
       _radioButtonBorderDisabled ??= Color(radioButtonBorderDisabledInt);
   @ignore
   Color? _radioButtonBorderDisabled;
-  final int radioButtonBorderDisabledInt;
+  late final int radioButtonBorderDisabledInt;
 
   // ==== radioButtonIconCircle =====================================================
 
@@ -1137,7 +1137,7 @@ class StackTheme {
       _radioButtonIconCircle ??= Color(radioButtonIconCircleInt);
   @ignore
   Color? _radioButtonIconCircle;
-  final int radioButtonIconCircleInt;
+  late final int radioButtonIconCircleInt;
 
   // ==== radioButtonIconEnabled =====================================================
 
@@ -1146,7 +1146,7 @@ class StackTheme {
       _radioButtonIconEnabled ??= Color(radioButtonIconEnabledInt);
   @ignore
   Color? _radioButtonIconEnabled;
-  final int radioButtonIconEnabledInt;
+  late final int radioButtonIconEnabledInt;
 
   // ==== radioButtonTextEnabled =====================================================
 
@@ -1155,7 +1155,7 @@ class StackTheme {
       _radioButtonTextEnabled ??= Color(radioButtonTextEnabledInt);
   @ignore
   Color? _radioButtonTextEnabled;
-  final int radioButtonTextEnabledInt;
+  late final int radioButtonTextEnabledInt;
 
   // ==== radioButtonTextDisabled =====================================================
 
@@ -1164,7 +1164,7 @@ class StackTheme {
       _radioButtonTextDisabled ??= Color(radioButtonTextDisabledInt);
   @ignore
   Color? _radioButtonTextDisabled;
-  final int radioButtonTextDisabledInt;
+  late final int radioButtonTextDisabledInt;
 
   // ==== radioButtonLabelEnabled =====================================================
 
@@ -1173,7 +1173,7 @@ class StackTheme {
       _radioButtonLabelEnabled ??= Color(radioButtonLabelEnabledInt);
   @ignore
   Color? _radioButtonLabelEnabled;
-  final int radioButtonLabelEnabledInt;
+  late final int radioButtonLabelEnabledInt;
 
   // ==== radioButtonLabelDisabled =====================================================
 
@@ -1182,7 +1182,7 @@ class StackTheme {
       _radioButtonLabelDisabled ??= Color(radioButtonLabelDisabledInt);
   @ignore
   Color? _radioButtonLabelDisabled;
-  final int radioButtonLabelDisabledInt;
+  late final int radioButtonLabelDisabledInt;
 
   // ==== infoItemBG =====================================================
 
@@ -1190,7 +1190,7 @@ class StackTheme {
   Color get infoItemBG => _infoItemBG ??= Color(infoItemBGInt);
   @ignore
   Color? _infoItemBG;
-  final int infoItemBGInt;
+  late final int infoItemBGInt;
 
   // ==== infoItemLabel =====================================================
 
@@ -1198,7 +1198,7 @@ class StackTheme {
   Color get infoItemLabel => _infoItemLabel ??= Color(infoItemLabelInt);
   @ignore
   Color? _infoItemLabel;
-  final int infoItemLabelInt;
+  late final int infoItemLabelInt;
 
   // ==== infoItemText =====================================================
 
@@ -1206,7 +1206,7 @@ class StackTheme {
   Color get infoItemText => _infoItemText ??= Color(infoItemTextInt);
   @ignore
   Color? _infoItemText;
-  final int infoItemTextInt;
+  late final int infoItemTextInt;
 
   // ==== infoItemIcons =====================================================
 
@@ -1214,7 +1214,7 @@ class StackTheme {
   Color get infoItemIcons => _infoItemIcons ??= Color(infoItemIconsInt);
   @ignore
   Color? _infoItemIcons;
-  final int infoItemIconsInt;
+  late final int infoItemIconsInt;
 
   // ==== popupBG =====================================================
 
@@ -1222,7 +1222,7 @@ class StackTheme {
   Color get popupBG => _popupBG ??= Color(popupBGInt);
   @ignore
   Color? _popupBG;
-  final int popupBGInt;
+  late final int popupBGInt;
 
   // ==== currencyListItemBG =====================================================
 
@@ -1231,7 +1231,7 @@ class StackTheme {
       _currencyListItemBG ??= Color(currencyListItemBGInt);
   @ignore
   Color? _currencyListItemBG;
-  final int currencyListItemBGInt;
+  late final int currencyListItemBGInt;
 
   // ==== stackWalletBG =====================================================
 
@@ -1239,7 +1239,7 @@ class StackTheme {
   Color get stackWalletBG => _stackWalletBG ??= Color(stackWalletBGInt);
   @ignore
   Color? _stackWalletBG;
-  final int stackWalletBGInt;
+  late final int stackWalletBGInt;
 
   // ==== stackWalletMid =====================================================
 
@@ -1247,7 +1247,7 @@ class StackTheme {
   Color get stackWalletMid => _stackWalletMid ??= Color(stackWalletMidInt);
   @ignore
   Color? _stackWalletMid;
-  final int stackWalletMidInt;
+  late final int stackWalletMidInt;
 
   // ==== stackWalletBottom =====================================================
 
@@ -1256,7 +1256,7 @@ class StackTheme {
       _stackWalletBottom ??= Color(stackWalletBottomInt);
   @ignore
   Color? _stackWalletBottom;
-  final int stackWalletBottomInt;
+  late final int stackWalletBottomInt;
 
   // ==== bottomNavShadow =====================================================
 
@@ -1264,7 +1264,7 @@ class StackTheme {
   Color get bottomNavShadow => _bottomNavShadow ??= Color(bottomNavShadowInt);
   @ignore
   Color? _bottomNavShadow;
-  final int bottomNavShadowInt;
+  late final int bottomNavShadowInt;
 
   // ==== favoriteStarActive =====================================================
 
@@ -1273,7 +1273,7 @@ class StackTheme {
       _favoriteStarActive ??= Color(favoriteStarActiveInt);
   @ignore
   Color? _favoriteStarActive;
-  final int favoriteStarActiveInt;
+  late final int favoriteStarActiveInt;
 
   // ==== favoriteStarInactive =====================================================
 
@@ -1282,7 +1282,7 @@ class StackTheme {
       _favoriteStarInactive ??= Color(favoriteStarInactiveInt);
   @ignore
   Color? _favoriteStarInactive;
-  final int favoriteStarInactiveInt;
+  late final int favoriteStarInactiveInt;
 
   // ==== splash =====================================================
 
@@ -1290,7 +1290,7 @@ class StackTheme {
   Color get splash => _splash ??= Color(splashInt);
   @ignore
   Color? _splash;
-  final int splashInt;
+  late final int splashInt;
 
   // ==== highlight =====================================================
 
@@ -1298,7 +1298,7 @@ class StackTheme {
   Color get highlight => _highlight ??= Color(highlightInt);
   @ignore
   Color? _highlight;
-  final int highlightInt;
+  late final int highlightInt;
 
   // ==== warningForeground =====================================================
 
@@ -1307,7 +1307,7 @@ class StackTheme {
       _warningForeground ??= Color(warningForegroundInt);
   @ignore
   Color? _warningForeground;
-  final int warningForegroundInt;
+  late final int warningForegroundInt;
 
   // ==== warningBackground =====================================================
 
@@ -1316,7 +1316,7 @@ class StackTheme {
       _warningBackground ??= Color(warningBackgroundInt);
   @ignore
   Color? _warningBackground;
-  final int warningBackgroundInt;
+  late final int warningBackgroundInt;
 
   // ==== loadingOverlayTextColor =====================================================
 
@@ -1325,7 +1325,7 @@ class StackTheme {
       _loadingOverlayTextColor ??= Color(loadingOverlayTextColorInt);
   @ignore
   Color? _loadingOverlayTextColor;
-  final int loadingOverlayTextColorInt;
+  late final int loadingOverlayTextColorInt;
 
   // ==== myStackContactIconBG =====================================================
 
@@ -1334,7 +1334,7 @@ class StackTheme {
       _myStackContactIconBG ??= Color(myStackContactIconBGInt);
   @ignore
   Color? _myStackContactIconBG;
-  final int myStackContactIconBGInt;
+  late final int myStackContactIconBGInt;
 
   // ==== textConfirmTotalAmount =====================================================
 
@@ -1343,7 +1343,7 @@ class StackTheme {
       _textConfirmTotalAmount ??= Color(textConfirmTotalAmountInt);
   @ignore
   Color? _textConfirmTotalAmount;
-  final int textConfirmTotalAmountInt;
+  late final int textConfirmTotalAmountInt;
 
   // ==== textSelectedWordTableItem =====================================================
 
@@ -1352,7 +1352,7 @@ class StackTheme {
       _textSelectedWordTableItem ??= Color(textSelectedWordTableItemInt);
   @ignore
   Color? _textSelectedWordTableItem;
-  final int textSelectedWordTableItemInt;
+  late final int textSelectedWordTableItemInt;
 
   // ==== rateTypeToggleColorOn =====================================================
 
@@ -1361,7 +1361,7 @@ class StackTheme {
       _rateTypeToggleColorOn ??= Color(rateTypeToggleColorOnInt);
   @ignore
   Color? _rateTypeToggleColorOn;
-  final int rateTypeToggleColorOnInt;
+  late final int rateTypeToggleColorOnInt;
 
   // ==== rateTypeToggleColorOff =====================================================
 
@@ -1370,7 +1370,7 @@ class StackTheme {
       _rateTypeToggleColorOff ??= Color(rateTypeToggleColorOffInt);
   @ignore
   Color? _rateTypeToggleColorOff;
-  final int rateTypeToggleColorOffInt;
+  late final int rateTypeToggleColorOffInt;
 
   // ==== rateTypeToggleDesktopColorOn =====================================================
 
@@ -1379,7 +1379,7 @@ class StackTheme {
       _rateTypeToggleDesktopColorOn ??= Color(rateTypeToggleDesktopColorOnInt);
   @ignore
   Color? _rateTypeToggleDesktopColorOn;
-  final int rateTypeToggleDesktopColorOnInt;
+  late final int rateTypeToggleDesktopColorOnInt;
 
   // ==== rateTypeToggleDesktopColorOff =====================================================
 
@@ -1388,7 +1388,7 @@ class StackTheme {
       Color(rateTypeToggleDesktopColorOffInt);
   @ignore
   Color? _rateTypeToggleDesktopColorOff;
-  final int rateTypeToggleDesktopColorOffInt;
+  late final int rateTypeToggleDesktopColorOffInt;
 
   // ==== ethTagText =====================================================
 
@@ -1396,7 +1396,7 @@ class StackTheme {
   Color get ethTagText => _ethTagText ??= Color(ethTagTextInt);
   @ignore
   Color? _ethTagText;
-  final int ethTagTextInt;
+  late final int ethTagTextInt;
 
   // ==== ethTagBG =====================================================
 
@@ -1404,7 +1404,7 @@ class StackTheme {
   Color get ethTagBG => _ethTagBG ??= Color(ethTagBGInt);
   @ignore
   Color? _ethTagBG;
-  final int ethTagBGInt;
+  late final int ethTagBGInt;
 
   // ==== ethWalletTagText =====================================================
 
@@ -1413,7 +1413,7 @@ class StackTheme {
       _ethWalletTagText ??= Color(ethWalletTagTextInt);
   @ignore
   Color? _ethWalletTagText;
-  final int ethWalletTagTextInt;
+  late final int ethWalletTagTextInt;
 
   // ==== ethWalletTagBG =====================================================
 
@@ -1421,7 +1421,7 @@ class StackTheme {
   Color get ethWalletTagBG => _ethWalletTagBG ??= Color(ethWalletTagBGInt);
   @ignore
   Color? _ethWalletTagBG;
-  final int ethWalletTagBGInt;
+  late final int ethWalletTagBGInt;
 
   // ==== tokenSummaryTextPrimary =====================================================
 
@@ -1430,7 +1430,7 @@ class StackTheme {
       _tokenSummaryTextPrimary ??= Color(tokenSummaryTextPrimaryInt);
   @ignore
   Color? _tokenSummaryTextPrimary;
-  final int tokenSummaryTextPrimaryInt;
+  late final int tokenSummaryTextPrimaryInt;
 
   // ==== tokenSummaryTextSecondary =====================================================
 
@@ -1439,7 +1439,7 @@ class StackTheme {
       _tokenSummaryTextSecondary ??= Color(tokenSummaryTextSecondaryInt);
   @ignore
   Color? _tokenSummaryTextSecondary;
-  final int tokenSummaryTextSecondaryInt;
+  late final int tokenSummaryTextSecondaryInt;
 
   // ==== tokenSummaryBG =====================================================
 
@@ -1447,7 +1447,7 @@ class StackTheme {
   Color get tokenSummaryBG => _tokenSummaryBG ??= Color(tokenSummaryBGInt);
   @ignore
   Color? _tokenSummaryBG;
-  final int tokenSummaryBGInt;
+  late final int tokenSummaryBGInt;
 
   // ==== tokenSummaryButtonBG =====================================================
 
@@ -1456,7 +1456,7 @@ class StackTheme {
       _tokenSummaryButtonBG ??= Color(tokenSummaryButtonBGInt);
   @ignore
   Color? _tokenSummaryButtonBG;
-  final int tokenSummaryButtonBGInt;
+  late final int tokenSummaryButtonBGInt;
 
   // ==== tokenSummaryIcon =====================================================
 
@@ -1465,7 +1465,7 @@ class StackTheme {
       _tokenSummaryIcon ??= Color(tokenSummaryIconInt);
   @ignore
   Color? _tokenSummaryIcon;
-  final int tokenSummaryIconInt;
+  late final int tokenSummaryIconInt;
 
   // ==== coinColors =====================================================
 
@@ -1474,478 +1474,341 @@ class StackTheme {
       _coinColors ??= parseCoinColors(coinColorsJsonString);
   @ignore
   Map<Coin, Color>? _coinColors;
-  final String coinColorsJsonString;
+  late final String coinColorsJsonString;
 
   // ==== assets =====================================================
 
-  final ThemeAssets assets;
+  @Name("assets") // legacy "column" name
+  late final ThemeAssets? assetsV1;
+
+  late final ThemeAssetsV2? assetsV2;
+
+  @ignore
+  IThemeAssets get assets => assetsV2 ?? assetsV1!;
 
   // ===========================================================================
 
-  StackTheme({
-    required this.themeId,
-    required this.name,
-    required this.assets,
-    required this.brightnessString,
-    required this.backgroundInt,
-    required this.backgroundAppBarInt,
-    required this.gradientBackgroundString,
-    required this.standardBoxShadowString,
-    required this.homeViewButtonBarBoxShadowString,
-    required this.overlayInt,
-    required this.accentColorBlueInt,
-    required this.accentColorGreenInt,
-    required this.accentColorYellowInt,
-    required this.accentColorRedInt,
-    required this.accentColorOrangeInt,
-    required this.accentColorDarkInt,
-    required this.shadowInt,
-    required this.textDarkInt,
-    required this.textDark2Int,
-    required this.textDark3Int,
-    required this.textSubtitle1Int,
-    required this.textSubtitle2Int,
-    required this.textSubtitle3Int,
-    required this.textSubtitle4Int,
-    required this.textSubtitle5Int,
-    required this.textSubtitle6Int,
-    required this.textWhiteInt,
-    required this.textFavoriteCardInt,
-    required this.textErrorInt,
-    required this.textRestoreInt,
-    required this.buttonBackPrimaryInt,
-    required this.buttonBackSecondaryInt,
-    required this.buttonBackPrimaryDisabledInt,
-    required this.buttonBackSecondaryDisabledInt,
-    required this.buttonBackBorderInt,
-    required this.buttonBackBorderDisabledInt,
-    required this.buttonBackBorderSecondaryInt,
-    required this.buttonBackBorderSecondaryDisabledInt,
-    required this.numberBackDefaultInt,
-    required this.numpadBackDefaultInt,
-    required this.bottomNavBackInt,
-    required this.buttonTextPrimaryInt,
-    required this.buttonTextSecondaryInt,
-    required this.buttonTextPrimaryDisabledInt,
-    required this.buttonTextSecondaryDisabledInt,
-    required this.buttonTextBorderInt,
-    required this.buttonTextDisabledInt,
-    required this.buttonTextBorderlessInt,
-    required this.buttonTextBorderlessDisabledInt,
-    required this.numberTextDefaultInt,
-    required this.numpadTextDefaultInt,
-    required this.bottomNavTextInt,
-    required this.customTextButtonEnabledTextInt,
-    required this.customTextButtonDisabledTextInt,
-    required this.switchBGOnInt,
-    required this.switchBGOffInt,
-    required this.switchBGDisabledInt,
-    required this.switchCircleOnInt,
-    required this.switchCircleOffInt,
-    required this.switchCircleDisabledInt,
-    required this.stepIndicatorBGCheckInt,
-    required this.stepIndicatorBGNumberInt,
-    required this.stepIndicatorBGInactiveInt,
-    required this.stepIndicatorBGLinesInt,
-    required this.stepIndicatorBGLinesInactiveInt,
-    required this.stepIndicatorIconTextInt,
-    required this.stepIndicatorIconNumberInt,
-    required this.stepIndicatorIconInactiveInt,
-    required this.checkboxBGCheckedInt,
-    required this.checkboxBorderEmptyInt,
-    required this.checkboxBGDisabledInt,
-    required this.checkboxIconCheckedInt,
-    required this.checkboxIconDisabledInt,
-    required this.checkboxTextLabelInt,
-    required this.snackBarBackSuccessInt,
-    required this.snackBarBackErrorInt,
-    required this.snackBarBackInfoInt,
-    required this.snackBarTextSuccessInt,
-    required this.snackBarTextErrorInt,
-    required this.snackBarTextInfoInt,
-    required this.bottomNavIconBackInt,
-    required this.bottomNavIconIconInt,
-    required this.bottomNavIconIconHighlightedInt,
-    required this.topNavIconPrimaryInt,
-    required this.topNavIconGreenInt,
-    required this.topNavIconYellowInt,
-    required this.topNavIconRedInt,
-    required this.settingsIconBackInt,
-    required this.settingsIconIconInt,
-    required this.settingsIconBack2Int,
-    required this.settingsIconElementInt,
-    required this.textFieldActiveBGInt,
-    required this.textFieldDefaultBGInt,
-    required this.textFieldErrorBGInt,
-    required this.textFieldSuccessBGInt,
-    required this.textFieldErrorBorderInt,
-    required this.textFieldSuccessBorderInt,
-    required this.textFieldActiveSearchIconLeftInt,
-    required this.textFieldDefaultSearchIconLeftInt,
-    required this.textFieldErrorSearchIconLeftInt,
-    required this.textFieldSuccessSearchIconLeftInt,
-    required this.textFieldActiveTextInt,
-    required this.textFieldDefaultTextInt,
-    required this.textFieldErrorTextInt,
-    required this.textFieldSuccessTextInt,
-    required this.textFieldActiveLabelInt,
-    required this.textFieldErrorLabelInt,
-    required this.textFieldSuccessLabelInt,
-    required this.textFieldActiveSearchIconRightInt,
-    required this.textFieldDefaultSearchIconRightInt,
-    required this.textFieldErrorSearchIconRightInt,
-    required this.textFieldSuccessSearchIconRightInt,
-    required this.settingsItem2ActiveBGInt,
-    required this.settingsItem2ActiveTextInt,
-    required this.settingsItem2ActiveSubInt,
-    required this.radioButtonIconBorderInt,
-    required this.radioButtonIconBorderDisabledInt,
-    required this.radioButtonBorderEnabledInt,
-    required this.radioButtonBorderDisabledInt,
-    required this.radioButtonIconCircleInt,
-    required this.radioButtonIconEnabledInt,
-    required this.radioButtonTextEnabledInt,
-    required this.radioButtonTextDisabledInt,
-    required this.radioButtonLabelEnabledInt,
-    required this.radioButtonLabelDisabledInt,
-    required this.infoItemBGInt,
-    required this.infoItemLabelInt,
-    required this.infoItemTextInt,
-    required this.infoItemIconsInt,
-    required this.popupBGInt,
-    required this.currencyListItemBGInt,
-    required this.stackWalletBGInt,
-    required this.stackWalletMidInt,
-    required this.stackWalletBottomInt,
-    required this.bottomNavShadowInt,
-    required this.favoriteStarActiveInt,
-    required this.favoriteStarInactiveInt,
-    required this.splashInt,
-    required this.highlightInt,
-    required this.warningForegroundInt,
-    required this.warningBackgroundInt,
-    required this.loadingOverlayTextColorInt,
-    required this.myStackContactIconBGInt,
-    required this.textConfirmTotalAmountInt,
-    required this.textSelectedWordTableItemInt,
-    required this.rateTypeToggleColorOnInt,
-    required this.rateTypeToggleColorOffInt,
-    required this.rateTypeToggleDesktopColorOnInt,
-    required this.rateTypeToggleDesktopColorOffInt,
-    required this.ethTagTextInt,
-    required this.ethTagBGInt,
-    required this.ethWalletTagTextInt,
-    required this.ethWalletTagBGInt,
-    required this.tokenSummaryTextPrimaryInt,
-    required this.tokenSummaryTextSecondaryInt,
-    required this.tokenSummaryBGInt,
-    required this.tokenSummaryButtonBGInt,
-    required this.tokenSummaryIconInt,
-    required this.coinColorsJsonString,
-  });
+  late final int? version;
+
+  StackTheme();
 
   factory StackTheme.fromJson({
     required Map<String, dynamic> json,
     required String applicationThemesDirectoryPath,
   }) {
-    return StackTheme(
-      themeId: json["id"] as String,
-      name: json["name"] as String,
-      brightnessString: json["brightness"] as String,
-      backgroundInt: parseColor(json["colors"]["background"] as String),
-      backgroundAppBarInt:
-          parseColor(json["colors"]["background_app_bar"] as String),
-      gradientBackgroundString: json["colors"]["gradients"] != null
+    final version = json["version"] as int? ?? 1;
+
+    return StackTheme()
+      ..version = version
+      ..assetsV1 = version == 1
+          ? ThemeAssets.fromJson(
+              json: Map<String, dynamic>.from(json["assets"] as Map),
+              applicationThemesDirectoryPath: applicationThemesDirectoryPath,
+              themeId: json["id"] as String,
+            )
+          : null
+      ..assetsV2 = version == 2
+          ? ThemeAssetsV2.fromJson(
+              json: Map<String, dynamic>.from(json["assets"] as Map),
+              applicationThemesDirectoryPath: applicationThemesDirectoryPath,
+              themeId: json["id"] as String,
+            )
+          : null
+      ..themeId = json["id"] as String
+      ..name = json["name"] as String
+      ..brightnessString = json["brightness"] as String
+      ..backgroundInt = parseColor(json["colors"]["background"] as String)
+      ..backgroundAppBarInt =
+          parseColor(json["colors"]["background_app_bar"] as String)
+      ..gradientBackgroundString = json["colors"]["gradients"] != null
           ? jsonEncode(json["colors"]["gradients"])
-          : null,
-      standardBoxShadowString:
-          jsonEncode(json["colors"]["box_shadows"]["standard"] as Map),
-      homeViewButtonBarBoxShadowString:
+          : null
+      ..standardBoxShadowString =
+          jsonEncode(json["colors"]["box_shadows"]["standard"] as Map)
+      ..homeViewButtonBarBoxShadowString =
           json["colors"]["box_shadows"]["home_view_button_bar"] == null
               ? null
               : jsonEncode(
-                  json["colors"]["box_shadows"]["home_view_button_bar"] as Map),
-      coinColorsJsonString: jsonEncode(json["colors"]['coin'] as Map),
-      assets: ThemeAssets.fromJson(
-        json: Map<String, dynamic>.from(json["assets"] as Map),
-        applicationThemesDirectoryPath: applicationThemesDirectoryPath,
-        themeId: json["id"] as String,
-      ),
-      overlayInt: parseColor(json["colors"]["overlay"] as String),
-      accentColorBlueInt:
-          parseColor(json["colors"]["accent_color_blue"] as String),
-      accentColorGreenInt:
-          parseColor(json["colors"]["accent_color_green"] as String),
-      accentColorYellowInt:
-          parseColor(json["colors"]["accent_color_yellow"] as String),
-      accentColorRedInt:
-          parseColor(json["colors"]["accent_color_red"] as String),
-      accentColorOrangeInt:
-          parseColor(json["colors"]["accent_color_orange"] as String),
-      accentColorDarkInt:
-          parseColor(json["colors"]["accent_color_dark"] as String),
-      shadowInt: parseColor(json["colors"]["shadow"] as String),
-      textDarkInt: parseColor(json["colors"]["text_dark_one"] as String),
-      textDark2Int: parseColor(json["colors"]["text_dark_two"] as String),
-      textDark3Int: parseColor(json["colors"]["text_dark_three"] as String),
-      textWhiteInt: parseColor(json["colors"]["text_white"] as String),
-      textFavoriteCardInt:
-          parseColor(json["colors"]["text_favorite"] as String),
-      textErrorInt: parseColor(json["colors"]["text_error"] as String),
-      textRestoreInt: parseColor(json["colors"]["text_restore"] as String),
-      buttonBackPrimaryInt:
-          parseColor(json["colors"]["button_back_primary"] as String),
-      buttonBackSecondaryInt:
-          parseColor(json["colors"]["button_back_secondary"] as String),
-      buttonBackPrimaryDisabledInt:
-          parseColor(json["colors"]["button_back_primary_disabled"] as String),
-      buttonBackSecondaryDisabledInt: parseColor(
-          json["colors"]["button_back_secondary_disabled"] as String),
-      buttonBackBorderInt:
-          parseColor(json["colors"]["button_back_border"] as String),
-      buttonBackBorderDisabledInt:
-          parseColor(json["colors"]["button_back_border_disabled"] as String),
-      buttonBackBorderSecondaryInt:
-          parseColor(json["colors"]["button_back_border_secondary"] as String),
-      buttonBackBorderSecondaryDisabledInt: parseColor(
-          json["colors"]["button_back_border_secondary_disabled"] as String),
-      numberBackDefaultInt:
-          parseColor(json["colors"]["number_back_default"] as String),
-      numpadBackDefaultInt:
-          parseColor(json["colors"]["numpad_back_default"] as String),
-      bottomNavBackInt: parseColor(json["colors"]["bottom_nav_back"] as String),
-      textSubtitle1Int:
-          parseColor(json["colors"]["text_subtitle_one"] as String),
-      textSubtitle2Int:
-          parseColor(json["colors"]["text_subtitle_two"] as String),
-      textSubtitle3Int:
-          parseColor(json["colors"]["text_subtitle_three"] as String),
-      textSubtitle4Int:
-          parseColor(json["colors"]["text_subtitle_four"] as String),
-      textSubtitle5Int:
-          parseColor(json["colors"]["text_subtitle_five"] as String),
-      textSubtitle6Int:
-          parseColor(json["colors"]["text_subtitle_six"] as String),
-      buttonTextPrimaryInt:
-          parseColor(json["colors"]["button_text_primary"] as String),
-      buttonTextSecondaryInt:
-          parseColor(json["colors"]["button_text_secondary"] as String),
-      buttonTextPrimaryDisabledInt:
-          parseColor(json["colors"]["button_text_primary_disabled"] as String),
-      buttonTextSecondaryDisabledInt: parseColor(
-          json["colors"]["button_text_secondary_disabled"] as String),
-      buttonTextBorderInt:
-          parseColor(json["colors"]["button_text_border"] as String),
-      buttonTextDisabledInt:
-          parseColor(json["colors"]["button_text_disabled"] as String),
-      buttonTextBorderlessInt:
-          parseColor(json["colors"]["button_text_borderless"] as String),
-      buttonTextBorderlessDisabledInt: parseColor(
-          json["colors"]["button_text_borderless_disabled"] as String),
-      numberTextDefaultInt:
-          parseColor(json["colors"]["number_text_default"] as String),
-      numpadTextDefaultInt:
-          parseColor(json["colors"]["numpad_text_default"] as String),
-      bottomNavTextInt: parseColor(json["colors"]["bottom_nav_text"] as String),
-      customTextButtonEnabledTextInt: parseColor(
-          json["colors"]["custom_text_button_enabled_text"] as String),
-      customTextButtonDisabledTextInt: parseColor(
-          json["colors"]["custom_text_button_disabled_text"] as String),
-      switchBGOnInt: parseColor(json["colors"]["switch_bg_on"] as String),
-      switchBGOffInt: parseColor(json["colors"]["switch_bg_off"] as String),
-      switchBGDisabledInt:
-          parseColor(json["colors"]["switch_bg_disabled"] as String),
-      switchCircleOnInt:
-          parseColor(json["colors"]["switch_circle_on"] as String),
-      switchCircleOffInt:
-          parseColor(json["colors"]["switch_circle_off"] as String),
-      switchCircleDisabledInt:
-          parseColor(json["colors"]["switch_circle_disabled"] as String),
-      stepIndicatorBGCheckInt:
-          parseColor(json["colors"]["step_indicator_bg_check"] as String),
-      stepIndicatorBGNumberInt:
-          parseColor(json["colors"]["step_indicator_bg_number"] as String),
-      stepIndicatorBGInactiveInt:
-          parseColor(json["colors"]["step_indicator_bg_inactive"] as String),
-      stepIndicatorBGLinesInt:
-          parseColor(json["colors"]["step_indicator_bg_lines"] as String),
-      stepIndicatorBGLinesInactiveInt: parseColor(
-          json["colors"]["step_indicator_bg_lines_inactive"] as String),
-      stepIndicatorIconTextInt:
-          parseColor(json["colors"]["step_indicator_icon_text"] as String),
-      stepIndicatorIconNumberInt:
-          parseColor(json["colors"]["step_indicator_icon_number"] as String),
-      stepIndicatorIconInactiveInt:
-          parseColor(json["colors"]["step_indicator_icon_inactive"] as String),
-      checkboxBGCheckedInt:
-          parseColor(json["colors"]["checkbox_bg_checked"] as String),
-      checkboxBorderEmptyInt:
-          parseColor(json["colors"]["checkbox_border_empty"] as String),
-      checkboxBGDisabledInt:
-          parseColor(json["colors"]["checkbox_bg_disabled"] as String),
-      checkboxIconCheckedInt:
-          parseColor(json["colors"]["checkbox_icon_checked"] as String),
-      checkboxIconDisabledInt:
-          parseColor(json["colors"]["checkbox_icon_disabled"] as String),
-      checkboxTextLabelInt:
-          parseColor(json["colors"]["checkbox_text_label"] as String),
-      snackBarBackSuccessInt:
-          parseColor(json["colors"]["snack_bar_back_success"] as String),
-      snackBarBackErrorInt:
-          parseColor(json["colors"]["snack_bar_back_error"] as String),
-      snackBarBackInfoInt:
-          parseColor(json["colors"]["snack_bar_back_info"] as String),
-      snackBarTextSuccessInt:
-          parseColor(json["colors"]["snack_bar_text_success"] as String),
-      snackBarTextErrorInt:
-          parseColor(json["colors"]["snack_bar_text_error"] as String),
-      snackBarTextInfoInt:
-          parseColor(json["colors"]["snack_bar_text_info"] as String),
-      bottomNavIconBackInt:
-          parseColor(json["colors"]["bottom_nav_icon_back"] as String),
-      bottomNavIconIconInt:
-          parseColor(json["colors"]["bottom_nav_icon_icon"] as String),
-      bottomNavIconIconHighlightedInt: parseColor(
-          json["colors"]["bottom_nav_icon_icon_highlighted"] as String),
-      topNavIconPrimaryInt:
-          parseColor(json["colors"]["top_nav_icon_primary"] as String),
-      topNavIconGreenInt:
-          parseColor(json["colors"]["top_nav_icon_green"] as String),
-      topNavIconYellowInt:
-          parseColor(json["colors"]["top_nav_icon_yellow"] as String),
-      topNavIconRedInt:
-          parseColor(json["colors"]["top_nav_icon_red"] as String),
-      settingsIconBackInt:
-          parseColor(json["colors"]["settings_icon_back"] as String),
-      settingsIconIconInt:
-          parseColor(json["colors"]["settings_icon_icon"] as String),
-      settingsIconBack2Int:
-          parseColor(json["colors"]["settings_icon_back_two"] as String),
-      settingsIconElementInt:
-          parseColor(json["colors"]["settings_icon_element"] as String),
-      textFieldActiveBGInt:
-          parseColor(json["colors"]["text_field_active_bg"] as String),
-      textFieldDefaultBGInt:
-          parseColor(json["colors"]["text_field_default_bg"] as String),
-      textFieldErrorBGInt:
-          parseColor(json["colors"]["text_field_error_bg"] as String),
-      textFieldSuccessBGInt:
-          parseColor(json["colors"]["text_field_success_bg"] as String),
-      textFieldErrorBorderInt:
-          parseColor(json["colors"]["text_field_error_border"] as String),
-      textFieldSuccessBorderInt:
-          parseColor(json["colors"]["text_field_success_border"] as String),
-      textFieldActiveSearchIconLeftInt: parseColor(
-          json["colors"]["text_field_active_search_icon_left"] as String),
-      textFieldDefaultSearchIconLeftInt: parseColor(
-          json["colors"]["text_field_default_search_icon_left"] as String),
-      textFieldErrorSearchIconLeftInt: parseColor(
-          json["colors"]["text_field_error_search_icon_left"] as String),
-      textFieldSuccessSearchIconLeftInt: parseColor(
-          json["colors"]["text_field_success_search_icon_left"] as String),
-      textFieldActiveTextInt:
-          parseColor(json["colors"]["text_field_active_text"] as String),
-      textFieldDefaultTextInt:
-          parseColor(json["colors"]["text_field_default_text"] as String),
-      textFieldErrorTextInt:
-          parseColor(json["colors"]["text_field_error_text"] as String),
-      textFieldSuccessTextInt:
-          parseColor(json["colors"]["text_field_success_text"] as String),
-      textFieldActiveLabelInt:
-          parseColor(json["colors"]["text_field_active_label"] as String),
-      textFieldErrorLabelInt:
-          parseColor(json["colors"]["text_field_error_label"] as String),
-      textFieldSuccessLabelInt:
-          parseColor(json["colors"]["text_field_success_label"] as String),
-      textFieldActiveSearchIconRightInt: parseColor(
-          json["colors"]["text_field_active_search_icon_right"] as String),
-      textFieldDefaultSearchIconRightInt: parseColor(
-          json["colors"]["text_field_default_search_icon_right"] as String),
-      textFieldErrorSearchIconRightInt: parseColor(
-          json["colors"]["text_field_error_search_icon_right"] as String),
-      textFieldSuccessSearchIconRightInt: parseColor(
-          json["colors"]["text_field_success_search_icon_right"] as String),
-      settingsItem2ActiveBGInt: parseColor(
-          json["colors"]["settings_item_level_two_active_bg"] as String),
-      settingsItem2ActiveTextInt: parseColor(
-          json["colors"]["settings_item_level_two_active_text"] as String),
-      settingsItem2ActiveSubInt: parseColor(
-          json["colors"]["settings_item_level_two_active_sub"] as String),
-      radioButtonIconBorderInt:
-          parseColor(json["colors"]["radio_button_icon_border"] as String),
-      radioButtonIconBorderDisabledInt: parseColor(
-          json["colors"]["radio_button_icon_border_disabled"] as String),
-      radioButtonBorderEnabledInt:
-          parseColor(json["colors"]["radio_button_border_enabled"] as String),
-      radioButtonBorderDisabledInt:
-          parseColor(json["colors"]["radio_button_border_disabled"] as String),
-      radioButtonIconCircleInt:
-          parseColor(json["colors"]["radio_button_icon_circle"] as String),
-      radioButtonIconEnabledInt:
-          parseColor(json["colors"]["radio_button_icon_enabled"] as String),
-      radioButtonTextEnabledInt:
-          parseColor(json["colors"]["radio_button_text_enabled"] as String),
-      radioButtonTextDisabledInt:
-          parseColor(json["colors"]["radio_button_text_disabled"] as String),
-      radioButtonLabelEnabledInt:
-          parseColor(json["colors"]["radio_button_label_enabled"] as String),
-      radioButtonLabelDisabledInt:
-          parseColor(json["colors"]["radio_button_label_disabled"] as String),
-      infoItemBGInt: parseColor(json["colors"]["info_item_bg"] as String),
-      infoItemLabelInt: parseColor(json["colors"]["info_item_label"] as String),
-      infoItemTextInt: parseColor(json["colors"]["info_item_text"] as String),
-      infoItemIconsInt: parseColor(json["colors"]["info_item_icons"] as String),
-      popupBGInt: parseColor(json["colors"]["popup_bg"] as String),
-      currencyListItemBGInt:
-          parseColor(json["colors"]["currency_list_item_bg"] as String),
-      stackWalletBGInt: parseColor(json["colors"]["sw_bg"] as String),
-      stackWalletMidInt: parseColor(json["colors"]["sw_mid"] as String),
-      stackWalletBottomInt: parseColor(json["colors"]["sw_bottom"] as String),
-      bottomNavShadowInt:
-          parseColor(json["colors"]["bottom_nav_shadow"] as String),
-      splashInt: parseColor(json["colors"]["splash"] as String),
-      highlightInt: parseColor(json["colors"]["highlight"] as String),
-      warningForegroundInt:
-          parseColor(json["colors"]["warning_foreground"] as String),
-      warningBackgroundInt:
-          parseColor(json["colors"]["warning_background"] as String),
-      loadingOverlayTextColorInt:
-          parseColor(json["colors"]["loading_overlay_text_color"] as String),
-      myStackContactIconBGInt:
-          parseColor(json["colors"]["my_stack_contact_icon_bg"] as String),
-      textConfirmTotalAmountInt:
-          parseColor(json["colors"]["text_confirm_total_amount"] as String),
-      textSelectedWordTableItemInt: parseColor(
-          json["colors"]["text_selected_word_table_iterm"] as String),
-      favoriteStarActiveInt:
-          parseColor(json["colors"]["favorite_star_active"] as String),
-      favoriteStarInactiveInt:
-          parseColor(json["colors"]["favorite_star_inactive"] as String),
-      rateTypeToggleColorOnInt:
-          parseColor(json["colors"]["rate_type_toggle_color_on"] as String),
-      rateTypeToggleColorOffInt:
-          parseColor(json["colors"]["rate_type_toggle_color_off"] as String),
-      rateTypeToggleDesktopColorOnInt: parseColor(
-          json["colors"]["rate_type_toggle_desktop_color_on"] as String),
-      rateTypeToggleDesktopColorOffInt: parseColor(
-          json["colors"]["rate_type_toggle_desktop_color_off"] as String),
-      ethTagTextInt: parseColor(json["colors"]["eth_tag_text"] as String),
-      ethTagBGInt: parseColor(json["colors"]["eth_tag_bg"] as String),
-      ethWalletTagTextInt:
-          parseColor(json["colors"]["eth_wallet_tag_text"] as String),
-      ethWalletTagBGInt:
-          parseColor(json["colors"]["eth_wallet_tag_bg"] as String),
-      tokenSummaryTextPrimaryInt:
-          parseColor(json["colors"]["token_summary_text_primary"] as String),
-      tokenSummaryTextSecondaryInt:
-          parseColor(json["colors"]["token_summary_text_secondary"] as String),
-      tokenSummaryBGInt:
-          parseColor(json["colors"]["token_summary_bg"] as String),
-      tokenSummaryButtonBGInt:
-          parseColor(json["colors"]["token_summary_button_bg"] as String),
-      tokenSummaryIconInt:
-          parseColor(json["colors"]["token_summary_icon"] as String),
-    );
+                  json["colors"]["box_shadows"]["home_view_button_bar"] as Map)
+      ..coinColorsJsonString = jsonEncode(json["colors"]['coin'] as Map)
+      ..overlayInt = parseColor(json["colors"]["overlay"] as String)
+      ..accentColorBlueInt =
+          parseColor(json["colors"]["accent_color_blue"] as String)
+      ..accentColorGreenInt =
+          parseColor(json["colors"]["accent_color_green"] as String)
+      ..accentColorYellowInt =
+          parseColor(json["colors"]["accent_color_yellow"] as String)
+      ..accentColorRedInt =
+          parseColor(json["colors"]["accent_color_red"] as String)
+      ..accentColorOrangeInt =
+          parseColor(json["colors"]["accent_color_orange"] as String)
+      ..accentColorDarkInt =
+          parseColor(json["colors"]["accent_color_dark"] as String)
+      ..shadowInt = parseColor(json["colors"]["shadow"] as String)
+      ..textDarkInt = parseColor(json["colors"]["text_dark_one"] as String)
+      ..textDark2Int = parseColor(json["colors"]["text_dark_two"] as String)
+      ..textDark3Int = parseColor(json["colors"]["text_dark_three"] as String)
+      ..textWhiteInt = parseColor(json["colors"]["text_white"] as String)
+      ..textFavoriteCardInt =
+          parseColor(json["colors"]["text_favorite"] as String)
+      ..textErrorInt = parseColor(json["colors"]["text_error"] as String)
+      ..textRestoreInt = parseColor(json["colors"]["text_restore"] as String)
+      ..buttonBackPrimaryInt =
+          parseColor(json["colors"]["button_back_primary"] as String)
+      ..buttonBackSecondaryInt =
+          parseColor(json["colors"]["button_back_secondary"] as String)
+      ..buttonBackPrimaryDisabledInt =
+          parseColor(json["colors"]["button_back_primary_disabled"] as String)
+      ..buttonBackSecondaryDisabledInt =
+          parseColor(json["colors"]["button_back_secondary_disabled"] as String)
+      ..buttonBackBorderInt =
+          parseColor(json["colors"]["button_back_border"] as String)
+      ..buttonBackBorderDisabledInt =
+          parseColor(json["colors"]["button_back_border_disabled"] as String)
+      ..buttonBackBorderSecondaryInt =
+          parseColor(json["colors"]["button_back_border_secondary"] as String)
+      ..buttonBackBorderSecondaryDisabledInt = parseColor(
+          json["colors"]["button_back_border_secondary_disabled"] as String)
+      ..numberBackDefaultInt =
+          parseColor(json["colors"]["number_back_default"] as String)
+      ..numpadBackDefaultInt =
+          parseColor(json["colors"]["numpad_back_default"] as String)
+      ..bottomNavBackInt =
+          parseColor(json["colors"]["bottom_nav_back"] as String)
+      ..textSubtitle1Int =
+          parseColor(json["colors"]["text_subtitle_one"] as String)
+      ..textSubtitle2Int =
+          parseColor(json["colors"]["text_subtitle_two"] as String)
+      ..textSubtitle3Int =
+          parseColor(json["colors"]["text_subtitle_three"] as String)
+      ..textSubtitle4Int =
+          parseColor(json["colors"]["text_subtitle_four"] as String)
+      ..textSubtitle5Int =
+          parseColor(json["colors"]["text_subtitle_five"] as String)
+      ..textSubtitle6Int =
+          parseColor(json["colors"]["text_subtitle_six"] as String)
+      ..buttonTextPrimaryInt =
+          parseColor(json["colors"]["button_text_primary"] as String)
+      ..buttonTextSecondaryInt =
+          parseColor(json["colors"]["button_text_secondary"] as String)
+      ..buttonTextPrimaryDisabledInt =
+          parseColor(json["colors"]["button_text_primary_disabled"] as String)
+      ..buttonTextSecondaryDisabledInt =
+          parseColor(json["colors"]["button_text_secondary_disabled"] as String)
+      ..buttonTextBorderInt =
+          parseColor(json["colors"]["button_text_border"] as String)
+      ..buttonTextDisabledInt =
+          parseColor(json["colors"]["button_text_disabled"] as String)
+      ..buttonTextBorderlessInt =
+          parseColor(json["colors"]["button_text_borderless"] as String)
+      ..buttonTextBorderlessDisabledInt = parseColor(
+          json["colors"]["button_text_borderless_disabled"] as String)
+      ..numberTextDefaultInt =
+          parseColor(json["colors"]["number_text_default"] as String)
+      ..numpadTextDefaultInt =
+          parseColor(json["colors"]["numpad_text_default"] as String)
+      ..bottomNavTextInt =
+          parseColor(json["colors"]["bottom_nav_text"] as String)
+      ..customTextButtonEnabledTextInt = parseColor(
+          json["colors"]["custom_text_button_enabled_text"] as String)
+      ..customTextButtonDisabledTextInt = parseColor(
+          json["colors"]["custom_text_button_disabled_text"] as String)
+      ..switchBGOnInt = parseColor(json["colors"]["switch_bg_on"] as String)
+      ..switchBGOffInt = parseColor(json["colors"]["switch_bg_off"] as String)
+      ..switchBGDisabledInt =
+          parseColor(json["colors"]["switch_bg_disabled"] as String)
+      ..switchCircleOnInt =
+          parseColor(json["colors"]["switch_circle_on"] as String)
+      ..switchCircleOffInt =
+          parseColor(json["colors"]["switch_circle_off"] as String)
+      ..switchCircleDisabledInt =
+          parseColor(json["colors"]["switch_circle_disabled"] as String)
+      ..stepIndicatorBGCheckInt =
+          parseColor(json["colors"]["step_indicator_bg_check"] as String)
+      ..stepIndicatorBGNumberInt =
+          parseColor(json["colors"]["step_indicator_bg_number"] as String)
+      ..stepIndicatorBGInactiveInt =
+          parseColor(json["colors"]["step_indicator_bg_inactive"] as String)
+      ..stepIndicatorBGLinesInt =
+          parseColor(json["colors"]["step_indicator_bg_lines"] as String)
+      ..stepIndicatorBGLinesInactiveInt = parseColor(
+          json["colors"]["step_indicator_bg_lines_inactive"] as String)
+      ..stepIndicatorIconTextInt =
+          parseColor(json["colors"]["step_indicator_icon_text"] as String)
+      ..stepIndicatorIconNumberInt =
+          parseColor(json["colors"]["step_indicator_icon_number"] as String)
+      ..stepIndicatorIconInactiveInt =
+          parseColor(json["colors"]["step_indicator_icon_inactive"] as String)
+      ..checkboxBGCheckedInt =
+          parseColor(json["colors"]["checkbox_bg_checked"] as String)
+      ..checkboxBorderEmptyInt =
+          parseColor(json["colors"]["checkbox_border_empty"] as String)
+      ..checkboxBGDisabledInt =
+          parseColor(json["colors"]["checkbox_bg_disabled"] as String)
+      ..checkboxIconCheckedInt =
+          parseColor(json["colors"]["checkbox_icon_checked"] as String)
+      ..checkboxIconDisabledInt =
+          parseColor(json["colors"]["checkbox_icon_disabled"] as String)
+      ..checkboxTextLabelInt =
+          parseColor(json["colors"]["checkbox_text_label"] as String)
+      ..snackBarBackSuccessInt =
+          parseColor(json["colors"]["snack_bar_back_success"] as String)
+      ..snackBarBackErrorInt =
+          parseColor(json["colors"]["snack_bar_back_error"] as String)
+      ..snackBarBackInfoInt =
+          parseColor(json["colors"]["snack_bar_back_info"] as String)
+      ..snackBarTextSuccessInt =
+          parseColor(json["colors"]["snack_bar_text_success"] as String)
+      ..snackBarTextErrorInt =
+          parseColor(json["colors"]["snack_bar_text_error"] as String)
+      ..snackBarTextInfoInt =
+          parseColor(json["colors"]["snack_bar_text_info"] as String)
+      ..bottomNavIconBackInt =
+          parseColor(json["colors"]["bottom_nav_icon_back"] as String)
+      ..bottomNavIconIconInt =
+          parseColor(json["colors"]["bottom_nav_icon_icon"] as String)
+      ..bottomNavIconIconHighlightedInt = parseColor(
+          json["colors"]["bottom_nav_icon_icon_highlighted"] as String)
+      ..topNavIconPrimaryInt =
+          parseColor(json["colors"]["top_nav_icon_primary"] as String)
+      ..topNavIconGreenInt =
+          parseColor(json["colors"]["top_nav_icon_green"] as String)
+      ..topNavIconYellowInt =
+          parseColor(json["colors"]["top_nav_icon_yellow"] as String)
+      ..topNavIconRedInt =
+          parseColor(json["colors"]["top_nav_icon_red"] as String)
+      ..settingsIconBackInt =
+          parseColor(json["colors"]["settings_icon_back"] as String)
+      ..settingsIconIconInt =
+          parseColor(json["colors"]["settings_icon_icon"] as String)
+      ..settingsIconBack2Int =
+          parseColor(json["colors"]["settings_icon_back_two"] as String)
+      ..settingsIconElementInt =
+          parseColor(json["colors"]["settings_icon_element"] as String)
+      ..textFieldActiveBGInt =
+          parseColor(json["colors"]["text_field_active_bg"] as String)
+      ..textFieldDefaultBGInt =
+          parseColor(json["colors"]["text_field_default_bg"] as String)
+      ..textFieldErrorBGInt =
+          parseColor(json["colors"]["text_field_error_bg"] as String)
+      ..textFieldSuccessBGInt =
+          parseColor(json["colors"]["text_field_success_bg"] as String)
+      ..textFieldErrorBorderInt =
+          parseColor(json["colors"]["text_field_error_border"] as String)
+      ..textFieldSuccessBorderInt =
+          parseColor(json["colors"]["text_field_success_border"] as String)
+      ..textFieldActiveSearchIconLeftInt = parseColor(
+          json["colors"]["text_field_active_search_icon_left"] as String)
+      ..textFieldDefaultSearchIconLeftInt = parseColor(
+          json["colors"]["text_field_default_search_icon_left"] as String)
+      ..textFieldErrorSearchIconLeftInt = parseColor(
+          json["colors"]["text_field_error_search_icon_left"] as String)
+      ..textFieldSuccessSearchIconLeftInt = parseColor(
+          json["colors"]["text_field_success_search_icon_left"] as String)
+      ..textFieldActiveTextInt =
+          parseColor(json["colors"]["text_field_active_text"] as String)
+      ..textFieldDefaultTextInt =
+          parseColor(json["colors"]["text_field_default_text"] as String)
+      ..textFieldErrorTextInt =
+          parseColor(json["colors"]["text_field_error_text"] as String)
+      ..textFieldSuccessTextInt =
+          parseColor(json["colors"]["text_field_success_text"] as String)
+      ..textFieldActiveLabelInt =
+          parseColor(json["colors"]["text_field_active_label"] as String)
+      ..textFieldErrorLabelInt =
+          parseColor(json["colors"]["text_field_error_label"] as String)
+      ..textFieldSuccessLabelInt =
+          parseColor(json["colors"]["text_field_success_label"] as String)
+      ..textFieldActiveSearchIconRightInt = parseColor(
+          json["colors"]["text_field_active_search_icon_right"] as String)
+      ..textFieldDefaultSearchIconRightInt = parseColor(
+          json["colors"]["text_field_default_search_icon_right"] as String)
+      ..textFieldErrorSearchIconRightInt = parseColor(
+          json["colors"]["text_field_error_search_icon_right"] as String)
+      ..textFieldSuccessSearchIconRightInt = parseColor(
+          json["colors"]["text_field_success_search_icon_right"] as String)
+      ..settingsItem2ActiveBGInt = parseColor(
+          json["colors"]["settings_item_level_two_active_bg"] as String)
+      ..settingsItem2ActiveTextInt = parseColor(
+          json["colors"]["settings_item_level_two_active_text"] as String)
+      ..settingsItem2ActiveSubInt = parseColor(
+          json["colors"]["settings_item_level_two_active_sub"] as String)
+      ..radioButtonIconBorderInt =
+          parseColor(json["colors"]["radio_button_icon_border"] as String)
+      ..radioButtonIconBorderDisabledInt = parseColor(
+          json["colors"]["radio_button_icon_border_disabled"] as String)
+      ..radioButtonBorderEnabledInt =
+          parseColor(json["colors"]["radio_button_border_enabled"] as String)
+      ..radioButtonBorderDisabledInt =
+          parseColor(json["colors"]["radio_button_border_disabled"] as String)
+      ..radioButtonIconCircleInt =
+          parseColor(json["colors"]["radio_button_icon_circle"] as String)
+      ..radioButtonIconEnabledInt =
+          parseColor(json["colors"]["radio_button_icon_enabled"] as String)
+      ..radioButtonTextEnabledInt =
+          parseColor(json["colors"]["radio_button_text_enabled"] as String)
+      ..radioButtonTextDisabledInt =
+          parseColor(json["colors"]["radio_button_text_disabled"] as String)
+      ..radioButtonLabelEnabledInt =
+          parseColor(json["colors"]["radio_button_label_enabled"] as String)
+      ..radioButtonLabelDisabledInt =
+          parseColor(json["colors"]["radio_button_label_disabled"] as String)
+      ..infoItemBGInt = parseColor(json["colors"]["info_item_bg"] as String)
+      ..infoItemLabelInt =
+          parseColor(json["colors"]["info_item_label"] as String)
+      ..infoItemTextInt = parseColor(json["colors"]["info_item_text"] as String)
+      ..infoItemIconsInt =
+          parseColor(json["colors"]["info_item_icons"] as String)
+      ..popupBGInt = parseColor(json["colors"]["popup_bg"] as String)
+      ..currencyListItemBGInt =
+          parseColor(json["colors"]["currency_list_item_bg"] as String)
+      ..stackWalletBGInt = parseColor(json["colors"]["sw_bg"] as String)
+      ..stackWalletMidInt = parseColor(json["colors"]["sw_mid"] as String)
+      ..stackWalletBottomInt = parseColor(json["colors"]["sw_bottom"] as String)
+      ..bottomNavShadowInt =
+          parseColor(json["colors"]["bottom_nav_shadow"] as String)
+      ..splashInt = parseColor(json["colors"]["splash"] as String)
+      ..highlightInt = parseColor(json["colors"]["highlight"] as String)
+      ..warningForegroundInt =
+          parseColor(json["colors"]["warning_foreground"] as String)
+      ..warningBackgroundInt =
+          parseColor(json["colors"]["warning_background"] as String)
+      ..loadingOverlayTextColorInt =
+          parseColor(json["colors"]["loading_overlay_text_color"] as String)
+      ..myStackContactIconBGInt =
+          parseColor(json["colors"]["my_stack_contact_icon_bg"] as String)
+      ..textConfirmTotalAmountInt =
+          parseColor(json["colors"]["text_confirm_total_amount"] as String)
+      ..textSelectedWordTableItemInt =
+          parseColor(json["colors"]["text_selected_word_table_iterm"] as String)
+      ..favoriteStarActiveInt =
+          parseColor(json["colors"]["favorite_star_active"] as String)
+      ..favoriteStarInactiveInt =
+          parseColor(json["colors"]["favorite_star_inactive"] as String)
+      ..rateTypeToggleColorOnInt =
+          parseColor(json["colors"]["rate_type_toggle_color_on"] as String)
+      ..rateTypeToggleColorOffInt =
+          parseColor(json["colors"]["rate_type_toggle_color_off"] as String)
+      ..rateTypeToggleDesktopColorOnInt = parseColor(
+          json["colors"]["rate_type_toggle_desktop_color_on"] as String)
+      ..rateTypeToggleDesktopColorOffInt = parseColor(
+          json["colors"]["rate_type_toggle_desktop_color_off"] as String)
+      ..ethTagTextInt = parseColor(json["colors"]["eth_tag_text"] as String)
+      ..ethTagBGInt = parseColor(json["colors"]["eth_tag_bg"] as String)
+      ..ethWalletTagTextInt =
+          parseColor(json["colors"]["eth_wallet_tag_text"] as String)
+      ..ethWalletTagBGInt =
+          parseColor(json["colors"]["eth_wallet_tag_bg"] as String)
+      ..tokenSummaryTextPrimaryInt =
+          parseColor(json["colors"]["token_summary_text_primary"] as String)
+      ..tokenSummaryTextSecondaryInt =
+          parseColor(json["colors"]["token_summary_text_secondary"] as String)
+      ..tokenSummaryBGInt =
+          parseColor(json["colors"]["token_summary_bg"] as String)
+      ..tokenSummaryButtonBGInt =
+          parseColor(json["colors"]["token_summary_button_bg"] as String)
+      ..tokenSummaryIconInt =
+          parseColor(json["colors"]["token_summary_icon"] as String);
   }
 
   /// Grab the int value of the hex color string.
@@ -1990,28 +1853,47 @@ class StackTheme {
 }
 
 @Embedded(inheritance: false)
-class ThemeAssets {
+class ThemeAssets implements IThemeAssets {
+  @override
   late final String bellNew;
+  @override
   late final String buy;
+  @override
   late final String exchange;
+  @override
   late final String personaIncognito;
+  @override
   late final String personaEasy;
+  @override
   late final String stack;
 
+  @override
   @Deprecated("Use assets.dart's appIcon()")
   late final String stackIcon;
 
+  @override
   late final String receive;
+  @override
   late final String receivePending;
+  @override
   late final String receiveCancelled;
+  @override
   late final String send;
+  @override
   late final String sendPending;
+  @override
   late final String sendCancelled;
+  @override
   late final String themeSelector;
+  @override
   late final String themePreview;
+  @override
   late final String txExchange;
+  @override
   late final String txExchangePending;
+  @override
   late final String txExchangeFailed;
+
   late final String bitcoin;
   late final String litecoin;
   late final String bitcoincash;
@@ -2045,7 +1927,9 @@ class ThemeAssets {
   late final String wowneroImageSecondary;
   late final String namecoinImageSecondary;
   late final String particlImageSecondary;
+  @override
   late final String? loadingGif;
+  @override
   late final String? background;
 
   // todo: add all assets expected in json
@@ -2168,3 +2052,191 @@ class ThemeAssets {
           : null;
   }
 }
+
+@Embedded(inheritance: false)
+class ThemeAssetsV2 implements IThemeAssets {
+  @override
+  late final String bellNew;
+  @override
+  late final String buy;
+  @override
+  late final String exchange;
+  @override
+  late final String personaIncognito;
+  @override
+  late final String personaEasy;
+  @override
+  late final String stack;
+  @override
+  late final String stackIcon;
+  @override
+  late final String receive;
+  @override
+  late final String receivePending;
+  @override
+  late final String receiveCancelled;
+  @override
+  late final String send;
+  @override
+  late final String sendPending;
+  @override
+  late final String sendCancelled;
+  @override
+  late final String themeSelector;
+  @override
+  late final String themePreview;
+  @override
+  late final String txExchange;
+  @override
+  late final String txExchangePending;
+  @override
+  late final String txExchangeFailed;
+  @override
+  late final String? loadingGif;
+  @override
+  late final String? background;
+
+  late final String coinPlaceholder;
+
+  @ignore
+  Map<Coin, String> get coinIcons => _coinIcons ??= parseCoinAssetsString(
+        coinIconsString,
+        placeHolder: coinPlaceholder,
+      );
+  @ignore
+  Map<Coin, String>? _coinIcons;
+  late final String coinIconsString;
+
+  @ignore
+  Map<Coin, String> get coinImages => _coinImages ??= parseCoinAssetsString(
+        coinImagesString,
+        placeHolder: coinPlaceholder,
+      );
+  @ignore
+  Map<Coin, String>? _coinImages;
+  late final String coinImagesString;
+
+  @ignore
+  Map<Coin, String> get coinSecondaryImages =>
+      _coinSecondaryImages ??= parseCoinAssetsString(
+        coinSecondaryImagesString,
+        placeHolder: coinPlaceholder,
+      );
+  @ignore
+  Map<Coin, String>? _coinSecondaryImages;
+  late final String coinSecondaryImagesString;
+
+  ThemeAssetsV2();
+
+  factory ThemeAssetsV2.fromJson({
+    required Map<String, dynamic> json,
+    required String applicationThemesDirectoryPath,
+    required String themeId,
+  }) {
+    return ThemeAssetsV2()
+      ..bellNew =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["bell_new"] as String}"
+      ..buy =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["buy"] as String}"
+      ..exchange =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["exchange"] as String}"
+      ..personaIncognito =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_incognito"] as String}"
+      ..personaEasy =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_easy"] as String}"
+      ..stack =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack"] as String}"
+      ..stackIcon =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack_icon"] as String}"
+      ..receive =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive"] as String}"
+      ..receivePending =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_pending"] as String}"
+      ..receiveCancelled =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_cancelled"] as String}"
+      ..send =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["send"] as String}"
+      ..sendPending =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_pending"] as String}"
+      ..sendCancelled =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_cancelled"] as String}"
+      ..themeSelector =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_selector"] as String}"
+      ..themePreview =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_preview"] as String}"
+      ..txExchange =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange"] as String}"
+      ..txExchangePending =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_pending"] as String}"
+      ..txExchangeFailed =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_failed"] as String}"
+      ..coinPlaceholder =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["coin_placeholder"] as String}"
+      ..coinIconsString = createCoinAssetsString(
+        "$applicationThemesDirectoryPath/$themeId/assets",
+        Map<String, dynamic>.from(json["coins"]["icons"] as Map),
+      )
+      ..coinImagesString = createCoinAssetsString(
+        "$applicationThemesDirectoryPath/$themeId/assets",
+        Map<String, dynamic>.from(json["coins"]["images"] as Map),
+      )
+      ..coinSecondaryImagesString = createCoinAssetsString(
+        "$applicationThemesDirectoryPath/$themeId/assets",
+        Map<String, dynamic>.from(json["coins"]["secondaries"] as Map),
+      )
+      ..loadingGif = json["loading_gif"] is String
+          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["loading_gif"] as String}"
+          : null
+      ..background = json["background"] is String
+          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["background"] as String}"
+          : null;
+  }
+
+  static String createCoinAssetsString(String path, Map<String, dynamic> json) {
+    final Map<String, dynamic> map = {};
+    for (final entry in json.entries) {
+      map[entry.key] = "$path/${entry.value as String}";
+    }
+    return jsonEncode(map);
+  }
+
+  static Map<Coin, String> parseCoinAssetsString(
+    String jsonString, {
+    required String placeHolder,
+  }) {
+    final json = jsonDecode(jsonString) as Map;
+    final map = Map<String, dynamic>.from(json);
+
+    final Map<Coin, String> result = {};
+
+    for (final coin in Coin.values) {
+      result[coin] = map[coin.name] as String? ?? placeHolder;
+    }
+
+    return result;
+  }
+}
+
+abstract class IThemeAssets {
+  String get bellNew;
+  String get buy;
+  String get exchange;
+  String get personaIncognito;
+  String get personaEasy;
+  String get stack;
+  String get stackIcon;
+  String get receive;
+  String get receivePending;
+  String get receiveCancelled;
+  String get send;
+  String get sendPending;
+  String get sendCancelled;
+  String get themeSelector;
+  String get themePreview;
+  String get txExchange;
+  String get txExchangePending;
+  String get txExchangeFailed;
+
+  String? get loadingGif;
+  String? get background;
+}
diff --git a/lib/models/isar/stack_theme.g.dart b/lib/models/isar/stack_theme.g.dart
index 64d8c3f6c..ad6f905bd 100644
--- a/lib/models/isar/stack_theme.g.dart
+++ b/lib/models/isar/stack_theme.g.dart
@@ -53,763 +53,774 @@ const StackThemeSchema = CollectionSchema(
       type: IsarType.object,
       target: r'ThemeAssets',
     ),
-    r'backgroundAppBarInt': PropertySchema(
+    r'assetsV2': PropertySchema(
       id: 7,
+      name: r'assetsV2',
+      type: IsarType.object,
+      target: r'ThemeAssetsV2',
+    ),
+    r'backgroundAppBarInt': PropertySchema(
+      id: 8,
       name: r'backgroundAppBarInt',
       type: IsarType.long,
     ),
     r'backgroundInt': PropertySchema(
-      id: 8,
+      id: 9,
       name: r'backgroundInt',
       type: IsarType.long,
     ),
     r'bottomNavBackInt': PropertySchema(
-      id: 9,
+      id: 10,
       name: r'bottomNavBackInt',
       type: IsarType.long,
     ),
     r'bottomNavIconBackInt': PropertySchema(
-      id: 10,
+      id: 11,
       name: r'bottomNavIconBackInt',
       type: IsarType.long,
     ),
     r'bottomNavIconIconHighlightedInt': PropertySchema(
-      id: 11,
+      id: 12,
       name: r'bottomNavIconIconHighlightedInt',
       type: IsarType.long,
     ),
     r'bottomNavIconIconInt': PropertySchema(
-      id: 12,
+      id: 13,
       name: r'bottomNavIconIconInt',
       type: IsarType.long,
     ),
     r'bottomNavShadowInt': PropertySchema(
-      id: 13,
+      id: 14,
       name: r'bottomNavShadowInt',
       type: IsarType.long,
     ),
     r'bottomNavTextInt': PropertySchema(
-      id: 14,
+      id: 15,
       name: r'bottomNavTextInt',
       type: IsarType.long,
     ),
     r'brightnessString': PropertySchema(
-      id: 15,
+      id: 16,
       name: r'brightnessString',
       type: IsarType.string,
     ),
     r'buttonBackBorderDisabledInt': PropertySchema(
-      id: 16,
+      id: 17,
       name: r'buttonBackBorderDisabledInt',
       type: IsarType.long,
     ),
     r'buttonBackBorderInt': PropertySchema(
-      id: 17,
+      id: 18,
       name: r'buttonBackBorderInt',
       type: IsarType.long,
     ),
     r'buttonBackBorderSecondaryDisabledInt': PropertySchema(
-      id: 18,
+      id: 19,
       name: r'buttonBackBorderSecondaryDisabledInt',
       type: IsarType.long,
     ),
     r'buttonBackBorderSecondaryInt': PropertySchema(
-      id: 19,
+      id: 20,
       name: r'buttonBackBorderSecondaryInt',
       type: IsarType.long,
     ),
     r'buttonBackPrimaryDisabledInt': PropertySchema(
-      id: 20,
+      id: 21,
       name: r'buttonBackPrimaryDisabledInt',
       type: IsarType.long,
     ),
     r'buttonBackPrimaryInt': PropertySchema(
-      id: 21,
+      id: 22,
       name: r'buttonBackPrimaryInt',
       type: IsarType.long,
     ),
     r'buttonBackSecondaryDisabledInt': PropertySchema(
-      id: 22,
+      id: 23,
       name: r'buttonBackSecondaryDisabledInt',
       type: IsarType.long,
     ),
     r'buttonBackSecondaryInt': PropertySchema(
-      id: 23,
+      id: 24,
       name: r'buttonBackSecondaryInt',
       type: IsarType.long,
     ),
     r'buttonTextBorderInt': PropertySchema(
-      id: 24,
+      id: 25,
       name: r'buttonTextBorderInt',
       type: IsarType.long,
     ),
     r'buttonTextBorderlessDisabledInt': PropertySchema(
-      id: 25,
+      id: 26,
       name: r'buttonTextBorderlessDisabledInt',
       type: IsarType.long,
     ),
     r'buttonTextBorderlessInt': PropertySchema(
-      id: 26,
+      id: 27,
       name: r'buttonTextBorderlessInt',
       type: IsarType.long,
     ),
     r'buttonTextDisabledInt': PropertySchema(
-      id: 27,
+      id: 28,
       name: r'buttonTextDisabledInt',
       type: IsarType.long,
     ),
     r'buttonTextPrimaryDisabledInt': PropertySchema(
-      id: 28,
+      id: 29,
       name: r'buttonTextPrimaryDisabledInt',
       type: IsarType.long,
     ),
     r'buttonTextPrimaryInt': PropertySchema(
-      id: 29,
+      id: 30,
       name: r'buttonTextPrimaryInt',
       type: IsarType.long,
     ),
     r'buttonTextSecondaryDisabledInt': PropertySchema(
-      id: 30,
+      id: 31,
       name: r'buttonTextSecondaryDisabledInt',
       type: IsarType.long,
     ),
     r'buttonTextSecondaryInt': PropertySchema(
-      id: 31,
+      id: 32,
       name: r'buttonTextSecondaryInt',
       type: IsarType.long,
     ),
     r'checkboxBGCheckedInt': PropertySchema(
-      id: 32,
+      id: 33,
       name: r'checkboxBGCheckedInt',
       type: IsarType.long,
     ),
     r'checkboxBGDisabledInt': PropertySchema(
-      id: 33,
+      id: 34,
       name: r'checkboxBGDisabledInt',
       type: IsarType.long,
     ),
     r'checkboxBorderEmptyInt': PropertySchema(
-      id: 34,
+      id: 35,
       name: r'checkboxBorderEmptyInt',
       type: IsarType.long,
     ),
     r'checkboxIconCheckedInt': PropertySchema(
-      id: 35,
+      id: 36,
       name: r'checkboxIconCheckedInt',
       type: IsarType.long,
     ),
     r'checkboxIconDisabledInt': PropertySchema(
-      id: 36,
+      id: 37,
       name: r'checkboxIconDisabledInt',
       type: IsarType.long,
     ),
     r'checkboxTextLabelInt': PropertySchema(
-      id: 37,
+      id: 38,
       name: r'checkboxTextLabelInt',
       type: IsarType.long,
     ),
     r'coinColorsJsonString': PropertySchema(
-      id: 38,
+      id: 39,
       name: r'coinColorsJsonString',
       type: IsarType.string,
     ),
     r'currencyListItemBGInt': PropertySchema(
-      id: 39,
+      id: 40,
       name: r'currencyListItemBGInt',
       type: IsarType.long,
     ),
     r'customTextButtonDisabledTextInt': PropertySchema(
-      id: 40,
+      id: 41,
       name: r'customTextButtonDisabledTextInt',
       type: IsarType.long,
     ),
     r'customTextButtonEnabledTextInt': PropertySchema(
-      id: 41,
+      id: 42,
       name: r'customTextButtonEnabledTextInt',
       type: IsarType.long,
     ),
     r'ethTagBGInt': PropertySchema(
-      id: 42,
+      id: 43,
       name: r'ethTagBGInt',
       type: IsarType.long,
     ),
     r'ethTagTextInt': PropertySchema(
-      id: 43,
+      id: 44,
       name: r'ethTagTextInt',
       type: IsarType.long,
     ),
     r'ethWalletTagBGInt': PropertySchema(
-      id: 44,
+      id: 45,
       name: r'ethWalletTagBGInt',
       type: IsarType.long,
     ),
     r'ethWalletTagTextInt': PropertySchema(
-      id: 45,
+      id: 46,
       name: r'ethWalletTagTextInt',
       type: IsarType.long,
     ),
     r'favoriteStarActiveInt': PropertySchema(
-      id: 46,
+      id: 47,
       name: r'favoriteStarActiveInt',
       type: IsarType.long,
     ),
     r'favoriteStarInactiveInt': PropertySchema(
-      id: 47,
+      id: 48,
       name: r'favoriteStarInactiveInt',
       type: IsarType.long,
     ),
     r'gradientBackgroundString': PropertySchema(
-      id: 48,
+      id: 49,
       name: r'gradientBackgroundString',
       type: IsarType.string,
     ),
     r'highlightInt': PropertySchema(
-      id: 49,
+      id: 50,
       name: r'highlightInt',
       type: IsarType.long,
     ),
     r'homeViewButtonBarBoxShadowString': PropertySchema(
-      id: 50,
+      id: 51,
       name: r'homeViewButtonBarBoxShadowString',
       type: IsarType.string,
     ),
     r'infoItemBGInt': PropertySchema(
-      id: 51,
+      id: 52,
       name: r'infoItemBGInt',
       type: IsarType.long,
     ),
     r'infoItemIconsInt': PropertySchema(
-      id: 52,
+      id: 53,
       name: r'infoItemIconsInt',
       type: IsarType.long,
     ),
     r'infoItemLabelInt': PropertySchema(
-      id: 53,
+      id: 54,
       name: r'infoItemLabelInt',
       type: IsarType.long,
     ),
     r'infoItemTextInt': PropertySchema(
-      id: 54,
+      id: 55,
       name: r'infoItemTextInt',
       type: IsarType.long,
     ),
     r'loadingOverlayTextColorInt': PropertySchema(
-      id: 55,
+      id: 56,
       name: r'loadingOverlayTextColorInt',
       type: IsarType.long,
     ),
     r'myStackContactIconBGInt': PropertySchema(
-      id: 56,
+      id: 57,
       name: r'myStackContactIconBGInt',
       type: IsarType.long,
     ),
     r'name': PropertySchema(
-      id: 57,
+      id: 58,
       name: r'name',
       type: IsarType.string,
     ),
     r'numberBackDefaultInt': PropertySchema(
-      id: 58,
+      id: 59,
       name: r'numberBackDefaultInt',
       type: IsarType.long,
     ),
     r'numberTextDefaultInt': PropertySchema(
-      id: 59,
+      id: 60,
       name: r'numberTextDefaultInt',
       type: IsarType.long,
     ),
     r'numpadBackDefaultInt': PropertySchema(
-      id: 60,
+      id: 61,
       name: r'numpadBackDefaultInt',
       type: IsarType.long,
     ),
     r'numpadTextDefaultInt': PropertySchema(
-      id: 61,
+      id: 62,
       name: r'numpadTextDefaultInt',
       type: IsarType.long,
     ),
     r'overlayInt': PropertySchema(
-      id: 62,
+      id: 63,
       name: r'overlayInt',
       type: IsarType.long,
     ),
     r'popupBGInt': PropertySchema(
-      id: 63,
+      id: 64,
       name: r'popupBGInt',
       type: IsarType.long,
     ),
     r'radioButtonBorderDisabledInt': PropertySchema(
-      id: 64,
+      id: 65,
       name: r'radioButtonBorderDisabledInt',
       type: IsarType.long,
     ),
     r'radioButtonBorderEnabledInt': PropertySchema(
-      id: 65,
+      id: 66,
       name: r'radioButtonBorderEnabledInt',
       type: IsarType.long,
     ),
     r'radioButtonIconBorderDisabledInt': PropertySchema(
-      id: 66,
+      id: 67,
       name: r'radioButtonIconBorderDisabledInt',
       type: IsarType.long,
     ),
     r'radioButtonIconBorderInt': PropertySchema(
-      id: 67,
+      id: 68,
       name: r'radioButtonIconBorderInt',
       type: IsarType.long,
     ),
     r'radioButtonIconCircleInt': PropertySchema(
-      id: 68,
+      id: 69,
       name: r'radioButtonIconCircleInt',
       type: IsarType.long,
     ),
     r'radioButtonIconEnabledInt': PropertySchema(
-      id: 69,
+      id: 70,
       name: r'radioButtonIconEnabledInt',
       type: IsarType.long,
     ),
     r'radioButtonLabelDisabledInt': PropertySchema(
-      id: 70,
+      id: 71,
       name: r'radioButtonLabelDisabledInt',
       type: IsarType.long,
     ),
     r'radioButtonLabelEnabledInt': PropertySchema(
-      id: 71,
+      id: 72,
       name: r'radioButtonLabelEnabledInt',
       type: IsarType.long,
     ),
     r'radioButtonTextDisabledInt': PropertySchema(
-      id: 72,
+      id: 73,
       name: r'radioButtonTextDisabledInt',
       type: IsarType.long,
     ),
     r'radioButtonTextEnabledInt': PropertySchema(
-      id: 73,
+      id: 74,
       name: r'radioButtonTextEnabledInt',
       type: IsarType.long,
     ),
     r'rateTypeToggleColorOffInt': PropertySchema(
-      id: 74,
+      id: 75,
       name: r'rateTypeToggleColorOffInt',
       type: IsarType.long,
     ),
     r'rateTypeToggleColorOnInt': PropertySchema(
-      id: 75,
+      id: 76,
       name: r'rateTypeToggleColorOnInt',
       type: IsarType.long,
     ),
     r'rateTypeToggleDesktopColorOffInt': PropertySchema(
-      id: 76,
+      id: 77,
       name: r'rateTypeToggleDesktopColorOffInt',
       type: IsarType.long,
     ),
     r'rateTypeToggleDesktopColorOnInt': PropertySchema(
-      id: 77,
+      id: 78,
       name: r'rateTypeToggleDesktopColorOnInt',
       type: IsarType.long,
     ),
     r'settingsIconBack2Int': PropertySchema(
-      id: 78,
+      id: 79,
       name: r'settingsIconBack2Int',
       type: IsarType.long,
     ),
     r'settingsIconBackInt': PropertySchema(
-      id: 79,
+      id: 80,
       name: r'settingsIconBackInt',
       type: IsarType.long,
     ),
     r'settingsIconElementInt': PropertySchema(
-      id: 80,
+      id: 81,
       name: r'settingsIconElementInt',
       type: IsarType.long,
     ),
     r'settingsIconIconInt': PropertySchema(
-      id: 81,
+      id: 82,
       name: r'settingsIconIconInt',
       type: IsarType.long,
     ),
     r'settingsItem2ActiveBGInt': PropertySchema(
-      id: 82,
+      id: 83,
       name: r'settingsItem2ActiveBGInt',
       type: IsarType.long,
     ),
     r'settingsItem2ActiveSubInt': PropertySchema(
-      id: 83,
+      id: 84,
       name: r'settingsItem2ActiveSubInt',
       type: IsarType.long,
     ),
     r'settingsItem2ActiveTextInt': PropertySchema(
-      id: 84,
+      id: 85,
       name: r'settingsItem2ActiveTextInt',
       type: IsarType.long,
     ),
     r'shadowInt': PropertySchema(
-      id: 85,
+      id: 86,
       name: r'shadowInt',
       type: IsarType.long,
     ),
     r'snackBarBackErrorInt': PropertySchema(
-      id: 86,
+      id: 87,
       name: r'snackBarBackErrorInt',
       type: IsarType.long,
     ),
     r'snackBarBackInfoInt': PropertySchema(
-      id: 87,
+      id: 88,
       name: r'snackBarBackInfoInt',
       type: IsarType.long,
     ),
     r'snackBarBackSuccessInt': PropertySchema(
-      id: 88,
+      id: 89,
       name: r'snackBarBackSuccessInt',
       type: IsarType.long,
     ),
     r'snackBarTextErrorInt': PropertySchema(
-      id: 89,
+      id: 90,
       name: r'snackBarTextErrorInt',
       type: IsarType.long,
     ),
     r'snackBarTextInfoInt': PropertySchema(
-      id: 90,
+      id: 91,
       name: r'snackBarTextInfoInt',
       type: IsarType.long,
     ),
     r'snackBarTextSuccessInt': PropertySchema(
-      id: 91,
+      id: 92,
       name: r'snackBarTextSuccessInt',
       type: IsarType.long,
     ),
     r'splashInt': PropertySchema(
-      id: 92,
+      id: 93,
       name: r'splashInt',
       type: IsarType.long,
     ),
     r'stackWalletBGInt': PropertySchema(
-      id: 93,
+      id: 94,
       name: r'stackWalletBGInt',
       type: IsarType.long,
     ),
     r'stackWalletBottomInt': PropertySchema(
-      id: 94,
+      id: 95,
       name: r'stackWalletBottomInt',
       type: IsarType.long,
     ),
     r'stackWalletMidInt': PropertySchema(
-      id: 95,
+      id: 96,
       name: r'stackWalletMidInt',
       type: IsarType.long,
     ),
     r'standardBoxShadowString': PropertySchema(
-      id: 96,
+      id: 97,
       name: r'standardBoxShadowString',
       type: IsarType.string,
     ),
     r'stepIndicatorBGCheckInt': PropertySchema(
-      id: 97,
+      id: 98,
       name: r'stepIndicatorBGCheckInt',
       type: IsarType.long,
     ),
     r'stepIndicatorBGInactiveInt': PropertySchema(
-      id: 98,
+      id: 99,
       name: r'stepIndicatorBGInactiveInt',
       type: IsarType.long,
     ),
     r'stepIndicatorBGLinesInactiveInt': PropertySchema(
-      id: 99,
+      id: 100,
       name: r'stepIndicatorBGLinesInactiveInt',
       type: IsarType.long,
     ),
     r'stepIndicatorBGLinesInt': PropertySchema(
-      id: 100,
+      id: 101,
       name: r'stepIndicatorBGLinesInt',
       type: IsarType.long,
     ),
     r'stepIndicatorBGNumberInt': PropertySchema(
-      id: 101,
+      id: 102,
       name: r'stepIndicatorBGNumberInt',
       type: IsarType.long,
     ),
     r'stepIndicatorIconInactiveInt': PropertySchema(
-      id: 102,
+      id: 103,
       name: r'stepIndicatorIconInactiveInt',
       type: IsarType.long,
     ),
     r'stepIndicatorIconNumberInt': PropertySchema(
-      id: 103,
+      id: 104,
       name: r'stepIndicatorIconNumberInt',
       type: IsarType.long,
     ),
     r'stepIndicatorIconTextInt': PropertySchema(
-      id: 104,
+      id: 105,
       name: r'stepIndicatorIconTextInt',
       type: IsarType.long,
     ),
     r'switchBGDisabledInt': PropertySchema(
-      id: 105,
+      id: 106,
       name: r'switchBGDisabledInt',
       type: IsarType.long,
     ),
     r'switchBGOffInt': PropertySchema(
-      id: 106,
+      id: 107,
       name: r'switchBGOffInt',
       type: IsarType.long,
     ),
     r'switchBGOnInt': PropertySchema(
-      id: 107,
+      id: 108,
       name: r'switchBGOnInt',
       type: IsarType.long,
     ),
     r'switchCircleDisabledInt': PropertySchema(
-      id: 108,
+      id: 109,
       name: r'switchCircleDisabledInt',
       type: IsarType.long,
     ),
     r'switchCircleOffInt': PropertySchema(
-      id: 109,
+      id: 110,
       name: r'switchCircleOffInt',
       type: IsarType.long,
     ),
     r'switchCircleOnInt': PropertySchema(
-      id: 110,
+      id: 111,
       name: r'switchCircleOnInt',
       type: IsarType.long,
     ),
     r'textConfirmTotalAmountInt': PropertySchema(
-      id: 111,
+      id: 112,
       name: r'textConfirmTotalAmountInt',
       type: IsarType.long,
     ),
     r'textDark2Int': PropertySchema(
-      id: 112,
+      id: 113,
       name: r'textDark2Int',
       type: IsarType.long,
     ),
     r'textDark3Int': PropertySchema(
-      id: 113,
+      id: 114,
       name: r'textDark3Int',
       type: IsarType.long,
     ),
     r'textDarkInt': PropertySchema(
-      id: 114,
+      id: 115,
       name: r'textDarkInt',
       type: IsarType.long,
     ),
     r'textErrorInt': PropertySchema(
-      id: 115,
+      id: 116,
       name: r'textErrorInt',
       type: IsarType.long,
     ),
     r'textFavoriteCardInt': PropertySchema(
-      id: 116,
+      id: 117,
       name: r'textFavoriteCardInt',
       type: IsarType.long,
     ),
     r'textFieldActiveBGInt': PropertySchema(
-      id: 117,
+      id: 118,
       name: r'textFieldActiveBGInt',
       type: IsarType.long,
     ),
     r'textFieldActiveLabelInt': PropertySchema(
-      id: 118,
+      id: 119,
       name: r'textFieldActiveLabelInt',
       type: IsarType.long,
     ),
     r'textFieldActiveSearchIconLeftInt': PropertySchema(
-      id: 119,
+      id: 120,
       name: r'textFieldActiveSearchIconLeftInt',
       type: IsarType.long,
     ),
     r'textFieldActiveSearchIconRightInt': PropertySchema(
-      id: 120,
+      id: 121,
       name: r'textFieldActiveSearchIconRightInt',
       type: IsarType.long,
     ),
     r'textFieldActiveTextInt': PropertySchema(
-      id: 121,
+      id: 122,
       name: r'textFieldActiveTextInt',
       type: IsarType.long,
     ),
     r'textFieldDefaultBGInt': PropertySchema(
-      id: 122,
+      id: 123,
       name: r'textFieldDefaultBGInt',
       type: IsarType.long,
     ),
     r'textFieldDefaultSearchIconLeftInt': PropertySchema(
-      id: 123,
+      id: 124,
       name: r'textFieldDefaultSearchIconLeftInt',
       type: IsarType.long,
     ),
     r'textFieldDefaultSearchIconRightInt': PropertySchema(
-      id: 124,
+      id: 125,
       name: r'textFieldDefaultSearchIconRightInt',
       type: IsarType.long,
     ),
     r'textFieldDefaultTextInt': PropertySchema(
-      id: 125,
+      id: 126,
       name: r'textFieldDefaultTextInt',
       type: IsarType.long,
     ),
     r'textFieldErrorBGInt': PropertySchema(
-      id: 126,
+      id: 127,
       name: r'textFieldErrorBGInt',
       type: IsarType.long,
     ),
     r'textFieldErrorBorderInt': PropertySchema(
-      id: 127,
+      id: 128,
       name: r'textFieldErrorBorderInt',
       type: IsarType.long,
     ),
     r'textFieldErrorLabelInt': PropertySchema(
-      id: 128,
+      id: 129,
       name: r'textFieldErrorLabelInt',
       type: IsarType.long,
     ),
     r'textFieldErrorSearchIconLeftInt': PropertySchema(
-      id: 129,
+      id: 130,
       name: r'textFieldErrorSearchIconLeftInt',
       type: IsarType.long,
     ),
     r'textFieldErrorSearchIconRightInt': PropertySchema(
-      id: 130,
+      id: 131,
       name: r'textFieldErrorSearchIconRightInt',
       type: IsarType.long,
     ),
     r'textFieldErrorTextInt': PropertySchema(
-      id: 131,
+      id: 132,
       name: r'textFieldErrorTextInt',
       type: IsarType.long,
     ),
     r'textFieldSuccessBGInt': PropertySchema(
-      id: 132,
+      id: 133,
       name: r'textFieldSuccessBGInt',
       type: IsarType.long,
     ),
     r'textFieldSuccessBorderInt': PropertySchema(
-      id: 133,
+      id: 134,
       name: r'textFieldSuccessBorderInt',
       type: IsarType.long,
     ),
     r'textFieldSuccessLabelInt': PropertySchema(
-      id: 134,
+      id: 135,
       name: r'textFieldSuccessLabelInt',
       type: IsarType.long,
     ),
     r'textFieldSuccessSearchIconLeftInt': PropertySchema(
-      id: 135,
+      id: 136,
       name: r'textFieldSuccessSearchIconLeftInt',
       type: IsarType.long,
     ),
     r'textFieldSuccessSearchIconRightInt': PropertySchema(
-      id: 136,
+      id: 137,
       name: r'textFieldSuccessSearchIconRightInt',
       type: IsarType.long,
     ),
     r'textFieldSuccessTextInt': PropertySchema(
-      id: 137,
+      id: 138,
       name: r'textFieldSuccessTextInt',
       type: IsarType.long,
     ),
     r'textRestoreInt': PropertySchema(
-      id: 138,
+      id: 139,
       name: r'textRestoreInt',
       type: IsarType.long,
     ),
     r'textSelectedWordTableItemInt': PropertySchema(
-      id: 139,
+      id: 140,
       name: r'textSelectedWordTableItemInt',
       type: IsarType.long,
     ),
     r'textSubtitle1Int': PropertySchema(
-      id: 140,
+      id: 141,
       name: r'textSubtitle1Int',
       type: IsarType.long,
     ),
     r'textSubtitle2Int': PropertySchema(
-      id: 141,
+      id: 142,
       name: r'textSubtitle2Int',
       type: IsarType.long,
     ),
     r'textSubtitle3Int': PropertySchema(
-      id: 142,
+      id: 143,
       name: r'textSubtitle3Int',
       type: IsarType.long,
     ),
     r'textSubtitle4Int': PropertySchema(
-      id: 143,
+      id: 144,
       name: r'textSubtitle4Int',
       type: IsarType.long,
     ),
     r'textSubtitle5Int': PropertySchema(
-      id: 144,
+      id: 145,
       name: r'textSubtitle5Int',
       type: IsarType.long,
     ),
     r'textSubtitle6Int': PropertySchema(
-      id: 145,
+      id: 146,
       name: r'textSubtitle6Int',
       type: IsarType.long,
     ),
     r'textWhiteInt': PropertySchema(
-      id: 146,
+      id: 147,
       name: r'textWhiteInt',
       type: IsarType.long,
     ),
     r'themeId': PropertySchema(
-      id: 147,
+      id: 148,
       name: r'themeId',
       type: IsarType.string,
     ),
     r'tokenSummaryBGInt': PropertySchema(
-      id: 148,
+      id: 149,
       name: r'tokenSummaryBGInt',
       type: IsarType.long,
     ),
     r'tokenSummaryButtonBGInt': PropertySchema(
-      id: 149,
+      id: 150,
       name: r'tokenSummaryButtonBGInt',
       type: IsarType.long,
     ),
     r'tokenSummaryIconInt': PropertySchema(
-      id: 150,
+      id: 151,
       name: r'tokenSummaryIconInt',
       type: IsarType.long,
     ),
     r'tokenSummaryTextPrimaryInt': PropertySchema(
-      id: 151,
+      id: 152,
       name: r'tokenSummaryTextPrimaryInt',
       type: IsarType.long,
     ),
     r'tokenSummaryTextSecondaryInt': PropertySchema(
-      id: 152,
+      id: 153,
       name: r'tokenSummaryTextSecondaryInt',
       type: IsarType.long,
     ),
     r'topNavIconGreenInt': PropertySchema(
-      id: 153,
+      id: 154,
       name: r'topNavIconGreenInt',
       type: IsarType.long,
     ),
     r'topNavIconPrimaryInt': PropertySchema(
-      id: 154,
+      id: 155,
       name: r'topNavIconPrimaryInt',
       type: IsarType.long,
     ),
     r'topNavIconRedInt': PropertySchema(
-      id: 155,
+      id: 156,
       name: r'topNavIconRedInt',
       type: IsarType.long,
     ),
     r'topNavIconYellowInt': PropertySchema(
-      id: 156,
+      id: 157,
       name: r'topNavIconYellowInt',
       type: IsarType.long,
     ),
+    r'version': PropertySchema(
+      id: 158,
+      name: r'version',
+      type: IsarType.long,
+    ),
     r'warningBackgroundInt': PropertySchema(
-      id: 157,
+      id: 159,
       name: r'warningBackgroundInt',
       type: IsarType.long,
     ),
     r'warningForegroundInt': PropertySchema(
-      id: 158,
+      id: 160,
       name: r'warningForegroundInt',
       type: IsarType.long,
     )
@@ -835,7 +846,10 @@ const StackThemeSchema = CollectionSchema(
     )
   },
   links: {},
-  embeddedSchemas: {r'ThemeAssets': ThemeAssetsSchema},
+  embeddedSchemas: {
+    r'ThemeAssets': ThemeAssetsSchema,
+    r'ThemeAssetsV2': ThemeAssetsV2Schema
+  },
   getId: _stackThemeGetId,
   getLinks: _stackThemeGetLinks,
   attach: _stackThemeAttach,
@@ -848,9 +862,22 @@ int _stackThemeEstimateSize(
   Map<Type, List<int>> allOffsets,
 ) {
   var bytesCount = offsets.last;
-  bytesCount += 3 +
-      ThemeAssetsSchema.estimateSize(
-          object.assets, allOffsets[ThemeAssets]!, allOffsets);
+  {
+    final value = object.assetsV1;
+    if (value != null) {
+      bytesCount += 3 +
+          ThemeAssetsSchema.estimateSize(
+              value, allOffsets[ThemeAssets]!, allOffsets);
+    }
+  }
+  {
+    final value = object.assetsV2;
+    if (value != null) {
+      bytesCount += 3 +
+          ThemeAssetsV2Schema.estimateSize(
+              value, allOffsets[ThemeAssetsV2]!, allOffsets);
+    }
+  }
   bytesCount += 3 + object.brightnessString.length * 3;
   bytesCount += 3 + object.coinColorsJsonString.length * 3;
   {
@@ -887,160 +914,167 @@ void _stackThemeSerialize(
     offsets[6],
     allOffsets,
     ThemeAssetsSchema.serialize,
-    object.assets,
+    object.assetsV1,
+  );
+  writer.writeObject<ThemeAssetsV2>(
+    offsets[7],
+    allOffsets,
+    ThemeAssetsV2Schema.serialize,
+    object.assetsV2,
   );
-  writer.writeLong(offsets[7], object.backgroundAppBarInt);
-  writer.writeLong(offsets[8], object.backgroundInt);
-  writer.writeLong(offsets[9], object.bottomNavBackInt);
-  writer.writeLong(offsets[10], object.bottomNavIconBackInt);
-  writer.writeLong(offsets[11], object.bottomNavIconIconHighlightedInt);
-  writer.writeLong(offsets[12], object.bottomNavIconIconInt);
-  writer.writeLong(offsets[13], object.bottomNavShadowInt);
-  writer.writeLong(offsets[14], object.bottomNavTextInt);
-  writer.writeString(offsets[15], object.brightnessString);
-  writer.writeLong(offsets[16], object.buttonBackBorderDisabledInt);
-  writer.writeLong(offsets[17], object.buttonBackBorderInt);
-  writer.writeLong(offsets[18], object.buttonBackBorderSecondaryDisabledInt);
-  writer.writeLong(offsets[19], object.buttonBackBorderSecondaryInt);
-  writer.writeLong(offsets[20], object.buttonBackPrimaryDisabledInt);
-  writer.writeLong(offsets[21], object.buttonBackPrimaryInt);
-  writer.writeLong(offsets[22], object.buttonBackSecondaryDisabledInt);
-  writer.writeLong(offsets[23], object.buttonBackSecondaryInt);
-  writer.writeLong(offsets[24], object.buttonTextBorderInt);
-  writer.writeLong(offsets[25], object.buttonTextBorderlessDisabledInt);
-  writer.writeLong(offsets[26], object.buttonTextBorderlessInt);
-  writer.writeLong(offsets[27], object.buttonTextDisabledInt);
-  writer.writeLong(offsets[28], object.buttonTextPrimaryDisabledInt);
-  writer.writeLong(offsets[29], object.buttonTextPrimaryInt);
-  writer.writeLong(offsets[30], object.buttonTextSecondaryDisabledInt);
-  writer.writeLong(offsets[31], object.buttonTextSecondaryInt);
-  writer.writeLong(offsets[32], object.checkboxBGCheckedInt);
-  writer.writeLong(offsets[33], object.checkboxBGDisabledInt);
-  writer.writeLong(offsets[34], object.checkboxBorderEmptyInt);
-  writer.writeLong(offsets[35], object.checkboxIconCheckedInt);
-  writer.writeLong(offsets[36], object.checkboxIconDisabledInt);
-  writer.writeLong(offsets[37], object.checkboxTextLabelInt);
-  writer.writeString(offsets[38], object.coinColorsJsonString);
-  writer.writeLong(offsets[39], object.currencyListItemBGInt);
-  writer.writeLong(offsets[40], object.customTextButtonDisabledTextInt);
-  writer.writeLong(offsets[41], object.customTextButtonEnabledTextInt);
-  writer.writeLong(offsets[42], object.ethTagBGInt);
-  writer.writeLong(offsets[43], object.ethTagTextInt);
-  writer.writeLong(offsets[44], object.ethWalletTagBGInt);
-  writer.writeLong(offsets[45], object.ethWalletTagTextInt);
-  writer.writeLong(offsets[46], object.favoriteStarActiveInt);
-  writer.writeLong(offsets[47], object.favoriteStarInactiveInt);
-  writer.writeString(offsets[48], object.gradientBackgroundString);
-  writer.writeLong(offsets[49], object.highlightInt);
-  writer.writeString(offsets[50], object.homeViewButtonBarBoxShadowString);
-  writer.writeLong(offsets[51], object.infoItemBGInt);
-  writer.writeLong(offsets[52], object.infoItemIconsInt);
-  writer.writeLong(offsets[53], object.infoItemLabelInt);
-  writer.writeLong(offsets[54], object.infoItemTextInt);
-  writer.writeLong(offsets[55], object.loadingOverlayTextColorInt);
-  writer.writeLong(offsets[56], object.myStackContactIconBGInt);
-  writer.writeString(offsets[57], object.name);
-  writer.writeLong(offsets[58], object.numberBackDefaultInt);
-  writer.writeLong(offsets[59], object.numberTextDefaultInt);
-  writer.writeLong(offsets[60], object.numpadBackDefaultInt);
-  writer.writeLong(offsets[61], object.numpadTextDefaultInt);
-  writer.writeLong(offsets[62], object.overlayInt);
-  writer.writeLong(offsets[63], object.popupBGInt);
-  writer.writeLong(offsets[64], object.radioButtonBorderDisabledInt);
-  writer.writeLong(offsets[65], object.radioButtonBorderEnabledInt);
-  writer.writeLong(offsets[66], object.radioButtonIconBorderDisabledInt);
-  writer.writeLong(offsets[67], object.radioButtonIconBorderInt);
-  writer.writeLong(offsets[68], object.radioButtonIconCircleInt);
-  writer.writeLong(offsets[69], object.radioButtonIconEnabledInt);
-  writer.writeLong(offsets[70], object.radioButtonLabelDisabledInt);
-  writer.writeLong(offsets[71], object.radioButtonLabelEnabledInt);
-  writer.writeLong(offsets[72], object.radioButtonTextDisabledInt);
-  writer.writeLong(offsets[73], object.radioButtonTextEnabledInt);
-  writer.writeLong(offsets[74], object.rateTypeToggleColorOffInt);
-  writer.writeLong(offsets[75], object.rateTypeToggleColorOnInt);
-  writer.writeLong(offsets[76], object.rateTypeToggleDesktopColorOffInt);
-  writer.writeLong(offsets[77], object.rateTypeToggleDesktopColorOnInt);
-  writer.writeLong(offsets[78], object.settingsIconBack2Int);
-  writer.writeLong(offsets[79], object.settingsIconBackInt);
-  writer.writeLong(offsets[80], object.settingsIconElementInt);
-  writer.writeLong(offsets[81], object.settingsIconIconInt);
-  writer.writeLong(offsets[82], object.settingsItem2ActiveBGInt);
-  writer.writeLong(offsets[83], object.settingsItem2ActiveSubInt);
-  writer.writeLong(offsets[84], object.settingsItem2ActiveTextInt);
-  writer.writeLong(offsets[85], object.shadowInt);
-  writer.writeLong(offsets[86], object.snackBarBackErrorInt);
-  writer.writeLong(offsets[87], object.snackBarBackInfoInt);
-  writer.writeLong(offsets[88], object.snackBarBackSuccessInt);
-  writer.writeLong(offsets[89], object.snackBarTextErrorInt);
-  writer.writeLong(offsets[90], object.snackBarTextInfoInt);
-  writer.writeLong(offsets[91], object.snackBarTextSuccessInt);
-  writer.writeLong(offsets[92], object.splashInt);
-  writer.writeLong(offsets[93], object.stackWalletBGInt);
-  writer.writeLong(offsets[94], object.stackWalletBottomInt);
-  writer.writeLong(offsets[95], object.stackWalletMidInt);
-  writer.writeString(offsets[96], object.standardBoxShadowString);
-  writer.writeLong(offsets[97], object.stepIndicatorBGCheckInt);
-  writer.writeLong(offsets[98], object.stepIndicatorBGInactiveInt);
-  writer.writeLong(offsets[99], object.stepIndicatorBGLinesInactiveInt);
-  writer.writeLong(offsets[100], object.stepIndicatorBGLinesInt);
-  writer.writeLong(offsets[101], object.stepIndicatorBGNumberInt);
-  writer.writeLong(offsets[102], object.stepIndicatorIconInactiveInt);
-  writer.writeLong(offsets[103], object.stepIndicatorIconNumberInt);
-  writer.writeLong(offsets[104], object.stepIndicatorIconTextInt);
-  writer.writeLong(offsets[105], object.switchBGDisabledInt);
-  writer.writeLong(offsets[106], object.switchBGOffInt);
-  writer.writeLong(offsets[107], object.switchBGOnInt);
-  writer.writeLong(offsets[108], object.switchCircleDisabledInt);
-  writer.writeLong(offsets[109], object.switchCircleOffInt);
-  writer.writeLong(offsets[110], object.switchCircleOnInt);
-  writer.writeLong(offsets[111], object.textConfirmTotalAmountInt);
-  writer.writeLong(offsets[112], object.textDark2Int);
-  writer.writeLong(offsets[113], object.textDark3Int);
-  writer.writeLong(offsets[114], object.textDarkInt);
-  writer.writeLong(offsets[115], object.textErrorInt);
-  writer.writeLong(offsets[116], object.textFavoriteCardInt);
-  writer.writeLong(offsets[117], object.textFieldActiveBGInt);
-  writer.writeLong(offsets[118], object.textFieldActiveLabelInt);
-  writer.writeLong(offsets[119], object.textFieldActiveSearchIconLeftInt);
-  writer.writeLong(offsets[120], object.textFieldActiveSearchIconRightInt);
-  writer.writeLong(offsets[121], object.textFieldActiveTextInt);
-  writer.writeLong(offsets[122], object.textFieldDefaultBGInt);
-  writer.writeLong(offsets[123], object.textFieldDefaultSearchIconLeftInt);
-  writer.writeLong(offsets[124], object.textFieldDefaultSearchIconRightInt);
-  writer.writeLong(offsets[125], object.textFieldDefaultTextInt);
-  writer.writeLong(offsets[126], object.textFieldErrorBGInt);
-  writer.writeLong(offsets[127], object.textFieldErrorBorderInt);
-  writer.writeLong(offsets[128], object.textFieldErrorLabelInt);
-  writer.writeLong(offsets[129], object.textFieldErrorSearchIconLeftInt);
-  writer.writeLong(offsets[130], object.textFieldErrorSearchIconRightInt);
-  writer.writeLong(offsets[131], object.textFieldErrorTextInt);
-  writer.writeLong(offsets[132], object.textFieldSuccessBGInt);
-  writer.writeLong(offsets[133], object.textFieldSuccessBorderInt);
-  writer.writeLong(offsets[134], object.textFieldSuccessLabelInt);
-  writer.writeLong(offsets[135], object.textFieldSuccessSearchIconLeftInt);
-  writer.writeLong(offsets[136], object.textFieldSuccessSearchIconRightInt);
-  writer.writeLong(offsets[137], object.textFieldSuccessTextInt);
-  writer.writeLong(offsets[138], object.textRestoreInt);
-  writer.writeLong(offsets[139], object.textSelectedWordTableItemInt);
-  writer.writeLong(offsets[140], object.textSubtitle1Int);
-  writer.writeLong(offsets[141], object.textSubtitle2Int);
-  writer.writeLong(offsets[142], object.textSubtitle3Int);
-  writer.writeLong(offsets[143], object.textSubtitle4Int);
-  writer.writeLong(offsets[144], object.textSubtitle5Int);
-  writer.writeLong(offsets[145], object.textSubtitle6Int);
-  writer.writeLong(offsets[146], object.textWhiteInt);
-  writer.writeString(offsets[147], object.themeId);
-  writer.writeLong(offsets[148], object.tokenSummaryBGInt);
-  writer.writeLong(offsets[149], object.tokenSummaryButtonBGInt);
-  writer.writeLong(offsets[150], object.tokenSummaryIconInt);
-  writer.writeLong(offsets[151], object.tokenSummaryTextPrimaryInt);
-  writer.writeLong(offsets[152], object.tokenSummaryTextSecondaryInt);
-  writer.writeLong(offsets[153], object.topNavIconGreenInt);
-  writer.writeLong(offsets[154], object.topNavIconPrimaryInt);
-  writer.writeLong(offsets[155], object.topNavIconRedInt);
-  writer.writeLong(offsets[156], object.topNavIconYellowInt);
-  writer.writeLong(offsets[157], object.warningBackgroundInt);
-  writer.writeLong(offsets[158], object.warningForegroundInt);
+  writer.writeLong(offsets[8], object.backgroundAppBarInt);
+  writer.writeLong(offsets[9], object.backgroundInt);
+  writer.writeLong(offsets[10], object.bottomNavBackInt);
+  writer.writeLong(offsets[11], object.bottomNavIconBackInt);
+  writer.writeLong(offsets[12], object.bottomNavIconIconHighlightedInt);
+  writer.writeLong(offsets[13], object.bottomNavIconIconInt);
+  writer.writeLong(offsets[14], object.bottomNavShadowInt);
+  writer.writeLong(offsets[15], object.bottomNavTextInt);
+  writer.writeString(offsets[16], object.brightnessString);
+  writer.writeLong(offsets[17], object.buttonBackBorderDisabledInt);
+  writer.writeLong(offsets[18], object.buttonBackBorderInt);
+  writer.writeLong(offsets[19], object.buttonBackBorderSecondaryDisabledInt);
+  writer.writeLong(offsets[20], object.buttonBackBorderSecondaryInt);
+  writer.writeLong(offsets[21], object.buttonBackPrimaryDisabledInt);
+  writer.writeLong(offsets[22], object.buttonBackPrimaryInt);
+  writer.writeLong(offsets[23], object.buttonBackSecondaryDisabledInt);
+  writer.writeLong(offsets[24], object.buttonBackSecondaryInt);
+  writer.writeLong(offsets[25], object.buttonTextBorderInt);
+  writer.writeLong(offsets[26], object.buttonTextBorderlessDisabledInt);
+  writer.writeLong(offsets[27], object.buttonTextBorderlessInt);
+  writer.writeLong(offsets[28], object.buttonTextDisabledInt);
+  writer.writeLong(offsets[29], object.buttonTextPrimaryDisabledInt);
+  writer.writeLong(offsets[30], object.buttonTextPrimaryInt);
+  writer.writeLong(offsets[31], object.buttonTextSecondaryDisabledInt);
+  writer.writeLong(offsets[32], object.buttonTextSecondaryInt);
+  writer.writeLong(offsets[33], object.checkboxBGCheckedInt);
+  writer.writeLong(offsets[34], object.checkboxBGDisabledInt);
+  writer.writeLong(offsets[35], object.checkboxBorderEmptyInt);
+  writer.writeLong(offsets[36], object.checkboxIconCheckedInt);
+  writer.writeLong(offsets[37], object.checkboxIconDisabledInt);
+  writer.writeLong(offsets[38], object.checkboxTextLabelInt);
+  writer.writeString(offsets[39], object.coinColorsJsonString);
+  writer.writeLong(offsets[40], object.currencyListItemBGInt);
+  writer.writeLong(offsets[41], object.customTextButtonDisabledTextInt);
+  writer.writeLong(offsets[42], object.customTextButtonEnabledTextInt);
+  writer.writeLong(offsets[43], object.ethTagBGInt);
+  writer.writeLong(offsets[44], object.ethTagTextInt);
+  writer.writeLong(offsets[45], object.ethWalletTagBGInt);
+  writer.writeLong(offsets[46], object.ethWalletTagTextInt);
+  writer.writeLong(offsets[47], object.favoriteStarActiveInt);
+  writer.writeLong(offsets[48], object.favoriteStarInactiveInt);
+  writer.writeString(offsets[49], object.gradientBackgroundString);
+  writer.writeLong(offsets[50], object.highlightInt);
+  writer.writeString(offsets[51], object.homeViewButtonBarBoxShadowString);
+  writer.writeLong(offsets[52], object.infoItemBGInt);
+  writer.writeLong(offsets[53], object.infoItemIconsInt);
+  writer.writeLong(offsets[54], object.infoItemLabelInt);
+  writer.writeLong(offsets[55], object.infoItemTextInt);
+  writer.writeLong(offsets[56], object.loadingOverlayTextColorInt);
+  writer.writeLong(offsets[57], object.myStackContactIconBGInt);
+  writer.writeString(offsets[58], object.name);
+  writer.writeLong(offsets[59], object.numberBackDefaultInt);
+  writer.writeLong(offsets[60], object.numberTextDefaultInt);
+  writer.writeLong(offsets[61], object.numpadBackDefaultInt);
+  writer.writeLong(offsets[62], object.numpadTextDefaultInt);
+  writer.writeLong(offsets[63], object.overlayInt);
+  writer.writeLong(offsets[64], object.popupBGInt);
+  writer.writeLong(offsets[65], object.radioButtonBorderDisabledInt);
+  writer.writeLong(offsets[66], object.radioButtonBorderEnabledInt);
+  writer.writeLong(offsets[67], object.radioButtonIconBorderDisabledInt);
+  writer.writeLong(offsets[68], object.radioButtonIconBorderInt);
+  writer.writeLong(offsets[69], object.radioButtonIconCircleInt);
+  writer.writeLong(offsets[70], object.radioButtonIconEnabledInt);
+  writer.writeLong(offsets[71], object.radioButtonLabelDisabledInt);
+  writer.writeLong(offsets[72], object.radioButtonLabelEnabledInt);
+  writer.writeLong(offsets[73], object.radioButtonTextDisabledInt);
+  writer.writeLong(offsets[74], object.radioButtonTextEnabledInt);
+  writer.writeLong(offsets[75], object.rateTypeToggleColorOffInt);
+  writer.writeLong(offsets[76], object.rateTypeToggleColorOnInt);
+  writer.writeLong(offsets[77], object.rateTypeToggleDesktopColorOffInt);
+  writer.writeLong(offsets[78], object.rateTypeToggleDesktopColorOnInt);
+  writer.writeLong(offsets[79], object.settingsIconBack2Int);
+  writer.writeLong(offsets[80], object.settingsIconBackInt);
+  writer.writeLong(offsets[81], object.settingsIconElementInt);
+  writer.writeLong(offsets[82], object.settingsIconIconInt);
+  writer.writeLong(offsets[83], object.settingsItem2ActiveBGInt);
+  writer.writeLong(offsets[84], object.settingsItem2ActiveSubInt);
+  writer.writeLong(offsets[85], object.settingsItem2ActiveTextInt);
+  writer.writeLong(offsets[86], object.shadowInt);
+  writer.writeLong(offsets[87], object.snackBarBackErrorInt);
+  writer.writeLong(offsets[88], object.snackBarBackInfoInt);
+  writer.writeLong(offsets[89], object.snackBarBackSuccessInt);
+  writer.writeLong(offsets[90], object.snackBarTextErrorInt);
+  writer.writeLong(offsets[91], object.snackBarTextInfoInt);
+  writer.writeLong(offsets[92], object.snackBarTextSuccessInt);
+  writer.writeLong(offsets[93], object.splashInt);
+  writer.writeLong(offsets[94], object.stackWalletBGInt);
+  writer.writeLong(offsets[95], object.stackWalletBottomInt);
+  writer.writeLong(offsets[96], object.stackWalletMidInt);
+  writer.writeString(offsets[97], object.standardBoxShadowString);
+  writer.writeLong(offsets[98], object.stepIndicatorBGCheckInt);
+  writer.writeLong(offsets[99], object.stepIndicatorBGInactiveInt);
+  writer.writeLong(offsets[100], object.stepIndicatorBGLinesInactiveInt);
+  writer.writeLong(offsets[101], object.stepIndicatorBGLinesInt);
+  writer.writeLong(offsets[102], object.stepIndicatorBGNumberInt);
+  writer.writeLong(offsets[103], object.stepIndicatorIconInactiveInt);
+  writer.writeLong(offsets[104], object.stepIndicatorIconNumberInt);
+  writer.writeLong(offsets[105], object.stepIndicatorIconTextInt);
+  writer.writeLong(offsets[106], object.switchBGDisabledInt);
+  writer.writeLong(offsets[107], object.switchBGOffInt);
+  writer.writeLong(offsets[108], object.switchBGOnInt);
+  writer.writeLong(offsets[109], object.switchCircleDisabledInt);
+  writer.writeLong(offsets[110], object.switchCircleOffInt);
+  writer.writeLong(offsets[111], object.switchCircleOnInt);
+  writer.writeLong(offsets[112], object.textConfirmTotalAmountInt);
+  writer.writeLong(offsets[113], object.textDark2Int);
+  writer.writeLong(offsets[114], object.textDark3Int);
+  writer.writeLong(offsets[115], object.textDarkInt);
+  writer.writeLong(offsets[116], object.textErrorInt);
+  writer.writeLong(offsets[117], object.textFavoriteCardInt);
+  writer.writeLong(offsets[118], object.textFieldActiveBGInt);
+  writer.writeLong(offsets[119], object.textFieldActiveLabelInt);
+  writer.writeLong(offsets[120], object.textFieldActiveSearchIconLeftInt);
+  writer.writeLong(offsets[121], object.textFieldActiveSearchIconRightInt);
+  writer.writeLong(offsets[122], object.textFieldActiveTextInt);
+  writer.writeLong(offsets[123], object.textFieldDefaultBGInt);
+  writer.writeLong(offsets[124], object.textFieldDefaultSearchIconLeftInt);
+  writer.writeLong(offsets[125], object.textFieldDefaultSearchIconRightInt);
+  writer.writeLong(offsets[126], object.textFieldDefaultTextInt);
+  writer.writeLong(offsets[127], object.textFieldErrorBGInt);
+  writer.writeLong(offsets[128], object.textFieldErrorBorderInt);
+  writer.writeLong(offsets[129], object.textFieldErrorLabelInt);
+  writer.writeLong(offsets[130], object.textFieldErrorSearchIconLeftInt);
+  writer.writeLong(offsets[131], object.textFieldErrorSearchIconRightInt);
+  writer.writeLong(offsets[132], object.textFieldErrorTextInt);
+  writer.writeLong(offsets[133], object.textFieldSuccessBGInt);
+  writer.writeLong(offsets[134], object.textFieldSuccessBorderInt);
+  writer.writeLong(offsets[135], object.textFieldSuccessLabelInt);
+  writer.writeLong(offsets[136], object.textFieldSuccessSearchIconLeftInt);
+  writer.writeLong(offsets[137], object.textFieldSuccessSearchIconRightInt);
+  writer.writeLong(offsets[138], object.textFieldSuccessTextInt);
+  writer.writeLong(offsets[139], object.textRestoreInt);
+  writer.writeLong(offsets[140], object.textSelectedWordTableItemInt);
+  writer.writeLong(offsets[141], object.textSubtitle1Int);
+  writer.writeLong(offsets[142], object.textSubtitle2Int);
+  writer.writeLong(offsets[143], object.textSubtitle3Int);
+  writer.writeLong(offsets[144], object.textSubtitle4Int);
+  writer.writeLong(offsets[145], object.textSubtitle5Int);
+  writer.writeLong(offsets[146], object.textSubtitle6Int);
+  writer.writeLong(offsets[147], object.textWhiteInt);
+  writer.writeString(offsets[148], object.themeId);
+  writer.writeLong(offsets[149], object.tokenSummaryBGInt);
+  writer.writeLong(offsets[150], object.tokenSummaryButtonBGInt);
+  writer.writeLong(offsets[151], object.tokenSummaryIconInt);
+  writer.writeLong(offsets[152], object.tokenSummaryTextPrimaryInt);
+  writer.writeLong(offsets[153], object.tokenSummaryTextSecondaryInt);
+  writer.writeLong(offsets[154], object.topNavIconGreenInt);
+  writer.writeLong(offsets[155], object.topNavIconPrimaryInt);
+  writer.writeLong(offsets[156], object.topNavIconRedInt);
+  writer.writeLong(offsets[157], object.topNavIconYellowInt);
+  writer.writeLong(offsets[158], object.version);
+  writer.writeLong(offsets[159], object.warningBackgroundInt);
+  writer.writeLong(offsets[160], object.warningForegroundInt);
 }
 
 StackTheme _stackThemeDeserialize(
@@ -1049,173 +1083,178 @@ StackTheme _stackThemeDeserialize(
   List<int> offsets,
   Map<Type, List<int>> allOffsets,
 ) {
-  final object = StackTheme(
-    accentColorBlueInt: reader.readLong(offsets[0]),
-    accentColorDarkInt: reader.readLong(offsets[1]),
-    accentColorGreenInt: reader.readLong(offsets[2]),
-    accentColorOrangeInt: reader.readLong(offsets[3]),
-    accentColorRedInt: reader.readLong(offsets[4]),
-    accentColorYellowInt: reader.readLong(offsets[5]),
-    assets: reader.readObjectOrNull<ThemeAssets>(
-          offsets[6],
-          ThemeAssetsSchema.deserialize,
-          allOffsets,
-        ) ??
-        ThemeAssets(),
-    backgroundAppBarInt: reader.readLong(offsets[7]),
-    backgroundInt: reader.readLong(offsets[8]),
-    bottomNavBackInt: reader.readLong(offsets[9]),
-    bottomNavIconBackInt: reader.readLong(offsets[10]),
-    bottomNavIconIconHighlightedInt: reader.readLong(offsets[11]),
-    bottomNavIconIconInt: reader.readLong(offsets[12]),
-    bottomNavShadowInt: reader.readLong(offsets[13]),
-    bottomNavTextInt: reader.readLong(offsets[14]),
-    brightnessString: reader.readString(offsets[15]),
-    buttonBackBorderDisabledInt: reader.readLong(offsets[16]),
-    buttonBackBorderInt: reader.readLong(offsets[17]),
-    buttonBackBorderSecondaryDisabledInt: reader.readLong(offsets[18]),
-    buttonBackBorderSecondaryInt: reader.readLong(offsets[19]),
-    buttonBackPrimaryDisabledInt: reader.readLong(offsets[20]),
-    buttonBackPrimaryInt: reader.readLong(offsets[21]),
-    buttonBackSecondaryDisabledInt: reader.readLong(offsets[22]),
-    buttonBackSecondaryInt: reader.readLong(offsets[23]),
-    buttonTextBorderInt: reader.readLong(offsets[24]),
-    buttonTextBorderlessDisabledInt: reader.readLong(offsets[25]),
-    buttonTextBorderlessInt: reader.readLong(offsets[26]),
-    buttonTextDisabledInt: reader.readLong(offsets[27]),
-    buttonTextPrimaryDisabledInt: reader.readLong(offsets[28]),
-    buttonTextPrimaryInt: reader.readLong(offsets[29]),
-    buttonTextSecondaryDisabledInt: reader.readLong(offsets[30]),
-    buttonTextSecondaryInt: reader.readLong(offsets[31]),
-    checkboxBGCheckedInt: reader.readLong(offsets[32]),
-    checkboxBGDisabledInt: reader.readLong(offsets[33]),
-    checkboxBorderEmptyInt: reader.readLong(offsets[34]),
-    checkboxIconCheckedInt: reader.readLong(offsets[35]),
-    checkboxIconDisabledInt: reader.readLong(offsets[36]),
-    checkboxTextLabelInt: reader.readLong(offsets[37]),
-    coinColorsJsonString: reader.readString(offsets[38]),
-    currencyListItemBGInt: reader.readLong(offsets[39]),
-    customTextButtonDisabledTextInt: reader.readLong(offsets[40]),
-    customTextButtonEnabledTextInt: reader.readLong(offsets[41]),
-    ethTagBGInt: reader.readLong(offsets[42]),
-    ethTagTextInt: reader.readLong(offsets[43]),
-    ethWalletTagBGInt: reader.readLong(offsets[44]),
-    ethWalletTagTextInt: reader.readLong(offsets[45]),
-    favoriteStarActiveInt: reader.readLong(offsets[46]),
-    favoriteStarInactiveInt: reader.readLong(offsets[47]),
-    gradientBackgroundString: reader.readStringOrNull(offsets[48]),
-    highlightInt: reader.readLong(offsets[49]),
-    homeViewButtonBarBoxShadowString: reader.readStringOrNull(offsets[50]),
-    infoItemBGInt: reader.readLong(offsets[51]),
-    infoItemIconsInt: reader.readLong(offsets[52]),
-    infoItemLabelInt: reader.readLong(offsets[53]),
-    infoItemTextInt: reader.readLong(offsets[54]),
-    loadingOverlayTextColorInt: reader.readLong(offsets[55]),
-    myStackContactIconBGInt: reader.readLong(offsets[56]),
-    name: reader.readString(offsets[57]),
-    numberBackDefaultInt: reader.readLong(offsets[58]),
-    numberTextDefaultInt: reader.readLong(offsets[59]),
-    numpadBackDefaultInt: reader.readLong(offsets[60]),
-    numpadTextDefaultInt: reader.readLong(offsets[61]),
-    overlayInt: reader.readLong(offsets[62]),
-    popupBGInt: reader.readLong(offsets[63]),
-    radioButtonBorderDisabledInt: reader.readLong(offsets[64]),
-    radioButtonBorderEnabledInt: reader.readLong(offsets[65]),
-    radioButtonIconBorderDisabledInt: reader.readLong(offsets[66]),
-    radioButtonIconBorderInt: reader.readLong(offsets[67]),
-    radioButtonIconCircleInt: reader.readLong(offsets[68]),
-    radioButtonIconEnabledInt: reader.readLong(offsets[69]),
-    radioButtonLabelDisabledInt: reader.readLong(offsets[70]),
-    radioButtonLabelEnabledInt: reader.readLong(offsets[71]),
-    radioButtonTextDisabledInt: reader.readLong(offsets[72]),
-    radioButtonTextEnabledInt: reader.readLong(offsets[73]),
-    rateTypeToggleColorOffInt: reader.readLong(offsets[74]),
-    rateTypeToggleColorOnInt: reader.readLong(offsets[75]),
-    rateTypeToggleDesktopColorOffInt: reader.readLong(offsets[76]),
-    rateTypeToggleDesktopColorOnInt: reader.readLong(offsets[77]),
-    settingsIconBack2Int: reader.readLong(offsets[78]),
-    settingsIconBackInt: reader.readLong(offsets[79]),
-    settingsIconElementInt: reader.readLong(offsets[80]),
-    settingsIconIconInt: reader.readLong(offsets[81]),
-    settingsItem2ActiveBGInt: reader.readLong(offsets[82]),
-    settingsItem2ActiveSubInt: reader.readLong(offsets[83]),
-    settingsItem2ActiveTextInt: reader.readLong(offsets[84]),
-    shadowInt: reader.readLong(offsets[85]),
-    snackBarBackErrorInt: reader.readLong(offsets[86]),
-    snackBarBackInfoInt: reader.readLong(offsets[87]),
-    snackBarBackSuccessInt: reader.readLong(offsets[88]),
-    snackBarTextErrorInt: reader.readLong(offsets[89]),
-    snackBarTextInfoInt: reader.readLong(offsets[90]),
-    snackBarTextSuccessInt: reader.readLong(offsets[91]),
-    splashInt: reader.readLong(offsets[92]),
-    stackWalletBGInt: reader.readLong(offsets[93]),
-    stackWalletBottomInt: reader.readLong(offsets[94]),
-    stackWalletMidInt: reader.readLong(offsets[95]),
-    standardBoxShadowString: reader.readString(offsets[96]),
-    stepIndicatorBGCheckInt: reader.readLong(offsets[97]),
-    stepIndicatorBGInactiveInt: reader.readLong(offsets[98]),
-    stepIndicatorBGLinesInactiveInt: reader.readLong(offsets[99]),
-    stepIndicatorBGLinesInt: reader.readLong(offsets[100]),
-    stepIndicatorBGNumberInt: reader.readLong(offsets[101]),
-    stepIndicatorIconInactiveInt: reader.readLong(offsets[102]),
-    stepIndicatorIconNumberInt: reader.readLong(offsets[103]),
-    stepIndicatorIconTextInt: reader.readLong(offsets[104]),
-    switchBGDisabledInt: reader.readLong(offsets[105]),
-    switchBGOffInt: reader.readLong(offsets[106]),
-    switchBGOnInt: reader.readLong(offsets[107]),
-    switchCircleDisabledInt: reader.readLong(offsets[108]),
-    switchCircleOffInt: reader.readLong(offsets[109]),
-    switchCircleOnInt: reader.readLong(offsets[110]),
-    textConfirmTotalAmountInt: reader.readLong(offsets[111]),
-    textDark2Int: reader.readLong(offsets[112]),
-    textDark3Int: reader.readLong(offsets[113]),
-    textDarkInt: reader.readLong(offsets[114]),
-    textErrorInt: reader.readLong(offsets[115]),
-    textFavoriteCardInt: reader.readLong(offsets[116]),
-    textFieldActiveBGInt: reader.readLong(offsets[117]),
-    textFieldActiveLabelInt: reader.readLong(offsets[118]),
-    textFieldActiveSearchIconLeftInt: reader.readLong(offsets[119]),
-    textFieldActiveSearchIconRightInt: reader.readLong(offsets[120]),
-    textFieldActiveTextInt: reader.readLong(offsets[121]),
-    textFieldDefaultBGInt: reader.readLong(offsets[122]),
-    textFieldDefaultSearchIconLeftInt: reader.readLong(offsets[123]),
-    textFieldDefaultSearchIconRightInt: reader.readLong(offsets[124]),
-    textFieldDefaultTextInt: reader.readLong(offsets[125]),
-    textFieldErrorBGInt: reader.readLong(offsets[126]),
-    textFieldErrorBorderInt: reader.readLong(offsets[127]),
-    textFieldErrorLabelInt: reader.readLong(offsets[128]),
-    textFieldErrorSearchIconLeftInt: reader.readLong(offsets[129]),
-    textFieldErrorSearchIconRightInt: reader.readLong(offsets[130]),
-    textFieldErrorTextInt: reader.readLong(offsets[131]),
-    textFieldSuccessBGInt: reader.readLong(offsets[132]),
-    textFieldSuccessBorderInt: reader.readLong(offsets[133]),
-    textFieldSuccessLabelInt: reader.readLong(offsets[134]),
-    textFieldSuccessSearchIconLeftInt: reader.readLong(offsets[135]),
-    textFieldSuccessSearchIconRightInt: reader.readLong(offsets[136]),
-    textFieldSuccessTextInt: reader.readLong(offsets[137]),
-    textRestoreInt: reader.readLong(offsets[138]),
-    textSelectedWordTableItemInt: reader.readLong(offsets[139]),
-    textSubtitle1Int: reader.readLong(offsets[140]),
-    textSubtitle2Int: reader.readLong(offsets[141]),
-    textSubtitle3Int: reader.readLong(offsets[142]),
-    textSubtitle4Int: reader.readLong(offsets[143]),
-    textSubtitle5Int: reader.readLong(offsets[144]),
-    textSubtitle6Int: reader.readLong(offsets[145]),
-    textWhiteInt: reader.readLong(offsets[146]),
-    themeId: reader.readString(offsets[147]),
-    tokenSummaryBGInt: reader.readLong(offsets[148]),
-    tokenSummaryButtonBGInt: reader.readLong(offsets[149]),
-    tokenSummaryIconInt: reader.readLong(offsets[150]),
-    tokenSummaryTextPrimaryInt: reader.readLong(offsets[151]),
-    tokenSummaryTextSecondaryInt: reader.readLong(offsets[152]),
-    topNavIconGreenInt: reader.readLong(offsets[153]),
-    topNavIconPrimaryInt: reader.readLong(offsets[154]),
-    topNavIconRedInt: reader.readLong(offsets[155]),
-    topNavIconYellowInt: reader.readLong(offsets[156]),
-    warningBackgroundInt: reader.readLong(offsets[157]),
-    warningForegroundInt: reader.readLong(offsets[158]),
+  final object = StackTheme();
+  object.accentColorBlueInt = reader.readLong(offsets[0]);
+  object.accentColorDarkInt = reader.readLong(offsets[1]);
+  object.accentColorGreenInt = reader.readLong(offsets[2]);
+  object.accentColorOrangeInt = reader.readLong(offsets[3]);
+  object.accentColorRedInt = reader.readLong(offsets[4]);
+  object.accentColorYellowInt = reader.readLong(offsets[5]);
+  object.assetsV1 = reader.readObjectOrNull<ThemeAssets>(
+    offsets[6],
+    ThemeAssetsSchema.deserialize,
+    allOffsets,
+  );
+  object.assetsV2 = reader.readObjectOrNull<ThemeAssetsV2>(
+    offsets[7],
+    ThemeAssetsV2Schema.deserialize,
+    allOffsets,
   );
+  object.backgroundAppBarInt = reader.readLong(offsets[8]);
+  object.backgroundInt = reader.readLong(offsets[9]);
+  object.bottomNavBackInt = reader.readLong(offsets[10]);
+  object.bottomNavIconBackInt = reader.readLong(offsets[11]);
+  object.bottomNavIconIconHighlightedInt = reader.readLong(offsets[12]);
+  object.bottomNavIconIconInt = reader.readLong(offsets[13]);
+  object.bottomNavShadowInt = reader.readLong(offsets[14]);
+  object.bottomNavTextInt = reader.readLong(offsets[15]);
+  object.brightnessString = reader.readString(offsets[16]);
+  object.buttonBackBorderDisabledInt = reader.readLong(offsets[17]);
+  object.buttonBackBorderInt = reader.readLong(offsets[18]);
+  object.buttonBackBorderSecondaryDisabledInt = reader.readLong(offsets[19]);
+  object.buttonBackBorderSecondaryInt = reader.readLong(offsets[20]);
+  object.buttonBackPrimaryDisabledInt = reader.readLong(offsets[21]);
+  object.buttonBackPrimaryInt = reader.readLong(offsets[22]);
+  object.buttonBackSecondaryDisabledInt = reader.readLong(offsets[23]);
+  object.buttonBackSecondaryInt = reader.readLong(offsets[24]);
+  object.buttonTextBorderInt = reader.readLong(offsets[25]);
+  object.buttonTextBorderlessDisabledInt = reader.readLong(offsets[26]);
+  object.buttonTextBorderlessInt = reader.readLong(offsets[27]);
+  object.buttonTextDisabledInt = reader.readLong(offsets[28]);
+  object.buttonTextPrimaryDisabledInt = reader.readLong(offsets[29]);
+  object.buttonTextPrimaryInt = reader.readLong(offsets[30]);
+  object.buttonTextSecondaryDisabledInt = reader.readLong(offsets[31]);
+  object.buttonTextSecondaryInt = reader.readLong(offsets[32]);
+  object.checkboxBGCheckedInt = reader.readLong(offsets[33]);
+  object.checkboxBGDisabledInt = reader.readLong(offsets[34]);
+  object.checkboxBorderEmptyInt = reader.readLong(offsets[35]);
+  object.checkboxIconCheckedInt = reader.readLong(offsets[36]);
+  object.checkboxIconDisabledInt = reader.readLong(offsets[37]);
+  object.checkboxTextLabelInt = reader.readLong(offsets[38]);
+  object.coinColorsJsonString = reader.readString(offsets[39]);
+  object.currencyListItemBGInt = reader.readLong(offsets[40]);
+  object.customTextButtonDisabledTextInt = reader.readLong(offsets[41]);
+  object.customTextButtonEnabledTextInt = reader.readLong(offsets[42]);
+  object.ethTagBGInt = reader.readLong(offsets[43]);
+  object.ethTagTextInt = reader.readLong(offsets[44]);
+  object.ethWalletTagBGInt = reader.readLong(offsets[45]);
+  object.ethWalletTagTextInt = reader.readLong(offsets[46]);
+  object.favoriteStarActiveInt = reader.readLong(offsets[47]);
+  object.favoriteStarInactiveInt = reader.readLong(offsets[48]);
+  object.gradientBackgroundString = reader.readStringOrNull(offsets[49]);
+  object.highlightInt = reader.readLong(offsets[50]);
+  object.homeViewButtonBarBoxShadowString =
+      reader.readStringOrNull(offsets[51]);
   object.id = id;
+  object.infoItemBGInt = reader.readLong(offsets[52]);
+  object.infoItemIconsInt = reader.readLong(offsets[53]);
+  object.infoItemLabelInt = reader.readLong(offsets[54]);
+  object.infoItemTextInt = reader.readLong(offsets[55]);
+  object.loadingOverlayTextColorInt = reader.readLong(offsets[56]);
+  object.myStackContactIconBGInt = reader.readLong(offsets[57]);
+  object.name = reader.readString(offsets[58]);
+  object.numberBackDefaultInt = reader.readLong(offsets[59]);
+  object.numberTextDefaultInt = reader.readLong(offsets[60]);
+  object.numpadBackDefaultInt = reader.readLong(offsets[61]);
+  object.numpadTextDefaultInt = reader.readLong(offsets[62]);
+  object.overlayInt = reader.readLong(offsets[63]);
+  object.popupBGInt = reader.readLong(offsets[64]);
+  object.radioButtonBorderDisabledInt = reader.readLong(offsets[65]);
+  object.radioButtonBorderEnabledInt = reader.readLong(offsets[66]);
+  object.radioButtonIconBorderDisabledInt = reader.readLong(offsets[67]);
+  object.radioButtonIconBorderInt = reader.readLong(offsets[68]);
+  object.radioButtonIconCircleInt = reader.readLong(offsets[69]);
+  object.radioButtonIconEnabledInt = reader.readLong(offsets[70]);
+  object.radioButtonLabelDisabledInt = reader.readLong(offsets[71]);
+  object.radioButtonLabelEnabledInt = reader.readLong(offsets[72]);
+  object.radioButtonTextDisabledInt = reader.readLong(offsets[73]);
+  object.radioButtonTextEnabledInt = reader.readLong(offsets[74]);
+  object.rateTypeToggleColorOffInt = reader.readLong(offsets[75]);
+  object.rateTypeToggleColorOnInt = reader.readLong(offsets[76]);
+  object.rateTypeToggleDesktopColorOffInt = reader.readLong(offsets[77]);
+  object.rateTypeToggleDesktopColorOnInt = reader.readLong(offsets[78]);
+  object.settingsIconBack2Int = reader.readLong(offsets[79]);
+  object.settingsIconBackInt = reader.readLong(offsets[80]);
+  object.settingsIconElementInt = reader.readLong(offsets[81]);
+  object.settingsIconIconInt = reader.readLong(offsets[82]);
+  object.settingsItem2ActiveBGInt = reader.readLong(offsets[83]);
+  object.settingsItem2ActiveSubInt = reader.readLong(offsets[84]);
+  object.settingsItem2ActiveTextInt = reader.readLong(offsets[85]);
+  object.shadowInt = reader.readLong(offsets[86]);
+  object.snackBarBackErrorInt = reader.readLong(offsets[87]);
+  object.snackBarBackInfoInt = reader.readLong(offsets[88]);
+  object.snackBarBackSuccessInt = reader.readLong(offsets[89]);
+  object.snackBarTextErrorInt = reader.readLong(offsets[90]);
+  object.snackBarTextInfoInt = reader.readLong(offsets[91]);
+  object.snackBarTextSuccessInt = reader.readLong(offsets[92]);
+  object.splashInt = reader.readLong(offsets[93]);
+  object.stackWalletBGInt = reader.readLong(offsets[94]);
+  object.stackWalletBottomInt = reader.readLong(offsets[95]);
+  object.stackWalletMidInt = reader.readLong(offsets[96]);
+  object.standardBoxShadowString = reader.readString(offsets[97]);
+  object.stepIndicatorBGCheckInt = reader.readLong(offsets[98]);
+  object.stepIndicatorBGInactiveInt = reader.readLong(offsets[99]);
+  object.stepIndicatorBGLinesInactiveInt = reader.readLong(offsets[100]);
+  object.stepIndicatorBGLinesInt = reader.readLong(offsets[101]);
+  object.stepIndicatorBGNumberInt = reader.readLong(offsets[102]);
+  object.stepIndicatorIconInactiveInt = reader.readLong(offsets[103]);
+  object.stepIndicatorIconNumberInt = reader.readLong(offsets[104]);
+  object.stepIndicatorIconTextInt = reader.readLong(offsets[105]);
+  object.switchBGDisabledInt = reader.readLong(offsets[106]);
+  object.switchBGOffInt = reader.readLong(offsets[107]);
+  object.switchBGOnInt = reader.readLong(offsets[108]);
+  object.switchCircleDisabledInt = reader.readLong(offsets[109]);
+  object.switchCircleOffInt = reader.readLong(offsets[110]);
+  object.switchCircleOnInt = reader.readLong(offsets[111]);
+  object.textConfirmTotalAmountInt = reader.readLong(offsets[112]);
+  object.textDark2Int = reader.readLong(offsets[113]);
+  object.textDark3Int = reader.readLong(offsets[114]);
+  object.textDarkInt = reader.readLong(offsets[115]);
+  object.textErrorInt = reader.readLong(offsets[116]);
+  object.textFavoriteCardInt = reader.readLong(offsets[117]);
+  object.textFieldActiveBGInt = reader.readLong(offsets[118]);
+  object.textFieldActiveLabelInt = reader.readLong(offsets[119]);
+  object.textFieldActiveSearchIconLeftInt = reader.readLong(offsets[120]);
+  object.textFieldActiveSearchIconRightInt = reader.readLong(offsets[121]);
+  object.textFieldActiveTextInt = reader.readLong(offsets[122]);
+  object.textFieldDefaultBGInt = reader.readLong(offsets[123]);
+  object.textFieldDefaultSearchIconLeftInt = reader.readLong(offsets[124]);
+  object.textFieldDefaultSearchIconRightInt = reader.readLong(offsets[125]);
+  object.textFieldDefaultTextInt = reader.readLong(offsets[126]);
+  object.textFieldErrorBGInt = reader.readLong(offsets[127]);
+  object.textFieldErrorBorderInt = reader.readLong(offsets[128]);
+  object.textFieldErrorLabelInt = reader.readLong(offsets[129]);
+  object.textFieldErrorSearchIconLeftInt = reader.readLong(offsets[130]);
+  object.textFieldErrorSearchIconRightInt = reader.readLong(offsets[131]);
+  object.textFieldErrorTextInt = reader.readLong(offsets[132]);
+  object.textFieldSuccessBGInt = reader.readLong(offsets[133]);
+  object.textFieldSuccessBorderInt = reader.readLong(offsets[134]);
+  object.textFieldSuccessLabelInt = reader.readLong(offsets[135]);
+  object.textFieldSuccessSearchIconLeftInt = reader.readLong(offsets[136]);
+  object.textFieldSuccessSearchIconRightInt = reader.readLong(offsets[137]);
+  object.textFieldSuccessTextInt = reader.readLong(offsets[138]);
+  object.textRestoreInt = reader.readLong(offsets[139]);
+  object.textSelectedWordTableItemInt = reader.readLong(offsets[140]);
+  object.textSubtitle1Int = reader.readLong(offsets[141]);
+  object.textSubtitle2Int = reader.readLong(offsets[142]);
+  object.textSubtitle3Int = reader.readLong(offsets[143]);
+  object.textSubtitle4Int = reader.readLong(offsets[144]);
+  object.textSubtitle5Int = reader.readLong(offsets[145]);
+  object.textSubtitle6Int = reader.readLong(offsets[146]);
+  object.textWhiteInt = reader.readLong(offsets[147]);
+  object.themeId = reader.readString(offsets[148]);
+  object.tokenSummaryBGInt = reader.readLong(offsets[149]);
+  object.tokenSummaryButtonBGInt = reader.readLong(offsets[150]);
+  object.tokenSummaryIconInt = reader.readLong(offsets[151]);
+  object.tokenSummaryTextPrimaryInt = reader.readLong(offsets[152]);
+  object.tokenSummaryTextSecondaryInt = reader.readLong(offsets[153]);
+  object.topNavIconGreenInt = reader.readLong(offsets[154]);
+  object.topNavIconPrimaryInt = reader.readLong(offsets[155]);
+  object.topNavIconRedInt = reader.readLong(offsets[156]);
+  object.topNavIconYellowInt = reader.readLong(offsets[157]);
+  object.version = reader.readLongOrNull(offsets[158]);
+  object.warningBackgroundInt = reader.readLong(offsets[159]);
+  object.warningForegroundInt = reader.readLong(offsets[160]);
   return object;
 }
 
@@ -1240,13 +1279,16 @@ P _stackThemeDeserializeProp<P>(
       return (reader.readLong(offset)) as P;
     case 6:
       return (reader.readObjectOrNull<ThemeAssets>(
-            offset,
-            ThemeAssetsSchema.deserialize,
-            allOffsets,
-          ) ??
-          ThemeAssets()) as P;
+        offset,
+        ThemeAssetsSchema.deserialize,
+        allOffsets,
+      )) as P;
     case 7:
-      return (reader.readLong(offset)) as P;
+      return (reader.readObjectOrNull<ThemeAssetsV2>(
+        offset,
+        ThemeAssetsV2Schema.deserialize,
+        allOffsets,
+      )) as P;
     case 8:
       return (reader.readLong(offset)) as P;
     case 9:
@@ -1262,9 +1304,9 @@ P _stackThemeDeserializeProp<P>(
     case 14:
       return (reader.readLong(offset)) as P;
     case 15:
-      return (reader.readString(offset)) as P;
-    case 16:
       return (reader.readLong(offset)) as P;
+    case 16:
+      return (reader.readString(offset)) as P;
     case 17:
       return (reader.readLong(offset)) as P;
     case 18:
@@ -1308,9 +1350,9 @@ P _stackThemeDeserializeProp<P>(
     case 37:
       return (reader.readLong(offset)) as P;
     case 38:
-      return (reader.readString(offset)) as P;
-    case 39:
       return (reader.readLong(offset)) as P;
+    case 39:
+      return (reader.readString(offset)) as P;
     case 40:
       return (reader.readLong(offset)) as P;
     case 41:
@@ -1328,13 +1370,13 @@ P _stackThemeDeserializeProp<P>(
     case 47:
       return (reader.readLong(offset)) as P;
     case 48:
-      return (reader.readStringOrNull(offset)) as P;
-    case 49:
       return (reader.readLong(offset)) as P;
-    case 50:
+    case 49:
       return (reader.readStringOrNull(offset)) as P;
-    case 51:
+    case 50:
       return (reader.readLong(offset)) as P;
+    case 51:
+      return (reader.readStringOrNull(offset)) as P;
     case 52:
       return (reader.readLong(offset)) as P;
     case 53:
@@ -1346,9 +1388,9 @@ P _stackThemeDeserializeProp<P>(
     case 56:
       return (reader.readLong(offset)) as P;
     case 57:
-      return (reader.readString(offset)) as P;
-    case 58:
       return (reader.readLong(offset)) as P;
+    case 58:
+      return (reader.readString(offset)) as P;
     case 59:
       return (reader.readLong(offset)) as P;
     case 60:
@@ -1424,9 +1466,9 @@ P _stackThemeDeserializeProp<P>(
     case 95:
       return (reader.readLong(offset)) as P;
     case 96:
-      return (reader.readString(offset)) as P;
-    case 97:
       return (reader.readLong(offset)) as P;
+    case 97:
+      return (reader.readString(offset)) as P;
     case 98:
       return (reader.readLong(offset)) as P;
     case 99:
@@ -1526,9 +1568,9 @@ P _stackThemeDeserializeProp<P>(
     case 146:
       return (reader.readLong(offset)) as P;
     case 147:
-      return (reader.readString(offset)) as P;
-    case 148:
       return (reader.readLong(offset)) as P;
+    case 148:
+      return (reader.readString(offset)) as P;
     case 149:
       return (reader.readLong(offset)) as P;
     case 150:
@@ -1548,6 +1590,10 @@ P _stackThemeDeserializeProp<P>(
     case 157:
       return (reader.readLong(offset)) as P;
     case 158:
+      return (reader.readLongOrNull(offset)) as P;
+    case 159:
+      return (reader.readLong(offset)) as P;
+    case 160:
       return (reader.readLong(offset)) as P;
     default:
       throw IsarError('Unknown property with id $propertyId');
@@ -2081,6 +2127,40 @@ extension StackThemeQueryFilter
     });
   }
 
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> assetsV1IsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'assets',
+      ));
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition>
+      assetsV1IsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'assets',
+      ));
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> assetsV2IsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'assetsV2',
+      ));
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition>
+      assetsV2IsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'assetsV2',
+      ));
+    });
+  }
+
   QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition>
       backgroundAppBarIntEqualTo(int value) {
     return QueryBuilder.apply(this, (query) {
@@ -11120,6 +11200,77 @@ extension StackThemeQueryFilter
     });
   }
 
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> versionIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'version',
+      ));
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition>
+      versionIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'version',
+      ));
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> versionEqualTo(
+      int? value) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'version',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition>
+      versionGreaterThan(
+    int? value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'version',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> versionLessThan(
+    int? value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'version',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> versionBetween(
+    int? lower,
+    int? upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'version',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+
   QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition>
       warningBackgroundIntEqualTo(int value) {
     return QueryBuilder.apply(this, (query) {
@@ -11235,12 +11386,19 @@ extension StackThemeQueryFilter
 
 extension StackThemeQueryObject
     on QueryBuilder<StackTheme, StackTheme, QFilterCondition> {
-  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> assets(
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> assetsV1(
       FilterQuery<ThemeAssets> q) {
     return QueryBuilder.apply(this, (query) {
       return query.object(q, r'assets');
     });
   }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> assetsV2(
+      FilterQuery<ThemeAssetsV2> q) {
+    return QueryBuilder.apply(this, (query) {
+      return query.object(q, r'assetsV2');
+    });
+  }
 }
 
 extension StackThemeQueryLinks
@@ -13378,6 +13536,18 @@ extension StackThemeQuerySortBy
     });
   }
 
+  QueryBuilder<StackTheme, StackTheme, QAfterSortBy> sortByVersion() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'version', Sort.asc);
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterSortBy> sortByVersionDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'version', Sort.desc);
+    });
+  }
+
   QueryBuilder<StackTheme, StackTheme, QAfterSortBy>
       sortByWarningBackgroundInt() {
     return QueryBuilder.apply(this, (query) {
@@ -15551,6 +15721,18 @@ extension StackThemeQuerySortThenBy
     });
   }
 
+  QueryBuilder<StackTheme, StackTheme, QAfterSortBy> thenByVersion() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'version', Sort.asc);
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterSortBy> thenByVersionDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'version', Sort.desc);
+    });
+  }
+
   QueryBuilder<StackTheme, StackTheme, QAfterSortBy>
       thenByWarningBackgroundInt() {
     return QueryBuilder.apply(this, (query) {
@@ -16649,6 +16831,12 @@ extension StackThemeQueryWhereDistinct
     });
   }
 
+  QueryBuilder<StackTheme, StackTheme, QDistinct> distinctByVersion() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addDistinctBy(r'version');
+    });
+  }
+
   QueryBuilder<StackTheme, StackTheme, QDistinct>
       distinctByWarningBackgroundInt() {
     return QueryBuilder.apply(this, (query) {
@@ -16711,12 +16899,19 @@ extension StackThemeQueryProperty
     });
   }
 
-  QueryBuilder<StackTheme, ThemeAssets, QQueryOperations> assetsProperty() {
+  QueryBuilder<StackTheme, ThemeAssets?, QQueryOperations> assetsV1Property() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'assets');
     });
   }
 
+  QueryBuilder<StackTheme, ThemeAssetsV2?, QQueryOperations>
+      assetsV2Property() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'assetsV2');
+    });
+  }
+
   QueryBuilder<StackTheme, int, QQueryOperations>
       backgroundAppBarIntProperty() {
     return QueryBuilder.apply(this, (query) {
@@ -17728,6 +17923,12 @@ extension StackThemeQueryProperty
     });
   }
 
+  QueryBuilder<StackTheme, int?, QQueryOperations> versionProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'version');
+    });
+  }
+
   QueryBuilder<StackTheme, int, QQueryOperations>
       warningBackgroundIntProperty() {
     return QueryBuilder.apply(this, (query) {
@@ -22545,60 +22746,3639 @@ extension ThemeAssetsQueryFilter
       namecoinImageContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'namecoinImage',
+        property: r'namecoinImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'namecoinImage',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'namecoinImage',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'namecoinImage',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'namecoinImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'namecoinImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'namecoinImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'namecoinImageSecondary',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'namecoinImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'namecoinImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryContains(String value,
+          {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'namecoinImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryMatches(String pattern,
+          {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'namecoinImageSecondary',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'namecoinImageSecondary',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      namecoinImageSecondaryIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'namecoinImageSecondary',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'particl',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'particl',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'particl',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'particl',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'particl',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'particl',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlContains(
+      String value,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'particl',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'particl',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'particl',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'particl',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'particlImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'particlImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'particlImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'particlImage',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'particlImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'particlImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'particlImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'particlImage',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'particlImage',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'particlImage',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'particlImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'particlImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'particlImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'particlImageSecondary',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'particlImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'particlImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'particlImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryMatches(String pattern,
+          {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'particlImageSecondary',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'particlImageSecondary',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      particlImageSecondaryIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'particlImageSecondary',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'personaEasy',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'personaEasy',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'personaEasy',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaEasyIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'personaEasy',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'personaIncognito',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'personaIncognito',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'personaIncognito',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      personaIncognitoIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'personaIncognito',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'receive',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveContains(
+      String value,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'receive',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receive',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'receive',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'receiveCancelled',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'receiveCancelled',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receiveCancelled',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receiveCancelledIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'receiveCancelled',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'receivePending',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'receivePending',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receivePending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      receivePendingIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'receivePending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'send',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendContains(
+      String value,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'send',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'send',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'send',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'sendCancelled',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'sendCancelled',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'sendCancelled',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendCancelledIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'sendCancelled',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'sendPending',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'sendPending',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'sendPending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      sendPendingIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'sendPending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'stack',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackContains(
+      String value,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'stack',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'stack',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'stack',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'stackIcon',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'stackIcon',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'stackIcon',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      stackIconIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'stackIcon',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'themePreview',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'themePreview',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'themePreview',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themePreviewIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'themePreview',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'themeSelector',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'themeSelector',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'themeSelector',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      themeSelectorIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'themeSelector',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'txExchange',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'txExchange',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchange',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'txExchange',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'txExchangeFailed',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'txExchangeFailed',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchangeFailed',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangeFailedIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'txExchangeFailed',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'txExchangePending',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'txExchangePending',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchangePending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      txExchangePendingIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'txExchangePending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'wownero',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'wownero',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'wownero',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'wownero',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'wownero',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'wownero',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroContains(
+      String value,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'wownero',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'wownero',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'wownero',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'wownero',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'wowneroImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'wowneroImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'wowneroImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'wowneroImage',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'wowneroImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'wowneroImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'wowneroImage',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'wowneroImage',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'wowneroImage',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'wowneroImage',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'wowneroImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'wowneroImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'wowneroImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'wowneroImageSecondary',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'wowneroImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'wowneroImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'wowneroImageSecondary',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryMatches(String pattern,
+          {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'wowneroImageSecondary',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'wowneroImageSecondary',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
+      wowneroImageSecondaryIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'wowneroImageSecondary',
+        value: '',
+      ));
+    });
+  }
+}
+
+extension ThemeAssetsQueryObject
+    on QueryBuilder<ThemeAssets, ThemeAssets, QFilterCondition> {}
+
+// coverage:ignore-file
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+
+const ThemeAssetsV2Schema = Schema(
+  name: r'ThemeAssetsV2',
+  id: -373522695224267013,
+  properties: {
+    r'background': PropertySchema(
+      id: 0,
+      name: r'background',
+      type: IsarType.string,
+    ),
+    r'bellNew': PropertySchema(
+      id: 1,
+      name: r'bellNew',
+      type: IsarType.string,
+    ),
+    r'buy': PropertySchema(
+      id: 2,
+      name: r'buy',
+      type: IsarType.string,
+    ),
+    r'coinIconsString': PropertySchema(
+      id: 3,
+      name: r'coinIconsString',
+      type: IsarType.string,
+    ),
+    r'coinImagesString': PropertySchema(
+      id: 4,
+      name: r'coinImagesString',
+      type: IsarType.string,
+    ),
+    r'coinPlaceholder': PropertySchema(
+      id: 5,
+      name: r'coinPlaceholder',
+      type: IsarType.string,
+    ),
+    r'coinSecondaryImagesString': PropertySchema(
+      id: 6,
+      name: r'coinSecondaryImagesString',
+      type: IsarType.string,
+    ),
+    r'exchange': PropertySchema(
+      id: 7,
+      name: r'exchange',
+      type: IsarType.string,
+    ),
+    r'loadingGif': PropertySchema(
+      id: 8,
+      name: r'loadingGif',
+      type: IsarType.string,
+    ),
+    r'personaEasy': PropertySchema(
+      id: 9,
+      name: r'personaEasy',
+      type: IsarType.string,
+    ),
+    r'personaIncognito': PropertySchema(
+      id: 10,
+      name: r'personaIncognito',
+      type: IsarType.string,
+    ),
+    r'receive': PropertySchema(
+      id: 11,
+      name: r'receive',
+      type: IsarType.string,
+    ),
+    r'receiveCancelled': PropertySchema(
+      id: 12,
+      name: r'receiveCancelled',
+      type: IsarType.string,
+    ),
+    r'receivePending': PropertySchema(
+      id: 13,
+      name: r'receivePending',
+      type: IsarType.string,
+    ),
+    r'send': PropertySchema(
+      id: 14,
+      name: r'send',
+      type: IsarType.string,
+    ),
+    r'sendCancelled': PropertySchema(
+      id: 15,
+      name: r'sendCancelled',
+      type: IsarType.string,
+    ),
+    r'sendPending': PropertySchema(
+      id: 16,
+      name: r'sendPending',
+      type: IsarType.string,
+    ),
+    r'stack': PropertySchema(
+      id: 17,
+      name: r'stack',
+      type: IsarType.string,
+    ),
+    r'stackIcon': PropertySchema(
+      id: 18,
+      name: r'stackIcon',
+      type: IsarType.string,
+    ),
+    r'themePreview': PropertySchema(
+      id: 19,
+      name: r'themePreview',
+      type: IsarType.string,
+    ),
+    r'themeSelector': PropertySchema(
+      id: 20,
+      name: r'themeSelector',
+      type: IsarType.string,
+    ),
+    r'txExchange': PropertySchema(
+      id: 21,
+      name: r'txExchange',
+      type: IsarType.string,
+    ),
+    r'txExchangeFailed': PropertySchema(
+      id: 22,
+      name: r'txExchangeFailed',
+      type: IsarType.string,
+    ),
+    r'txExchangePending': PropertySchema(
+      id: 23,
+      name: r'txExchangePending',
+      type: IsarType.string,
+    )
+  },
+  estimateSize: _themeAssetsV2EstimateSize,
+  serialize: _themeAssetsV2Serialize,
+  deserialize: _themeAssetsV2Deserialize,
+  deserializeProp: _themeAssetsV2DeserializeProp,
+);
+
+int _themeAssetsV2EstimateSize(
+  ThemeAssetsV2 object,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  var bytesCount = offsets.last;
+  {
+    final value = object.background;
+    if (value != null) {
+      bytesCount += 3 + value.length * 3;
+    }
+  }
+  bytesCount += 3 + object.bellNew.length * 3;
+  bytesCount += 3 + object.buy.length * 3;
+  bytesCount += 3 + object.coinIconsString.length * 3;
+  bytesCount += 3 + object.coinImagesString.length * 3;
+  bytesCount += 3 + object.coinPlaceholder.length * 3;
+  bytesCount += 3 + object.coinSecondaryImagesString.length * 3;
+  bytesCount += 3 + object.exchange.length * 3;
+  {
+    final value = object.loadingGif;
+    if (value != null) {
+      bytesCount += 3 + value.length * 3;
+    }
+  }
+  bytesCount += 3 + object.personaEasy.length * 3;
+  bytesCount += 3 + object.personaIncognito.length * 3;
+  bytesCount += 3 + object.receive.length * 3;
+  bytesCount += 3 + object.receiveCancelled.length * 3;
+  bytesCount += 3 + object.receivePending.length * 3;
+  bytesCount += 3 + object.send.length * 3;
+  bytesCount += 3 + object.sendCancelled.length * 3;
+  bytesCount += 3 + object.sendPending.length * 3;
+  bytesCount += 3 + object.stack.length * 3;
+  bytesCount += 3 + object.stackIcon.length * 3;
+  bytesCount += 3 + object.themePreview.length * 3;
+  bytesCount += 3 + object.themeSelector.length * 3;
+  bytesCount += 3 + object.txExchange.length * 3;
+  bytesCount += 3 + object.txExchangeFailed.length * 3;
+  bytesCount += 3 + object.txExchangePending.length * 3;
+  return bytesCount;
+}
+
+void _themeAssetsV2Serialize(
+  ThemeAssetsV2 object,
+  IsarWriter writer,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  writer.writeString(offsets[0], object.background);
+  writer.writeString(offsets[1], object.bellNew);
+  writer.writeString(offsets[2], object.buy);
+  writer.writeString(offsets[3], object.coinIconsString);
+  writer.writeString(offsets[4], object.coinImagesString);
+  writer.writeString(offsets[5], object.coinPlaceholder);
+  writer.writeString(offsets[6], object.coinSecondaryImagesString);
+  writer.writeString(offsets[7], object.exchange);
+  writer.writeString(offsets[8], object.loadingGif);
+  writer.writeString(offsets[9], object.personaEasy);
+  writer.writeString(offsets[10], object.personaIncognito);
+  writer.writeString(offsets[11], object.receive);
+  writer.writeString(offsets[12], object.receiveCancelled);
+  writer.writeString(offsets[13], object.receivePending);
+  writer.writeString(offsets[14], object.send);
+  writer.writeString(offsets[15], object.sendCancelled);
+  writer.writeString(offsets[16], object.sendPending);
+  writer.writeString(offsets[17], object.stack);
+  writer.writeString(offsets[18], object.stackIcon);
+  writer.writeString(offsets[19], object.themePreview);
+  writer.writeString(offsets[20], object.themeSelector);
+  writer.writeString(offsets[21], object.txExchange);
+  writer.writeString(offsets[22], object.txExchangeFailed);
+  writer.writeString(offsets[23], object.txExchangePending);
+}
+
+ThemeAssetsV2 _themeAssetsV2Deserialize(
+  Id id,
+  IsarReader reader,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  final object = ThemeAssetsV2();
+  object.background = reader.readStringOrNull(offsets[0]);
+  object.bellNew = reader.readString(offsets[1]);
+  object.buy = reader.readString(offsets[2]);
+  object.coinIconsString = reader.readString(offsets[3]);
+  object.coinImagesString = reader.readString(offsets[4]);
+  object.coinPlaceholder = reader.readString(offsets[5]);
+  object.coinSecondaryImagesString = reader.readString(offsets[6]);
+  object.exchange = reader.readString(offsets[7]);
+  object.loadingGif = reader.readStringOrNull(offsets[8]);
+  object.personaEasy = reader.readString(offsets[9]);
+  object.personaIncognito = reader.readString(offsets[10]);
+  object.receive = reader.readString(offsets[11]);
+  object.receiveCancelled = reader.readString(offsets[12]);
+  object.receivePending = reader.readString(offsets[13]);
+  object.send = reader.readString(offsets[14]);
+  object.sendCancelled = reader.readString(offsets[15]);
+  object.sendPending = reader.readString(offsets[16]);
+  object.stack = reader.readString(offsets[17]);
+  object.stackIcon = reader.readString(offsets[18]);
+  object.themePreview = reader.readString(offsets[19]);
+  object.themeSelector = reader.readString(offsets[20]);
+  object.txExchange = reader.readString(offsets[21]);
+  object.txExchangeFailed = reader.readString(offsets[22]);
+  object.txExchangePending = reader.readString(offsets[23]);
+  return object;
+}
+
+P _themeAssetsV2DeserializeProp<P>(
+  IsarReader reader,
+  int propertyId,
+  int offset,
+  Map<Type, List<int>> allOffsets,
+) {
+  switch (propertyId) {
+    case 0:
+      return (reader.readStringOrNull(offset)) as P;
+    case 1:
+      return (reader.readString(offset)) as P;
+    case 2:
+      return (reader.readString(offset)) as P;
+    case 3:
+      return (reader.readString(offset)) as P;
+    case 4:
+      return (reader.readString(offset)) as P;
+    case 5:
+      return (reader.readString(offset)) as P;
+    case 6:
+      return (reader.readString(offset)) as P;
+    case 7:
+      return (reader.readString(offset)) as P;
+    case 8:
+      return (reader.readStringOrNull(offset)) as P;
+    case 9:
+      return (reader.readString(offset)) as P;
+    case 10:
+      return (reader.readString(offset)) as P;
+    case 11:
+      return (reader.readString(offset)) as P;
+    case 12:
+      return (reader.readString(offset)) as P;
+    case 13:
+      return (reader.readString(offset)) as P;
+    case 14:
+      return (reader.readString(offset)) as P;
+    case 15:
+      return (reader.readString(offset)) as P;
+    case 16:
+      return (reader.readString(offset)) as P;
+    case 17:
+      return (reader.readString(offset)) as P;
+    case 18:
+      return (reader.readString(offset)) as P;
+    case 19:
+      return (reader.readString(offset)) as P;
+    case 20:
+      return (reader.readString(offset)) as P;
+    case 21:
+      return (reader.readString(offset)) as P;
+    case 22:
+      return (reader.readString(offset)) as P;
+    case 23:
+      return (reader.readString(offset)) as P;
+    default:
+      throw IsarError('Unknown property with id $propertyId');
+  }
+}
+
+extension ThemeAssetsV2QueryFilter
+    on QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QFilterCondition> {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'background',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'background',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundEqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundGreaterThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundLessThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundBetween(
+    String? lower,
+    String? upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'background',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'background',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'background',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      backgroundIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'background',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'bellNew',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'bellNew',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'namecoinImage',
+        property: r'bellNew',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'namecoinImage',
+        property: r'bellNew',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      bellNewIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'namecoinImage',
+        property: r'bellNew',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition> buyEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      buyGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -22606,15 +26386,14 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition> buyLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -22622,15 +26401,14 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition> buyBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -22639,7 +26417,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -22649,93 +26427,93 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      buyStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition> buyEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryContains(String value,
-          {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition> buyContains(
+      String value,
+      {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryMatches(String pattern,
-          {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition> buyMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      buyIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      namecoinImageSecondaryIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      buyIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'namecoinImageSecondary',
+        property: r'buy',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'particl',
+        property: r'coinIconsString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -22743,14 +26521,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'particl',
+        property: r'coinIconsString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -22758,14 +26537,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'particl',
+        property: r'coinIconsString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -22774,7 +26554,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'particl',
+        property: r'coinIconsString',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -22784,93 +26564,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'particl',
+        property: r'coinIconsString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'particl',
+        property: r'coinIconsString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlContains(
-      String value,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'particl',
+        property: r'coinIconsString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> particlMatches(
-      String pattern,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'particl',
+        property: r'coinIconsString',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'particl',
+        property: r'coinIconsString',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinIconsStringIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'particl',
+        property: r'coinIconsString',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'particlImage',
+        property: r'coinImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -22878,15 +26657,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'particlImage',
+        property: r'coinImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -22894,15 +26673,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'particlImage',
+        property: r'coinImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -22911,7 +26690,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'particlImage',
+        property: r'coinImagesString',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -22921,92 +26700,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'particlImage',
+        property: r'coinImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'particlImage',
+        property: r'coinImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'particlImage',
+        property: r'coinImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'particlImage',
+        property: r'coinImagesString',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'particlImage',
+        property: r'coinImagesString',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinImagesStringIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'particlImage',
+        property: r'coinImagesString',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23014,15 +26793,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23030,15 +26809,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -23047,7 +26826,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -23057,93 +26836,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryMatches(String pattern,
-          {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      particlImageSecondaryIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinPlaceholderIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'particlImageSecondary',
+        property: r'coinPlaceholder',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23151,15 +26929,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23167,15 +26945,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -23184,7 +26962,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -23194,92 +26972,94 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringContains(String value,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringMatches(String pattern,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaEasyIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      coinSecondaryImagesStringIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'personaEasy',
+        property: r'coinSecondaryImagesString',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'personaIncognito',
+        property: r'exchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23287,15 +27067,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'personaIncognito',
+        property: r'exchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23303,15 +27083,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'personaIncognito',
+        property: r'exchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -23320,7 +27100,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'personaIncognito',
+        property: r'exchange',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -23330,130 +27110,151 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'personaIncognito',
+        property: r'exchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'personaIncognito',
+        property: r'exchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'personaIncognito',
+        property: r'exchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'personaIncognito',
+        property: r'exchange',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'personaIncognito',
+        property: r'exchange',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      personaIncognitoIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      exchangeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'personaIncognito',
+        property: r'exchange',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveEqualTo(
-    String value, {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'loadingGif',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'loadingGif',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifEqualTo(
+    String? value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'receive',
+        property: r'loadingGif',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveGreaterThan(
-    String value, {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifGreaterThan(
+    String? value, {
     bool include = false,
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'receive',
+        property: r'loadingGif',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveLessThan(
-    String value, {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifLessThan(
+    String? value, {
     bool include = false,
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'receive',
+        property: r'loadingGif',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveBetween(
-    String lower,
-    String upper, {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifBetween(
+    String? lower,
+    String? upper, {
     bool includeLower = true,
     bool includeUpper = true,
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'receive',
+        property: r'loadingGif',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -23463,93 +27264,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'receive',
+        property: r'loadingGif',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'receive',
+        property: r'loadingGif',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveContains(
-      String value,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'receive',
+        property: r'loadingGif',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> receiveMatches(
-      String pattern,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'receive',
+        property: r'loadingGif',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'receive',
+        property: r'loadingGif',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      loadingGifIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'receive',
+        property: r'loadingGif',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23557,15 +27357,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23573,15 +27373,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -23590,7 +27390,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -23600,92 +27400,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receiveCancelledIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaEasyIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'receiveCancelled',
+        property: r'personaEasy',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'receivePending',
+        property: r'personaIncognito',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23693,15 +27493,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'receivePending',
+        property: r'personaIncognito',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23709,15 +27509,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'receivePending',
+        property: r'personaIncognito',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -23726,7 +27526,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'receivePending',
+        property: r'personaIncognito',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -23736,90 +27536,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'receivePending',
+        property: r'personaIncognito',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'receivePending',
+        property: r'personaIncognito',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'receivePending',
+        property: r'personaIncognito',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'receivePending',
+        property: r'personaIncognito',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'receivePending',
+        property: r'personaIncognito',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      receivePendingIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      personaIncognitoIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'receivePending',
+        property: r'personaIncognito',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'send',
+        property: r'receive',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23827,14 +27629,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'send',
+        property: r'receive',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23842,14 +27645,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'send',
+        property: r'receive',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -23858,7 +27662,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'send',
+        property: r'receive',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -23868,91 +27672,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'send',
+        property: r'receive',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'send',
+        property: r'receive',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendContains(
-      String value,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'send',
+        property: r'receive',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendMatches(
-      String pattern,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'send',
+        property: r'receive',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> sendIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'send',
+        property: r'receive',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'send',
+        property: r'receive',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23960,15 +27765,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -23976,15 +27781,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -23993,7 +27798,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -24003,92 +27808,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendCancelledIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receiveCancelledIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'sendCancelled',
+        property: r'receiveCancelled',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'sendPending',
+        property: r'receivePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24096,15 +27901,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'sendPending',
+        property: r'receivePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24112,15 +27917,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'sendPending',
+        property: r'receivePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
-
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingBetween(
+
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -24129,7 +27934,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'sendPending',
+        property: r'receivePending',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -24139,91 +27944,91 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'sendPending',
+        property: r'receivePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'sendPending',
+        property: r'receivePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'sendPending',
+        property: r'receivePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'sendPending',
+        property: r'receivePending',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'sendPending',
+        property: r'receivePending',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      sendPendingIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      receivePendingIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'sendPending',
+        property: r'receivePending',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition> sendEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'stack',
+        property: r'send',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24231,14 +28036,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'stack',
+        property: r'send',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24246,14 +28052,14 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'stack',
+        property: r'send',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition> sendBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -24262,7 +28068,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'stack',
+        property: r'send',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -24272,91 +28078,93 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'stack',
+        property: r'send',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'stack',
+        property: r'send',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackContains(
-      String value,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'stack',
+        property: r'send',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackMatches(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition> sendMatches(
       String pattern,
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'stack',
+        property: r'send',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> stackIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'stack',
+        property: r'send',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'stack',
+        property: r'send',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'stackIcon',
+        property: r'sendCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24364,15 +28172,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'stackIcon',
+        property: r'sendCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24380,15 +28188,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'stackIcon',
+        property: r'sendCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -24397,7 +28205,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'stackIcon',
+        property: r'sendCancelled',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -24407,92 +28215,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'stackIcon',
+        property: r'sendCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'stackIcon',
+        property: r'sendCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'stackIcon',
+        property: r'sendCancelled',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'stackIcon',
+        property: r'sendCancelled',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'stackIcon',
+        property: r'sendCancelled',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      stackIconIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendCancelledIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'stackIcon',
+        property: r'sendCancelled',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'themePreview',
+        property: r'sendPending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24500,15 +28308,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'themePreview',
+        property: r'sendPending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24516,15 +28324,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'themePreview',
+        property: r'sendPending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -24533,7 +28341,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'themePreview',
+        property: r'sendPending',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -24543,92 +28351,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'themePreview',
+        property: r'sendPending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'themePreview',
+        property: r'sendPending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'themePreview',
+        property: r'sendPending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'themePreview',
+        property: r'sendPending',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'themePreview',
+        property: r'sendPending',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themePreviewIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      sendPendingIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'themePreview',
+        property: r'sendPending',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'themeSelector',
+        property: r'stack',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24636,15 +28444,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'themeSelector',
+        property: r'stack',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24652,15 +28460,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'themeSelector',
+        property: r'stack',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -24669,7 +28477,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'themeSelector',
+        property: r'stack',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -24679,92 +28487,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'themeSelector',
+        property: r'stack',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'themeSelector',
+        property: r'stack',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'themeSelector',
+        property: r'stack',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'themeSelector',
+        property: r'stack',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'themeSelector',
+        property: r'stack',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      themeSelectorIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'themeSelector',
+        property: r'stack',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'txExchange',
+        property: r'stackIcon',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24772,15 +28580,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'txExchange',
+        property: r'stackIcon',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24788,15 +28596,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'txExchange',
+        property: r'stackIcon',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -24805,7 +28613,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'txExchange',
+        property: r'stackIcon',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -24815,92 +28623,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'txExchange',
+        property: r'stackIcon',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'txExchange',
+        property: r'stackIcon',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'txExchange',
+        property: r'stackIcon',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'txExchange',
+        property: r'stackIcon',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'txExchange',
+        property: r'stackIcon',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      stackIconIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'txExchange',
+        property: r'stackIcon',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24908,15 +28716,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -24924,15 +28732,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -24941,7 +28749,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -24951,92 +28759,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangeFailedIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themePreviewIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'txExchangeFailed',
+        property: r'themePreview',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'txExchangePending',
+        property: r'themeSelector',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -25044,15 +28852,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'txExchangePending',
+        property: r'themeSelector',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -25060,15 +28868,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'txExchangePending',
+        property: r'themeSelector',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -25077,7 +28885,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'txExchangePending',
+        property: r'themeSelector',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -25087,91 +28895,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'txExchangePending',
+        property: r'themeSelector',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'txExchangePending',
+        property: r'themeSelector',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'txExchangePending',
+        property: r'themeSelector',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'txExchangePending',
+        property: r'themeSelector',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'txExchangePending',
+        property: r'themeSelector',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      txExchangePendingIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      themeSelectorIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'txExchangePending',
+        property: r'themeSelector',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'wownero',
+        property: r'txExchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -25179,14 +28988,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'wownero',
+        property: r'txExchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -25194,14 +29004,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'wownero',
+        property: r'txExchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -25210,7 +29021,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'wownero',
+        property: r'txExchange',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -25220,93 +29031,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'wownero',
+        property: r'txExchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'wownero',
+        property: r'txExchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroContains(
-      String value,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'wownero',
+        property: r'txExchange',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition> wowneroMatches(
-      String pattern,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'wownero',
+        property: r'txExchange',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'wownero',
+        property: r'txExchange',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'wownero',
+        property: r'txExchange',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -25314,15 +29124,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -25330,15 +29140,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -25347,7 +29157,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -25357,92 +29167,92 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageMatches(String pattern, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangeFailedIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'wowneroImage',
+        property: r'txExchangeFailed',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryEqualTo(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryGreaterThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -25450,15 +29260,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         include: include,
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryLessThan(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -25466,15 +29276,15 @@ extension ThemeAssetsQueryFilter
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.lessThan(
         include: include,
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryBetween(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -25483,7 +29293,7 @@ extension ThemeAssetsQueryFilter
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.between(
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         lower: lower,
         includeLower: includeLower,
         upper: upper,
@@ -25493,77 +29303,76 @@ extension ThemeAssetsQueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryStartsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryEndsWith(
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryContains(String value, {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         value: value,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryMatches(String pattern,
-          {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         wildcard: pattern,
         caseSensitive: caseSensitive,
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryIsEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         value: '',
       ));
     });
   }
 
-  QueryBuilder<ThemeAssets, ThemeAssets, QAfterFilterCondition>
-      wowneroImageSecondaryIsNotEmpty() {
+  QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QAfterFilterCondition>
+      txExchangePendingIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'wowneroImageSecondary',
+        property: r'txExchangePending',
         value: '',
       ));
     });
   }
 }
 
-extension ThemeAssetsQueryObject
-    on QueryBuilder<ThemeAssets, ThemeAssets, QFilterCondition> {}
+extension ThemeAssetsV2QueryObject
+    on QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QFilterCondition> {}
diff --git a/lib/notifications/notification_card.dart b/lib/notifications/notification_card.dart
index 4f0ec4734..6ee2088aa 100644
--- a/lib/notifications/notification_card.dart
+++ b/lib/notifications/notification_card.dart
@@ -32,7 +32,7 @@ class NotificationCard extends ConsumerWidget {
   static const double mobileIconSize = 24;
   static const double desktopIconSize = 30;
 
-  String coinIconPath(ThemeAssets assets, WidgetRef ref) {
+  String coinIconPath(IThemeAssets assets, WidgetRef ref) {
     try {
       final coin = coinFromPrettyName(notification.coinName);
       return ref.read(coinIconProvider(coin));
@@ -61,7 +61,7 @@ class NotificationCard extends ConsumerWidget {
                       File(
                         coinIconPath(
                             ref.watch(
-                              themeProvider.select((value) => value.assets),
+                              themeAssetsProvider,
                             ),
                             ref),
                       ),
@@ -79,7 +79,7 @@ class NotificationCard extends ConsumerWidget {
                         File(
                           coinIconPath(
                               ref.watch(
-                                themeProvider.select((value) => value.assets),
+                                themeAssetsProvider,
                               ),
                               ref),
                         ),
diff --git a/lib/pages/exchange_view/trade_details_view.dart b/lib/pages/exchange_view/trade_details_view.dart
index 7470bc5b8..eb88ae543 100644
--- a/lib/pages/exchange_view/trade_details_view.dart
+++ b/lib/pages/exchange_view/trade_details_view.dart
@@ -113,7 +113,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
     super.initState();
   }
 
-  String _fetchIconAssetForStatus(String statusString, ThemeAssets assets) {
+  String _fetchIconAssetForStatus(String statusString, IThemeAssets assets) {
     ChangeNowTransactionStatus? status;
     try {
       if (statusString.toLowerCase().startsWith("waiting")) {
@@ -322,11 +322,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
                               File(
                                 _fetchIconAssetForStatus(
                                   trade.status,
-                                  ref.watch(
-                                    themeProvider.select(
-                                      (value) => value.assets,
-                                    ),
-                                  ),
+                                  ref.watch(themeAssetsProvider),
                                 ),
                               ),
                               width: 32,
@@ -393,11 +389,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
                               File(
                                 _fetchIconAssetForStatus(
                                   trade.status,
-                                  ref.watch(
-                                    themeProvider.select(
-                                      (value) => value.assets,
-                                    ),
-                                  ),
+                                  ref.watch(themeAssetsProvider),
                                 ),
                               ),
                               width: 32,
diff --git a/lib/pages/wallet_view/sub_widgets/tx_icon.dart b/lib/pages/wallet_view/sub_widgets/tx_icon.dart
index 0fc321d8a..2e6865c06 100644
--- a/lib/pages/wallet_view/sub_widgets/tx_icon.dart
+++ b/lib/pages/wallet_view/sub_widgets/tx_icon.dart
@@ -24,7 +24,7 @@ class TxIcon extends ConsumerWidget {
   static const Size size = Size(32, 32);
 
   String _getAssetName(
-      bool isCancelled, bool isReceived, bool isPending, ThemeAssets assets) {
+      bool isCancelled, bool isReceived, bool isPending, IThemeAssets assets) {
     if (!isReceived && transaction.subType == TransactionSubType.mint) {
       if (isCancelled) {
         return Assets.svg.anonymizeFailed;
@@ -65,7 +65,7 @@ class TxIcon extends ConsumerWidget {
         currentHeight,
         coin.requiredConfirmations,
       ),
-      ref.watch(themeProvider).assets,
+      ref.watch(themeAssetsProvider),
     );
 
     return SizedBox(
diff --git a/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart b/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart
index 75cc7710e..e4fc11709 100644
--- a/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart
+++ b/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/exchange/change_now/exchange_transaction_status.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
@@ -288,7 +288,7 @@ class DesktopTradeRowCard extends ConsumerStatefulWidget {
 class _DesktopTradeRowCardState extends ConsumerState<DesktopTradeRowCard> {
   late final String tradeId;
 
-  String _fetchIconAssetForStatus(String statusString, ThemeAssets assets) {
+  String _fetchIconAssetForStatus(String statusString, IThemeAssets assets) {
     ChangeNowTransactionStatus? status;
     try {
       if (statusString.toLowerCase().startsWith("waiting")) {
@@ -528,7 +528,8 @@ class _DesktopTradeRowCardState extends ConsumerState<DesktopTradeRowCard> {
                       _fetchIconAssetForStatus(
                         trade.status,
                         ref.watch(
-                            themeProvider.select((value) => value.assets)),
+                          themeAssetsProvider,
+                        ),
                       ),
                     ),
                     width: 32,
diff --git a/lib/themes/coin_icon_provider.dart b/lib/themes/coin_icon_provider.dart
index 116917c9c..98fc0060a 100644
--- a/lib/themes/coin_icon_provider.dart
+++ b/lib/themes/coin_icon_provider.dart
@@ -1,15 +1,20 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:stackduo/models/isar/stack_theme.dart';
 import 'package:stackduo/themes/theme_providers.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 
 final coinIconProvider = Provider.family<String, Coin>((ref, coin) {
-  final assets = ref.watch(themeProvider).assets;
-  switch (coin) {
-    case Coin.bitcoin:
-    case Coin.bitcoinTestNet:
-      return assets.bitcoin;
+  final assets = ref.watch(themeAssetsProvider);
 
-    case Coin.monero:
-      return assets.monero;
+  if (assets is ThemeAssets) {
+    switch (coin) {
+      case Coin.bitcoin:
+      case Coin.bitcoinTestNet:
+        return assets.bitcoin;
+      case Coin.monero:
+        return assets.monero;
+    }
+  } else {
+    return (assets as ThemeAssetsV2).coinIcons[coin]!;
   }
 });
diff --git a/lib/themes/coin_image_provider.dart b/lib/themes/coin_image_provider.dart
index cf01ecb62..036bacab1 100644
--- a/lib/themes/coin_image_provider.dart
+++ b/lib/themes/coin_image_provider.dart
@@ -1,27 +1,38 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:stackduo/models/isar/stack_theme.dart';
 import 'package:stackduo/themes/theme_providers.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 
 final coinImageProvider = Provider.family<String, Coin>((ref, coin) {
-  final assets = ref.watch(themeProvider).assets;
-  switch (coin) {
-    case Coin.bitcoin:
-    case Coin.bitcoinTestNet:
-      return assets.bitcoinImage;
+  final assets = ref.watch(themeAssetsProvider);
 
-    case Coin.monero:
-      return assets.moneroImage;
+  if (assets is ThemeAssets) {
+    switch (coin) {
+      case Coin.bitcoin:
+      case Coin.bitcoinTestNet:
+        return assets.bitcoinImage;
+
+      case Coin.monero:
+        return assets.moneroImage;
+    }
+  } else {
+    return (assets as ThemeAssetsV2).coinImages[coin]!;
   }
 });
 
 final coinImageSecondaryProvider = Provider.family<String, Coin>((ref, coin) {
-  final assets = ref.watch(themeProvider).assets;
-  switch (coin) {
-    case Coin.bitcoin:
-    case Coin.bitcoinTestNet:
-      return assets.bitcoinImageSecondary;
+  final assets = ref.watch(themeAssetsProvider);
+
+  if (assets is ThemeAssets) {
+    switch (coin) {
+      case Coin.bitcoin:
+      case Coin.bitcoinTestNet:
+        return assets.bitcoinImageSecondary;
 
-    case Coin.monero:
-      return assets.moneroImageSecondary;
+      case Coin.monero:
+        return assets.moneroImageSecondary;
+    }
+  } else {
+    return (assets as ThemeAssetsV2).coinSecondaryImages[coin]!;
   }
 });
diff --git a/lib/themes/theme_providers.dart b/lib/themes/theme_providers.dart
index 482d50768..9672018ac 100644
--- a/lib/themes/theme_providers.dart
+++ b/lib/themes/theme_providers.dart
@@ -20,3 +20,11 @@ final themeProvider = StateProvider<StackTheme>(
     ),
   ),
 );
+
+final themeAssetsProvider = StateProvider<IThemeAssets>(
+  (ref) => ref.watch(
+    themeProvider.select(
+      (value) => value.assets,
+    ),
+  ),
+);
diff --git a/lib/widgets/trade_card.dart b/lib/widgets/trade_card.dart
index 12b57d9b5..a4968995e 100644
--- a/lib/widgets/trade_card.dart
+++ b/lib/widgets/trade_card.dart
@@ -24,7 +24,7 @@ class TradeCard extends ConsumerWidget {
   final Trade trade;
   final VoidCallback onTap;
 
-  String _fetchIconAssetForStatus(String statusString, ThemeAssets assets) {
+  String _fetchIconAssetForStatus(String statusString, IThemeAssets assets) {
     ChangeNowTransactionStatus? status;
     try {
       if (statusString.toLowerCase().startsWith("waiting")) {
@@ -89,11 +89,7 @@ class TradeCard extends ConsumerWidget {
                     File(
                       _fetchIconAssetForStatus(
                         trade.status,
-                        ref.watch(
-                          themeProvider.select(
-                            (value) => value.assets,
-                          ),
-                        ),
+                        ref.watch(themeAssetsProvider),
                       ),
                     ),
                     width: 32,
diff --git a/test/sample_data/theme_json_v2.dart b/test/sample_data/theme_json_v2.dart
new file mode 100644
index 000000000..3f9fbfb7f
--- /dev/null
+++ b/test/sample_data/theme_json_v2.dart
@@ -0,0 +1,252 @@
+const Map<String, dynamic> lightThemeJsonMap = {
+  "name": "Light",
+  "version": 2,
+  "id": "light",
+  "brightness": "light",
+  "colors": {
+    // keys for coin colors must match the Coin enum name value exactly
+    "coin": {
+      "bitcoin": "0xFFFCC17B",
+      "litecoin": "0xFF7FA6E1",
+      "bitcoincash": "0xFF7BCFB8",
+      "firo": "0xFFFF897A",
+      "dogecoin": "0xFFFFE079",
+      "eCash": "0xFFC5C7CB",
+      "epicCash": "0xFFC5C7CB",
+      "ethereum": "0xFFA7ADE9",
+      "monero": "0xFFFF9E6B",
+      "namecoin": "0xFF91B1E1",
+      "wownero": "0xFFED80C1",
+      "particl": "0xFF8175BD"
+    },
+    "background": "0xFFF7F7F7",
+    "background_app_bar": "0xFFF7F7F7",
+    "overlay": "0xFF111215",
+    "accent_color_blue": "0xFF0052DF",
+    "accent_color_green": "0xFF4CC0A0",
+    "accent_color_yellow": "0xFFF7D65D",
+    "accent_color_red": "0xFFD34E50",
+    "accent_color_orange": "0xFFFEA68D",
+    "accent_color_dark": "0xFF232323",
+    "shadow": "0x0F2D3132",
+    "text_dark_one": "0xFF232323",
+    "text_dark_two": "0xFF414141",
+    "text_dark_three": "0xFF747778",
+    "text_white": "0xFFFFFFFF",
+    "text_favorite": "0xFF232323",
+    "text_error": "0xFF930006",
+    "text_restore": "0xFF111215",
+    "text_subtitle_one": "0xFF8E9192",
+    "text_subtitle_two": "0xFFA9ACAC",
+    "text_subtitle_three": "0xFFC4C7C7",
+    "text_subtitle_four": "0xFFE0E3E3",
+    "text_subtitle_five": "0xFFEEEFF1",
+    "text_subtitle_six": "0xFFF5F5F5",
+    "button_back_primary": "0xFF232323",
+    "button_back_secondary": "0xFFE0E3E3",
+    "button_back_primary_disabled": "0xFFD7D7D7",
+    "button_back_secondary_disabled": "0xFFF0F1F1",
+    "button_back_border": "0xFF232323",
+    "button_back_border_disabled": "0xFFB6B6B6",
+    "button_back_border_secondary": "0xFFE0E3E3",
+    "button_back_border_secondary_disabled": "0xFFF0F1F1",
+    "number_back_default": "0xFFFFFFFF",
+    "numpad_back_default": "0xFF232323",
+    "bottom_nav_back": "0xFFFFFFFF",
+    "button_text_primary": "0xFFFFFFFF",
+    "button_text_secondary": "0xFF232323",
+    "button_text_primary_disabled": "0xFFF8F8F8",
+    "button_text_secondary_disabled": "0xFFB7B7B7",
+    "button_text_border": "0xFF232323",
+    "button_text_disabled": "0xFFB6B6B6",
+    "button_text_borderless": "0xFF0052DF",
+    "button_text_borderless_disabled": "0xFFB6B6B6",
+    "number_text_default": "0xFF232323",
+    "numpad_text_default": "0xFFFFFFFF",
+    "bottom_nav_text": "0xFF232323",
+    "custom_text_button_enabled_text": "0xFF0052DF",
+    "custom_text_button_disabled_text": "0xFF8E9192",
+    "switch_bg_on": "0xFF0052DF",
+    "switch_bg_off": "0xFFD8E4FB",
+    "switch_bg_disabled": "0xFFC5C6C9",
+    "switch_circle_on": "0xFFDAE2FF",
+    "switch_circle_off": "0xFFFBFCFF",
+    "switch_circle_disabled": "0xFFFBFCFF",
+    "step_indicator_bg_check": "0xFFD9E2FF",
+    "step_indicator_bg_number": "0xFFD9E2FF",
+    "step_indicator_bg_inactive": "0xFFCDCDCD",
+    "step_indicator_bg_lines": "0xFF0056D2",
+    "step_indicator_bg_lines_inactive": "0xFFCDCDCD",
+    "step_indicator_icon_text": "0xFF0056D2",
+    "step_indicator_icon_number": "0xFF0056D2",
+    "step_indicator_icon_inactive": "0xFFF7F7F7",
+    "checkbox_bg_checked": "0xFF0056D2",
+    "checkbox_border_empty": "0xFF8E9192",
+    "checkbox_bg_disabled": "0xFFADC7EC",
+    "checkbox_icon_checked": "0xFFFFFFFF",
+    "checkbox_icon_disabled": "0xFFFFFFFF",
+    "checkbox_text_label": "0xFF232323",
+    "snack_bar_back_success": "0xFFB9E9D4",
+    "snack_bar_back_error": "0xFFFFDAD4",
+    "snack_bar_back_info": "0xFFDAE2FF",
+    "snack_bar_text_success": "0xFF006C4D",
+    "snack_bar_text_error": "0xFF930006",
+    "snack_bar_text_info": "0xFF002A78",
+    "bottom_nav_icon_back": "0xFFA2A2A2",
+    "bottom_nav_icon_icon": "0xFF232323",
+    "bottom_nav_icon_icon_highlighted": "0xFF232323",
+    "top_nav_icon_primary": "0xFF232323",
+    "top_nav_icon_green": "0xFF00A578",
+    "top_nav_icon_yellow": "0xFFF4C517",
+    "top_nav_icon_red": "0xFFC00205",
+    "settings_icon_back": "0xFFE0E3E3",
+    "settings_icon_icon": "0xFF232323",
+    "settings_icon_back_two": "0xFF94D6C4",
+    "settings_icon_element": "0xFF00A578",
+    "text_field_active_bg": "0xFFEEEFF1",
+    "text_field_default_bg": "0xFFEEEFF1",
+    "text_field_error_bg": "0xFFFFDAD4",
+    "text_field_success_bg": "0xFFB9E9D4",
+    "text_field_error_border": "0xFFFFDAD4",
+    "text_field_success_border": "0xFFB9E9D4",
+    "text_field_active_search_icon_left": "0xFFA9ACAC",
+    "text_field_default_search_icon_left": "0xFFA9ACAC",
+    "text_field_error_search_icon_left": "0xFF930006",
+    "text_field_success_search_icon_left": "0xFF006C4D",
+    "text_field_active_text": "0xFF232323",
+    "text_field_default_text": "0xFFA9ACAC",
+    "text_field_error_text": "0xFF000000",
+    "text_field_success_text": "0xFF000000",
+    "text_field_active_label": "0xFFA9ACAC",
+    "text_field_error_label": "0xFF930006",
+    "text_field_success_label": "0xFF006C4D",
+    "text_field_active_search_icon_right": "0xFF747778",
+    "text_field_default_search_icon_right": "0xFF747778",
+    "text_field_error_search_icon_right": "0xFF930006",
+    "text_field_success_search_icon_right": "0xFF006C4D",
+    "settings_item_level_two_active_bg": "0xFFFFFFFF",
+    "settings_item_level_two_active_text": "0xFF232323",
+    "settings_item_level_two_active_sub": "0xFF8E9192",
+    "radio_button_icon_border": "0xFF0056D2",
+    "radio_button_icon_border_disabled": "0xFF8F909A",
+    "radio_button_border_enabled": "0xFF0056D2",
+    "radio_button_border_disabled": "0xFF8F909A",
+    "radio_button_icon_circle": "0xFF0056D2",
+    "radio_button_icon_enabled": "0xFF0056D2",
+    "radio_button_text_enabled": "0xFF44464E",
+    "radio_button_text_disabled": "0xFF44464E",
+    "radio_button_label_enabled": "0xFF8E9192",
+    "radio_button_label_disabled": "0xFF8E9192",
+    "info_item_bg": "0xFFFFFFFF",
+    "info_item_label": "0xFF8E9192",
+    "info_item_text": "0xFF232323",
+    "info_item_icons": "0xFF0056D2",
+    "popup_bg": "0xFFFFFFFF",
+    "currency_list_item_bg": "0xFFF9F9FC",
+    "sw_bg": "0xFFFFFFFF",
+    "sw_mid": "0xFFFFFFFF",
+    "sw_bottom": "0xFF232323",
+    "bottom_nav_shadow": "0xFF282E33",
+    "favorite_star_active": "0xFF0056D2",
+    "favorite_star_inactive": "0xFFC4C7C7",
+    "splash": "0x358E9192",
+    "highlight": "0x44A9ACAC",
+    "warning_foreground": "0xFF232323",
+    "warning_background": "0xFFFFDAD3",
+    "loading_overlay_text_color": "0xFFF7F7F7",
+    "my_stack_contact_icon_bg": "0xFFEEEFF1",
+    "text_confirm_total_amount": "0xFF232323",
+    "text_selected_word_table_iterm": "0xFF232323",
+    "rate_type_toggle_color_on": "0xFFEEEFF1",
+    "rate_type_toggle_color_off": "0xFFFFFFFF",
+    "rate_type_toggle_desktop_color_on": "0xFFEEEFF1",
+    "rate_type_toggle_desktop_color_off": "0xFFE0E3E3",
+    "eth_tag_text": "0xFFFFFFFF",
+    "eth_tag_bg": "0xFF4D5798",
+    "eth_wallet_tag_text": "0xFF4D5798",
+    "eth_wallet_tag_bg": "0xFFF0F3FD",
+    "token_summary_text_primary": "0xFF232323",
+    "token_summary_text_secondary": "0xFF8488AB",
+    "token_summary_bg": "0xFFE9EAFF",
+    "token_summary_button_bg": "0xFFFFFFFF",
+    "token_summary_icon": "0xFF424A97",
+    "box_shadows": {
+      "standard": {
+        "color": "0x0F2D3132",
+        "spread_radius": 3.0,
+        "blur_radius": 4.0
+      },
+      "home_view_button_bar": {
+        "color": "0x0F2D3132",
+        "spread_radius": 3.0,
+        "blur_radius": 4.0
+      }
+    }
+  },
+  "assets": {
+    "coin_placeholder": "dummy.svg",
+    // keys for coin assets must match the Coin enum name value exactly
+    "coins": {
+      "icons": {
+        "bitcoin": "dummy.svg",
+        "litecoin": "dummy.svg",
+        "bitcoincash": "dummy.svg",
+        "dogecoin": "dummy.svg",
+        "eCash": "dummy.svg",
+        "epicCash": "dummy.svg",
+        "ethereum": "dummy.svg",
+        "firo": "dummy.svg",
+        "monero": "dummy.svg",
+        "wownero": "dummy.svg",
+        "namecoin": "dummy.svg",
+        "particl": "dummy.svg"
+      },
+      "images": {
+        "bitcoin": "dummy.svg",
+        "litecoin": "dummy.svg",
+        "bitcoincash": "dummy.svg",
+        "dogecoin": "dummy.svg",
+        "eCash": "dummy.svg",
+        "epicCash": "dummy.svg",
+        "ethereum": "dummy.svg",
+        "firo": "dummy.svg",
+        "monero": "dummy.svg",
+        "wownero": "dummy.svg",
+        "namecoin": "dummy.svg",
+        "particl": "dummy.svg"
+      },
+      "secondaries": {
+        "bitcoin": "dummy.svg",
+        "litecoin": "dummy.svg",
+        "bitcoincash": "dummy.svg",
+        "dogecoin": "dummy.svg",
+        "eCash": "dummy.svg",
+        "epicCash": "dummy.svg",
+        "ethereum": "dummy.svg",
+        "firo": "dummy.svg",
+        "monero": "dummy.svg",
+        "wownero": "dummy.svg",
+        "namecoin": "dummy.svg",
+        "particl": "dummy.svg"
+      }
+    },
+    "bell_new": "dummy.svg",
+    "persona_incognito": "dummy.svg.svg",
+    "persona_easy": "dummy.svg",
+    "stack": "dummy.svg",
+    "stack_icon": "dummy.svg",
+    "receive": "dummy.svg",
+    "receive_pending": "dummy.svg",
+    "receive_cancelled": "dummy.svg",
+    "send": "dummy.svg",
+    "tx_exchange": "dummy.svg",
+    "tx_exchange_pending": "dummy.svg",
+    "tx_exchange_failed": "dummy.svg",
+    "buy": "dummy.svg",
+    "exchange": "dummy.svg",
+    "send_pending": "dummy.svg",
+    "send_cancelled": "dummy.svg",
+    "theme_selector": "dummy.svg",
+    "theme_preview": "dummy.png"
+  }
+};

From 6e498d6b022bc2a365668f90547ff407421f0a5a Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 18 May 2023 16:13:52 -0600
Subject: [PATCH 06/87] fix: coin icons for testnet wallets

---
 lib/themes/coin_icon_provider.dart  | 2 +-
 lib/themes/coin_image_provider.dart | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/themes/coin_icon_provider.dart b/lib/themes/coin_icon_provider.dart
index 98fc0060a..6af8cfc1e 100644
--- a/lib/themes/coin_icon_provider.dart
+++ b/lib/themes/coin_icon_provider.dart
@@ -15,6 +15,6 @@ final coinIconProvider = Provider.family<String, Coin>((ref, coin) {
         return assets.monero;
     }
   } else {
-    return (assets as ThemeAssetsV2).coinIcons[coin]!;
+    return (assets as ThemeAssetsV2).coinIcons[coin.mainNetVersion]!;
   }
 });
diff --git a/lib/themes/coin_image_provider.dart b/lib/themes/coin_image_provider.dart
index 036bacab1..ca4a19698 100644
--- a/lib/themes/coin_image_provider.dart
+++ b/lib/themes/coin_image_provider.dart
@@ -16,7 +16,7 @@ final coinImageProvider = Provider.family<String, Coin>((ref, coin) {
         return assets.moneroImage;
     }
   } else {
-    return (assets as ThemeAssetsV2).coinImages[coin]!;
+    return (assets as ThemeAssetsV2).coinImages[coin.mainNetVersion]!;
   }
 });
 
@@ -33,6 +33,6 @@ final coinImageSecondaryProvider = Provider.family<String, Coin>((ref, coin) {
         return assets.moneroImageSecondary;
     }
   } else {
-    return (assets as ThemeAssetsV2).coinSecondaryImages[coin]!;
+    return (assets as ThemeAssetsV2).coinSecondaryImages[coin.mainNetVersion]!;
   }
 });

From d542d175bb3838f038fd535e854ac44363a11962 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 18 May 2023 16:16:22 -0600
Subject: [PATCH 07/87] update bundled themes

---
 assets/default_themes/dark.zip  | Bin 528880 -> 567322 bytes
 assets/default_themes/light.zip | Bin 476773 -> 514498 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/default_themes/dark.zip b/assets/default_themes/dark.zip
index 1d8899567f3e324577a47085dafa6a1bececd095..e2291ba2b8ca8dfc1c3414a827c3607f46da25e1 100644
GIT binary patch
delta 42793
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

delta 4391
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

diff --git a/assets/default_themes/light.zip b/assets/default_themes/light.zip
index 093a1b2eb29221084379d8e74f19267f4d42faab..c9579152d8dbac814dc77e65efa1736918ef7adf 100644
GIT binary patch
delta 44074
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
Wk_6$RvH{otLD&EQUDy3}=Klae+M6W+

delta 6276
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


From ea983a36991f4232a15ad83e790cc8553e51afc5 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 18 May 2023 16:45:31 -0600
Subject: [PATCH 08/87] add version check for default installed themes and some
 clean up

---
 lib/main.dart                                 | 29 +-------
 .../appearance_settings/manage_themes.dart    |  5 +-
 .../appearance_settings.dart                  | 38 ----------
 lib/themes/theme_service.dart                 | 71 ++++++++++++++++++-
 4 files changed, 75 insertions(+), 68 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 635ddaaeb..d2ef627f8 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -186,33 +186,8 @@ void main() async {
   await MainDB.instance.initMainDB();
   ThemeService.instance.init(MainDB.instance);
 
-  // install default themes
-  if (!(await ThemeService.instance.verifyInstalled(themeId: "light"))) {
-    Logging.instance.log(
-      "Installing default light theme...",
-      level: LogLevel.Info,
-    );
-    final lightZip = await rootBundle.load("assets/default_themes/light.zip");
-    await ThemeService.instance
-        .install(themeArchiveData: lightZip.buffer.asUint8List());
-    Logging.instance.log(
-      "Installing default light theme... finished",
-      level: LogLevel.Info,
-    );
-  }
-  if (!(await ThemeService.instance.verifyInstalled(themeId: "dark"))) {
-    Logging.instance.log(
-      "Installing default dark theme... ",
-      level: LogLevel.Info,
-    );
-    final darkZip = await rootBundle.load("assets/default_themes/dark.zip");
-    await ThemeService.instance
-        .install(themeArchiveData: darkZip.buffer.asUint8List());
-    Logging.instance.log(
-      "Installing default dark theme... finished",
-      level: LogLevel.Info,
-    );
-  }
+  // check and update or install default themes
+  await ThemeService.instance.checkDefaultThemesOnStartup();
 
   runApp(const ProviderScope(child: MyApp()));
 }
diff --git a/lib/pages/settings_views/global_settings_view/appearance_settings/manage_themes.dart b/lib/pages/settings_views/global_settings_view/appearance_settings/manage_themes.dart
index de90bcd52..66a26e507 100644
--- a/lib/pages/settings_views/global_settings_view/appearance_settings/manage_themes.dart
+++ b/lib/pages/settings_views/global_settings_view/appearance_settings/manage_themes.dart
@@ -225,14 +225,14 @@ class _IncognitoInstalledThemesState
     extends ConsumerState<IncognitoInstalledThemes> {
   late final StreamSubscription<void> _subscription;
 
-  List<Tuple2<String, String>> installedThemeIdNames = [];
+  List<Tuple3<String, String, int?>> installedThemeIdNames = [];
 
   void _updateInstalledList() {
     installedThemeIdNames = ref
         .read(pThemeService)
         .installedThemes
         .where((e) => e.themeId != "light" && e.themeId != "dark")
-        .map((e) => Tuple2(e.themeId, e.name))
+        .map((e) => Tuple3(e.themeId, e.name, e.version))
         .toList();
   }
 
@@ -274,6 +274,7 @@ class _IncognitoInstalledThemesState
                 data: StackThemeMetaData(
                   name: e.item2,
                   id: e.item1,
+                  version: e.item3 ?? 1,
                   sha256: "",
                   size: "",
                   previewImageUrl: "",
diff --git a/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart
index 2c6ca33e9..fe9c38aac 100644
--- a/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart
@@ -118,44 +118,6 @@ class _AppearanceOptionSettings
                         ],
                       ),
                     ),
-                    // const Padding(
-                    //   padding: EdgeInsets.all(10.0),
-                    //   child: Divider(
-                    //     thickness: 0.5,
-                    //   ),
-                    // ),
-                    // Padding(
-                    //   padding: const EdgeInsets.all(10.0),
-                    //   child: Row(
-                    //     mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    //     children: [
-                    //       Text(
-                    //         "System brightness",
-                    //         style: STextStyles.desktopTextExtraSmall(context)
-                    //             .copyWith(
-                    //                 color: Theme.of(context)
-                    //                     .extension<StackColors>()!
-                    //                     .textDark),
-                    //         textAlign: TextAlign.left,
-                    //       ),
-                    //       SizedBox(
-                    //         height: 20,
-                    //         width: 40,
-                    //         child: DraggableSwitchButton(
-                    //           isOn: ref.watch(
-                    //             prefsChangeNotifierProvider.select(
-                    //                 (value) => value.enableSystemBrightness),
-                    //           ),
-                    //           onValueChanged: (newValue) {
-                    //             ref
-                    //                 .read(prefsChangeNotifierProvider)
-                    //                 .enableSystemBrightness = newValue;
-                    //           },
-                    //         ),
-                    //       )
-                    //     ],
-                    //   ),
-                    // ),
                     const Padding(
                       padding: EdgeInsets.all(10.0),
                       child: Divider(
diff --git a/lib/themes/theme_service.dart b/lib/themes/theme_service.dart
index ddb410535..ee831af83 100644
--- a/lib/themes/theme_service.dart
+++ b/lib/themes/theme_service.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:archive/archive_io.dart';
 import 'package:crypto/crypto.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:http/http.dart';
 import 'package:isar/isar.dart';
@@ -17,6 +17,7 @@ final pThemeService = Provider<ThemeService>((ref) {
 });
 
 class ThemeService {
+  static const _currentDefaultThemeVersion = 2;
   ThemeService._();
   static ThemeService? _instance;
   static ThemeService get instance => _instance ??= ThemeService._();
@@ -92,6 +93,70 @@ class ThemeService {
     }
   }
 
+  Future<void> checkDefaultThemesOnStartup() async {
+    // install default themes
+    if (!(await ThemeService.instance.verifyInstalled(themeId: "light"))) {
+      Logging.instance.log(
+        "Installing default light theme...",
+        level: LogLevel.Info,
+      );
+      final lightZip = await rootBundle.load("assets/default_themes/light.zip");
+      await ThemeService.instance
+          .install(themeArchiveData: lightZip.buffer.asUint8List());
+      Logging.instance.log(
+        "Installing default light theme... finished",
+        level: LogLevel.Info,
+      );
+    } else {
+      // check installed version
+      final theme = ThemeService.instance.getTheme(themeId: "light");
+      if ((theme?.version ?? 1) < _currentDefaultThemeVersion) {
+        Logging.instance.log(
+          "Updating default light theme...",
+          level: LogLevel.Info,
+        );
+        final lightZip =
+            await rootBundle.load("assets/default_themes/light.zip");
+        await ThemeService.instance
+            .install(themeArchiveData: lightZip.buffer.asUint8List());
+        Logging.instance.log(
+          "Updating default light theme... finished",
+          level: LogLevel.Info,
+        );
+      }
+    }
+
+    if (!(await ThemeService.instance.verifyInstalled(themeId: "dark"))) {
+      Logging.instance.log(
+        "Installing default dark theme... ",
+        level: LogLevel.Info,
+      );
+      final darkZip = await rootBundle.load("assets/default_themes/dark.zip");
+      await ThemeService.instance
+          .install(themeArchiveData: darkZip.buffer.asUint8List());
+      Logging.instance.log(
+        "Installing default dark theme... finished",
+        level: LogLevel.Info,
+      );
+    } else {
+      // check installed version
+      final theme = ThemeService.instance.getTheme(themeId: "dark");
+      if ((theme?.version ?? 1) < _currentDefaultThemeVersion) {
+        Logging.instance.log(
+          "Updating default dark theme...",
+          level: LogLevel.Info,
+        );
+        final darkZip = await rootBundle.load("assets/default_themes/dark.zip");
+        await ThemeService.instance
+            .install(themeArchiveData: darkZip.buffer.asUint8List());
+        Logging.instance.log(
+          "Updating default dark theme... finished",
+          level: LogLevel.Info,
+        );
+      }
+    }
+  }
+
   // TODO more thorough check/verification of theme
   Future<bool> verifyInstalled({required String themeId}) async {
     final dbHasTheme =
@@ -175,6 +240,7 @@ class ThemeService {
 class StackThemeMetaData {
   final String name;
   final String id;
+  final int version;
   final String sha256;
   final String size;
   final String previewImageUrl;
@@ -182,6 +248,7 @@ class StackThemeMetaData {
   StackThemeMetaData({
     required this.name,
     required this.id,
+    required this.version,
     required this.sha256,
     required this.size,
     required this.previewImageUrl,
@@ -192,6 +259,7 @@ class StackThemeMetaData {
       return StackThemeMetaData(
         name: map["name"] as String,
         id: map["id"] as String,
+        version: map["version"] as int? ?? 1,
         sha256: map["sha256"] as String,
         size: map["size"] as String,
         previewImageUrl: map["previewImageUrl"] as String,
@@ -210,6 +278,7 @@ class StackThemeMetaData {
     return "$runtimeType("
         "name: $name, "
         "id: $id, "
+        "version: $version, "
         "sha256: $sha256, "
         "size: $size, "
         "previewImageUrl: $previewImageUrl"

From d662eb4e189181a573d7b2ccfa2f33cb8260eedd Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 19 May 2023 08:44:15 -0600
Subject: [PATCH 09/87] fix: trocador swap status link

---
 lib/pages/exchange_view/trade_details_view.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/exchange_view/trade_details_view.dart b/lib/pages/exchange_view/trade_details_view.dart
index eb88ae543..3431d4296 100644
--- a/lib/pages/exchange_view/trade_details_view.dart
+++ b/lib/pages/exchange_view/trade_details_view.dart
@@ -1224,7 +1224,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
                           if (trade.exchangeName
                               .startsWith(TrocadorExchange.exchangeName)) {
                             url =
-                                "https://trocador.app/en/checkout${trade.tradeId}";
+                                "https://trocador.app/en/checkout/${trade.tradeId}";
                           }
                       }
                       return ConditionalParent(

From e4d7e5242cb73f670eb357e409ab739f2d5d07f4 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 19 May 2023 13:42:11 -0600
Subject: [PATCH 10/87] fix: assets display

---
 lib/utilities/assets.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart
index 12df8e1c7..aa2c1e05c 100644
--- a/lib/utilities/assets.dart
+++ b/lib/utilities/assets.dart
@@ -187,7 +187,7 @@ class _SVG {
   String get exchange3 => "assets/svg/exchange-3.svg";
   String get messageQuestion => "assets/svg/message-question-1.svg";
   String get list => "assets/svg/list-ul.svg";
-  String get unclaimedPaynym => "assets/svg/unclaimed.png";
+  String get unclaimedPaynym => "assets/svg/unclaimed.svg";
 
   String get trocadorRatingA => "assets/svg/trocador_rating_a.svg";
   String get trocadorRatingB => "assets/svg/trocador_rating_b.svg";

From f03b4bd0673ff0155d76a3978d2caf19eb854476 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 19 May 2023 14:05:58 -0600
Subject: [PATCH 11/87] default to 12 word seeds for new wallets

---
 lib/services/coins/bitcoin/bitcoin_wallet.dart | 2 +-
 lib/utilities/constants.dart                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/services/coins/bitcoin/bitcoin_wallet.dart b/lib/services/coins/bitcoin/bitcoin_wallet.dart
index aa592efda..a7313fb60 100644
--- a/lib/services/coins/bitcoin/bitcoin_wallet.dart
+++ b/lib/services/coins/bitcoin/bitcoin_wallet.dart
@@ -1468,7 +1468,7 @@ class BitcoinWallet extends CoinServiceAPI
     }
     await _secureStore.write(
         key: '${_walletId}_mnemonic',
-        value: bip39.generateMnemonic(strength: 256));
+        value: bip39.generateMnemonic(strength: 128));
     await _secureStore.write(key: '${_walletId}_mnemonicPassphrase', value: "");
 
     // Generate and add addresses to relevant arrays
diff --git a/lib/utilities/constants.dart b/lib/utilities/constants.dart
index 28751adec..c6082bbb0 100644
--- a/lib/utilities/constants.dart
+++ b/lib/utilities/constants.dart
@@ -94,7 +94,7 @@ abstract class Constants {
     }
   }
 
-  static const int seedPhraseWordCountBip39 = 24;
+  static const int seedPhraseWordCountBip39 = 12;
   static const int seedPhraseWordCountMonero = 25;
 
   static const Map<int, String> monthMapShort = {

From 2616c313a7284badd66562af02f475513dd0b804 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 19 May 2023 14:11:01 -0600
Subject: [PATCH 12/87] fix: paynym unclaimed asset

---
 lib/pages/paynym/paynym_claim_view.dart | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/pages/paynym/paynym_claim_view.dart b/lib/pages/paynym/paynym_claim_view.dart
index fc46a8392..103cdf924 100644
--- a/lib/pages/paynym/paynym_claim_view.dart
+++ b/lib/pages/paynym/paynym_claim_view.dart
@@ -138,10 +138,8 @@ class _PaynymClaimViewState extends ConsumerState<PaynymClaimView> {
               const Spacer(
                 flex: 1,
               ),
-              Image(
-                image: AssetImage(
-                  Assets.svg.unclaimedPaynym,
-                ),
+              SvgPicture.asset(
+                Assets.svg.unclaimedPaynym,
                 width: MediaQuery.of(context).size.width / 2,
               ),
               const SizedBox(

From c75a215f5c34fb2d12794ef81d74b2f77583c04b Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Tue, 23 May 2023 09:36:55 -0600
Subject: [PATCH 13/87] dev feat: pretty print json helper util

---
 lib/utilities/util.dart | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/utilities/util.dart b/lib/utilities/util.dart
index 6a31fae04..ecd9a7cca 100644
--- a/lib/utilities/util.dart
+++ b/lib/utilities/util.dart
@@ -1,3 +1,5 @@
+import 'dart:convert';
+import 'dart:developer';
 import 'dart:io';
 
 import 'package:device_info_plus/device_info_plus.dart';
@@ -50,4 +52,15 @@ abstract class Util {
     }
     return MaterialColor(color.value, swatch);
   }
+
+  static void printJson(dynamic json) {
+    if (json is Map || json is List) {
+      final spaces = ' ' * 4;
+      final encoder = JsonEncoder.withIndent(spaces);
+      final pretty = encoder.convert(json);
+      log(pretty);
+    } else {
+      log(dynamic.toString());
+    }
+  }
 }

From fc89c34b97ba233f68dfe8461c02e1ea939175cf Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Tue, 23 May 2023 15:13:56 -0600
Subject: [PATCH 14/87] add update theme button

---
 .../sub_widgets/stack_theme_card.dart         | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart b/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
index de6589e1d..4f1c1b4b2 100644
--- a/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
+++ b/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
@@ -39,6 +39,7 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
   late final StreamSubscription<void> _subscription;
 
   late bool _hasTheme;
+  bool _needsUpdate = false;
   String? _cachedSize;
 
   Future<bool> _downloadAndInstall() async {
@@ -84,6 +85,7 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
             title: message,
             onOkPressed: (_) {
               setState(() {
+                _needsUpdate = !result;
                 _hasTheme = result;
               });
             },
@@ -141,16 +143,18 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
     }
   }
 
+  StackTheme? getInstalled() => ref
+      .read(mainDBProvider)
+      .isar
+      .stackThemes
+      .where()
+      .themeIdEqualTo(widget.data.id)
+      .findFirstSync();
+
   @override
   void initState() {
-    _hasTheme = ref
-            .read(mainDBProvider)
-            .isar
-            .stackThemes
-            .where()
-            .themeIdEqualTo(widget.data.id)
-            .countSync() >
-        0;
+    final installedTheme = getInstalled();
+    _hasTheme = installedTheme != null;
 
     _subscription = ref
         .read(mainDBProvider)
@@ -158,18 +162,15 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
         .stackThemes
         .watchLazy()
         .listen((event) async {
-      final hasTheme = (await ref
-              .read(mainDBProvider)
-              .isar
-              .stackThemes
-              .where()
-              .themeIdEqualTo(widget.data.id)
-              .count()) >
-          0;
+      final installedTheme = getInstalled();
+      final hasTheme = installedTheme != null;
       if (_hasTheme != hasTheme && mounted) {
         WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
           setState(() {
             _hasTheme = hasTheme;
+            if (hasTheme) {
+              _needsUpdate = widget.data.version > installedTheme.version!;
+            }
           });
         });
       }
@@ -272,6 +273,16 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
               }
             },
           ),
+          if (_hasTheme && _needsUpdate)
+            const SizedBox(
+              height: 12,
+            ),
+          if (_hasTheme && _needsUpdate)
+            PrimaryButton(
+              label: "Update",
+              buttonHeight: isDesktop ? ButtonHeight.s : ButtonHeight.l,
+              onPressed: _downloadPressed,
+            ),
           const SizedBox(
             height: 12,
           ),

From 5d8d215853e1c5d1edfec54b786a837a640daf7c Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Tue, 23 May 2023 16:22:32 -0600
Subject: [PATCH 15/87] update monero ref

---
 crypto_plugins/flutter_libmonero | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero
index ec68d72ce..73d257ed2 160000
--- a/crypto_plugins/flutter_libmonero
+++ b/crypto_plugins/flutter_libmonero
@@ -1 +1 @@
-Subproject commit ec68d72ce6e529be045e263373518e9a86119be8
+Subproject commit 73d257ed2fe5b204cf3589822e226301b187b86d

From e21855f908a8c52bf44dff8d2fcb22e3d927251f Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Tue, 23 May 2023 17:19:16 -0600
Subject: [PATCH 16/87] fix: update theme button

---
 .../appearance_settings/sub_widgets/stack_theme_card.dart   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart b/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
index 4f1c1b4b2..ce84785d4 100644
--- a/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
+++ b/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
@@ -155,6 +155,9 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
   void initState() {
     final installedTheme = getInstalled();
     _hasTheme = installedTheme != null;
+    if (_hasTheme) {
+      _needsUpdate = widget.data.version > (installedTheme?.version ?? 0);
+    }
 
     _subscription = ref
         .read(mainDBProvider)
@@ -169,7 +172,8 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
           setState(() {
             _hasTheme = hasTheme;
             if (hasTheme) {
-              _needsUpdate = widget.data.version > installedTheme.version!;
+              _needsUpdate =
+                  widget.data.version > (installedTheme.version ?? 0);
             }
           });
         });

From 2124d6e820ddbe1d7614858b8172aeab572c6b97 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 09:24:07 -0600
Subject: [PATCH 17/87] fix: Handle sent to self transactions when sent to a
 change address

---
 lib/services/mixins/electrum_x_parsing.dart | 38 ++++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/lib/services/mixins/electrum_x_parsing.dart b/lib/services/mixins/electrum_x_parsing.dart
index 8ad1c7d4c..0865cb8ee 100644
--- a/lib/services/mixins/electrum_x_parsing.dart
+++ b/lib/services/mixins/electrum_x_parsing.dart
@@ -148,19 +148,31 @@ mixin ElectrumXParsing {
       type = TransactionType.outgoing;
       amount = amountSentFromWallet - changeAmount - fee;
 
-      final possible =
-          outputAddresses.difference(myChangeReceivedOnAddresses).first;
-
-      if (transactionAddress.value != possible) {
-        transactionAddress = Address(
-          walletId: walletId,
-          value: possible,
-          derivationIndex: -1,
-          derivationPath: null,
-          subType: AddressSubType.nonWallet,
-          type: AddressType.nonWallet,
-          publicKey: [],
-        );
+      // non wallet addresses found in tx outputs
+      final nonWalletOutAddresses = outputAddresses.difference(
+        myChangeReceivedOnAddresses,
+      );
+
+      if (nonWalletOutAddresses.isNotEmpty) {
+        final possible = nonWalletOutAddresses.first;
+
+        if (transactionAddress.value != possible) {
+          transactionAddress = Address(
+            walletId: walletId,
+            value: possible,
+            derivationIndex: -1,
+            derivationPath: null,
+            subType: AddressSubType.nonWallet,
+            type: AddressType.nonWallet,
+            publicKey: [],
+          );
+        }
+      } else {
+        // some other type of tx where the receiving address is
+        // one of my change addresses
+
+        type = TransactionType.sentToSelf;
+        amount = changeAmount;
       }
     } else {
       // incoming tx

From 7b246917dfa1329ca098afae8f77402082223a2b Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 10:05:20 -0600
Subject: [PATCH 18/87] fix: Firo total displayed on favourite card

---
 .../sub_widgets/favorite_card.dart            | 99 ++++++++++---------
 .../sub_widgets/favorite_wallets.dart         |  2 -
 .../desktop_favorite_wallets.dart             |  1 -
 3 files changed, 54 insertions(+), 48 deletions(-)

diff --git a/lib/pages/wallets_view/sub_widgets/favorite_card.dart b/lib/pages/wallets_view/sub_widgets/favorite_card.dart
index 3bab6de06..2f8c6de2a 100644
--- a/lib/pages/wallets_view/sub_widgets/favorite_card.dart
+++ b/lib/pages/wallets_view/sub_widgets/favorite_card.dart
@@ -6,7 +6,6 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:stackduo/pages/wallet_view/wallet_view.dart';
 import 'package:stackduo/pages_desktop_specific/my_stack_view/wallet_view/desktop_wallet_view.dart';
 import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/coins/manager.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
@@ -24,13 +23,11 @@ class FavoriteCard extends ConsumerStatefulWidget {
     required this.walletId,
     required this.width,
     required this.height,
-    required this.managerProvider,
   }) : super(key: key);
 
   final String walletId;
   final double width;
   final double height;
-  final ChangeNotifierProvider<Manager> managerProvider;
 
   @override
   ConsumerState<FavoriteCard> createState() => _FavoriteCardState();
@@ -38,15 +35,10 @@ class FavoriteCard extends ConsumerStatefulWidget {
 
 class _FavoriteCardState extends ConsumerState<FavoriteCard> {
   late final String walletId;
-  late final ChangeNotifierProvider<Manager> managerProvider;
-
-  Amount _cachedBalance = Amount.zero;
-  Amount _cachedFiatValue = Amount.zero;
 
   @override
   void initState() {
     walletId = widget.walletId;
-    managerProvider = widget.managerProvider;
 
     super.initState();
   }
@@ -55,9 +47,13 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
 
   @override
   Widget build(BuildContext context) {
-    final coin = ref.watch(managerProvider.select((value) => value.coin));
+    final coin = ref.watch(
+      walletsChangeNotifierProvider
+          .select((value) => value.getManager(walletId).coin),
+    );
     final externalCalls = ref.watch(
-        prefsChangeNotifierProvider.select((value) => value.externalCalls));
+      prefsChangeNotifierProvider.select((value) => value.externalCalls),
+    );
 
     return ConditionalParent(
       condition: Util.isDesktop,
@@ -109,7 +105,10 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
       child: GestureDetector(
         onTap: () async {
           if (coin == Coin.monero) {
-            await ref.read(managerProvider).initializeExisting();
+            await ref
+                .read(walletsChangeNotifierProvider)
+                .getManager(walletId)
+                .initializeExisting();
           }
           if (mounted) {
             if (Util.isDesktop) {
@@ -122,7 +121,9 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
                 WalletView.routeName,
                 arguments: Tuple2(
                   walletId,
-                  managerProvider,
+                  ref
+                      .read(walletsChangeNotifierProvider)
+                      .getManagerProvider(walletId),
                 ),
               );
             }
@@ -205,8 +206,12 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
                       children: [
                         Expanded(
                           child: Text(
-                            ref.watch(managerProvider
-                                .select((value) => value.walletName)),
+                            ref.watch(
+                              walletsChangeNotifierProvider.select(
+                                (value) =>
+                                    value.getManager(walletId).walletName,
+                              ),
+                            ),
                             style: STextStyles.itemSubtitle12(context).copyWith(
                               color: Theme.of(context)
                                   .extension<StackColors>()!
@@ -225,41 +230,43 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
                       ],
                     ),
                   ),
-                  FutureBuilder(
-                    future: Future(() => ref.watch(managerProvider
-                        .select((value) => value.balance.total))),
-                    builder: (builderContext, AsyncSnapshot<Amount> snapshot) {
-                      if (snapshot.connectionState == ConnectionState.done &&
-                          snapshot.hasData) {
-                        if (snapshot.data != null) {
-                          _cachedBalance = snapshot.data!;
-                          if (externalCalls && _cachedBalance > Amount.zero) {
-                            _cachedFiatValue = (_cachedBalance.decimal *
-                                    ref
-                                        .watch(
-                                          priceAnd24hChangeNotifierProvider
-                                              .select(
-                                            (value) => value.getPrice(coin),
-                                          ),
-                                        )
-                                        .item1)
-                                .toAmount(fractionDigits: 2);
-                          }
-                        }
+                  Builder(
+                    builder: (context) {
+                      final balance = ref.watch(
+                        walletsChangeNotifierProvider.select(
+                          (value) => value.getManager(walletId).balance,
+                        ),
+                      );
+
+                      Amount total = balance.total;
+
+                      Amount fiatTotal = Amount.zero;
+
+                      if (externalCalls && total > Amount.zero) {
+                        fiatTotal = (total.decimal *
+                                ref
+                                    .watch(
+                                      priceAnd24hChangeNotifierProvider.select(
+                                        (value) => value.getPrice(coin),
+                                      ),
+                                    )
+                                    .item1)
+                            .toAmount(fractionDigits: 2);
                       }
+
                       return Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           FittedBox(
                             fit: BoxFit.scaleDown,
                             child: Text(
-                              "${_cachedBalance.localizedStringAsFixed(
+                              "${total.localizedStringAsFixed(
                                 locale: ref.watch(
-                                  localeServiceChangeNotifierProvider
-                                      .select((value) => value.locale),
+                                  localeServiceChangeNotifierProvider.select(
+                                    (value) => value.locale,
+                                  ),
                                 ),
-                                decimalPlaces: ref.watch(managerProvider
-                                    .select((value) => value.coin.decimals)),
+                                decimalPlaces: coin.decimals,
                               )} ${coin.ticker}",
                               style: STextStyles.titleBold12(context).copyWith(
                                 fontSize: 16,
@@ -275,15 +282,17 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
                             ),
                           if (externalCalls)
                             Text(
-                              "${_cachedFiatValue.localizedStringAsFixed(
+                              "${fiatTotal.localizedStringAsFixed(
                                 locale: ref.watch(
-                                  localeServiceChangeNotifierProvider
-                                      .select((value) => value.locale),
+                                  localeServiceChangeNotifierProvider.select(
+                                    (value) => value.locale,
+                                  ),
                                 ),
                                 decimalPlaces: 2,
                               )} ${ref.watch(
-                                prefsChangeNotifierProvider
-                                    .select((value) => value.currency),
+                                prefsChangeNotifierProvider.select(
+                                  (value) => value.currency,
+                                ),
                               )}",
                               style:
                                   STextStyles.itemSubtitle12(context).copyWith(
diff --git a/lib/pages/wallets_view/sub_widgets/favorite_wallets.dart b/lib/pages/wallets_view/sub_widgets/favorite_wallets.dart
index 11aedcbdf..0dc2c4208 100644
--- a/lib/pages/wallets_view/sub_widgets/favorite_wallets.dart
+++ b/lib/pages/wallets_view/sub_widgets/favorite_wallets.dart
@@ -210,7 +210,6 @@ class _FavoriteWalletsState extends ConsumerState<FavoriteWallets> {
                                     child: FavoriteCard(
                                       key: Key("favCard_$walletId"),
                                       walletId: walletId!,
-                                      managerProvider: managerProvider!,
                                       width: cardWidth,
                                       height: cardHeight,
                                     ),
@@ -218,7 +217,6 @@ class _FavoriteWalletsState extends ConsumerState<FavoriteWallets> {
                                 : FavoriteCard(
                                     key: Key("favCard_$walletId"),
                                     walletId: walletId!,
-                                    managerProvider: managerProvider!,
                                     width: cardWidth,
                                     height: cardHeight,
                                   )
diff --git a/lib/pages_desktop_specific/my_stack_view/desktop_favorite_wallets.dart b/lib/pages_desktop_specific/my_stack_view/desktop_favorite_wallets.dart
index 7f8f1322a..21236aa38 100644
--- a/lib/pages_desktop_specific/my_stack_view/desktop_favorite_wallets.dart
+++ b/lib/pages_desktop_specific/my_stack_view/desktop_favorite_wallets.dart
@@ -74,7 +74,6 @@ class DesktopFavoriteWallets extends ConsumerWidget {
                           key: Key(walletName),
                           width: cardWidth,
                           height: cardHeight,
-                          managerProvider: managerProvider,
                         );
                       })
                     ],

From a9025e391ae11fa8e13d86a5bdfc6fece368f171 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 10:10:07 -0600
Subject: [PATCH 19/87] fix: Firo total displayed on managed favourite list
 card

---
 lib/widgets/managed_favorite.dart | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/widgets/managed_favorite.dart b/lib/widgets/managed_favorite.dart
index da4b47346..663b2329f 100644
--- a/lib/widgets/managed_favorite.dart
+++ b/lib/widgets/managed_favorite.dart
@@ -6,6 +6,7 @@ import 'package:flutter_svg/svg.dart';
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/amount/amount.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
@@ -34,6 +35,14 @@ class _ManagedFavoriteCardState extends ConsumerState<ManagedFavorite> {
 
     final isDesktop = Util.isDesktop;
 
+    final balance = ref.watch(
+      walletsChangeNotifierProvider.select(
+        (value) => value.getManager(widget.walletId).balance,
+      ),
+    );
+
+    final Amount total = balance.total;
+
     return RoundedWhiteContainer(
       padding: EdgeInsets.all(isDesktop ? 0 : 4.0),
       child: RawMaterialButton(
@@ -107,7 +116,7 @@ class _ManagedFavoriteCardState extends ConsumerState<ManagedFavorite> {
                       ),
                       Expanded(
                         child: Text(
-                          "${manager.balance.total.localizedStringAsFixed(
+                          "${total.localizedStringAsFixed(
                             locale: ref.watch(
                               localeServiceChangeNotifierProvider.select(
                                 (value) => value.locale,
@@ -150,7 +159,7 @@ class _ManagedFavoriteCardState extends ConsumerState<ManagedFavorite> {
                         height: 2,
                       ),
                       Text(
-                        "${manager.balance.total.localizedStringAsFixed(
+                        "${total.localizedStringAsFixed(
                           locale: ref.watch(
                             localeServiceChangeNotifierProvider.select(
                               (value) => value.locale,

From d594cae3d7aca2a2cf4f37eac7ca208f594a9d49 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 10:41:48 -0600
Subject: [PATCH 20/87] update monero ref

---
 crypto_plugins/flutter_libmonero | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero
index 73d257ed2..0a9196aa4 160000
--- a/crypto_plugins/flutter_libmonero
+++ b/crypto_plugins/flutter_libmonero
@@ -1 +1 @@
-Subproject commit 73d257ed2fe5b204cf3589822e226301b187b86d
+Subproject commit 0a9196aa454c14c886b848add3911da2c91e90ba

From 41f201570ec3116329aa9865ce7d5856319e7d8d Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 10:49:30 -0600
Subject: [PATCH 21/87] clean up

---
 .../desktop_exchange/desktop_all_trades_view.dart          | 2 +-
 pubspec.lock                                               | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart b/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart
index e4fc11709..9c411ddf3 100644
--- a/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart
+++ b/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/isar/main_db.dart';
+import 'package:stackduo/db/main_db.dart';
 import 'package:stackduo/models/exchange/change_now/exchange_transaction_status.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
diff --git a/pubspec.lock b/pubspec.lock
index 8bbd5d3fe..ac75e9761 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -379,13 +379,6 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
-  cw_wownero:
-    dependency: transitive
-    description:
-      path: "crypto_plugins/flutter_libmonero/cw_wownero"
-      relative: true
-    source: path
-    version: "0.0.1"
   dart_base_x:
     dependency: transitive
     description:

From 426a255498b877c52cb9194a1a1e5a27a926a1da Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 13:12:54 -0500
Subject: [PATCH 22/87] make vars final

---
 lib/electrumx_rpc/rpc.dart | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 57d694b5c..10df1a11a 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -12,10 +12,10 @@ class JsonRPC {
     this.useSSL = false,
     this.connectionTimeout = const Duration(seconds: 60),
   });
-  bool useSSL;
-  String host;
-  int port;
-  Duration connectionTimeout;
+  final bool useSSL;
+  final String host;
+  final int port;
+  final Duration connectionTimeout;
 
   Future<dynamic> request(String jsonRpcRequest) async {
     Socket? socket;

From 9f4f9d22386923cb50ca43c8d3df39c56576e681 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 13:14:21 -0500
Subject: [PATCH 23/87] move socket var up in scope

---
 lib/electrumx_rpc/rpc.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 10df1a11a..571cf69e8 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -16,9 +16,9 @@ class JsonRPC {
   final String host;
   final int port;
   final Duration connectionTimeout;
+  Socket? socket;
 
   Future<dynamic> request(String jsonRpcRequest) async {
-    Socket? socket;
     final completer = Completer<dynamic>();
     final List<int> responseData = [];
 

From fb4f788cc3f38066ecdb2e89a0cbc228d20f5a70 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 13:14:56 -0500
Subject: [PATCH 24/87] reuse socket var where possible

---
 lib/electrumx_rpc/rpc.dart | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 571cf69e8..0a62cc9c4 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -53,20 +53,15 @@ class JsonRPC {
     }
 
     if (useSSL) {
-      await SecureSocket.connect(host, port,
+      socket ??= await SecureSocket.connect(host, port,
           timeout: connectionTimeout,
-          onBadCertificate: (_) => true).then((Socket sock) {
-        socket = sock;
-        socket?.listen(dataHandler,
-            onError: errorHandler, onDone: doneHandler, cancelOnError: true);
-      });
+          onBadCertificate: (_) => true);
+      socket!.listen(dataHandler,
+          onError: errorHandler, onDone: doneHandler, cancelOnError: true);
     } else {
-      await Socket.connect(host, port, timeout: connectionTimeout)
-          .then((Socket sock) {
-        socket = sock;
-        socket?.listen(dataHandler,
-            onError: errorHandler, onDone: doneHandler, cancelOnError: true);
-      });
+      socket ??= await Socket.connect(host, port, timeout: connectionTimeout);
+      socket!.listen(dataHandler,
+      onError: errorHandler, onDone: doneHandler, cancelOnError: true);
     }
 
     socket?.write('$jsonRpcRequest\r\n');

From f73baca3de90de3fa2c68c1860fb351b6d0b8301 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 13:15:10 -0500
Subject: [PATCH 25/87] add todo

---
 lib/electrumx_rpc/rpc.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 0a62cc9c4..3af3c89b0 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -52,6 +52,10 @@ class JsonRPC {
       socket?.destroy();
     }
 
+    if (socket != null) {
+      // TODO check if the socket is valid, alive, connected, etc
+    }
+
     if (useSSL) {
       socket ??= await SecureSocket.connect(host, port,
           timeout: connectionTimeout,

From 3f83f89f075dffd6ca3e7759f59af75d6cca2675 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 13:15:19 -0500
Subject: [PATCH 26/87] add logs

---
 lib/electrumx_rpc/rpc.dart | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 3af3c89b0..886ea5822 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -36,7 +36,10 @@ class JsonRPC {
               .log("JsonRPC json.decode: $e\n$s", level: LogLevel.Error);
           completer.completeError(e, s);
         } finally {
-          socket?.destroy();
+          Logging.instance
+              .log("JsonRPC dataHandler: not destroying socket ${socket?.address}:${socket?.port}", level: LogLevel.Info);
+          // socket?.destroy();
+          // TODO is this all we need to do?
         }
       }
     }
@@ -45,11 +48,17 @@ class JsonRPC {
       Logging.instance
           .log("JsonRPC errorHandler: $error\n$trace", level: LogLevel.Error);
       completer.completeError(error, trace);
-      socket?.destroy();
+      Logging.instance
+          .log("JsonRPC errorHandler: not destroying socket ${socket?.address}:${socket?.port}", level: LogLevel.Info);
+      // socket?.destroy();
+      // TODO do we need to recreate the socket?
     }
 
     void doneHandler() {
-      socket?.destroy();
+      Logging.instance
+          .log("JsonRPC doneHandler: not destroying socket ${socket?.address}:${socket?.port}", level: LogLevel.Info);
+      // socket?.destroy();
+      // TODO is this all we need?
     }
 
     if (socket != null) {

From b1d57dd89ba76981a05a62aa52356ae611874bd3 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Wed, 24 May 2023 12:27:19 -0600
Subject: [PATCH 27/87] stream subscription

---
 lib/electrumx_rpc/rpc.dart | 46 +++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 886ea5822..364398490 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 
 import 'package:stackduo/utilities/logger.dart';
 
@@ -18,6 +19,8 @@ class JsonRPC {
   final Duration connectionTimeout;
   Socket? socket;
 
+  StreamSubscription<Uint8List>? _subscription;
+
   Future<dynamic> request(String jsonRpcRequest) async {
     final completer = Completer<dynamic>();
     final List<int> responseData = [];
@@ -36,8 +39,10 @@ class JsonRPC {
               .log("JsonRPC json.decode: $e\n$s", level: LogLevel.Error);
           completer.completeError(e, s);
         } finally {
-          Logging.instance
-              .log("JsonRPC dataHandler: not destroying socket ${socket?.address}:${socket?.port}", level: LogLevel.Info);
+          Logging.instance.log(
+            "JsonRPC dataHandler: not destroying socket ${socket?.address}:${socket?.port}",
+            level: LogLevel.Info,
+          );
           // socket?.destroy();
           // TODO is this all we need to do?
         }
@@ -48,15 +53,19 @@ class JsonRPC {
       Logging.instance
           .log("JsonRPC errorHandler: $error\n$trace", level: LogLevel.Error);
       completer.completeError(error, trace);
-      Logging.instance
-          .log("JsonRPC errorHandler: not destroying socket ${socket?.address}:${socket?.port}", level: LogLevel.Info);
+      Logging.instance.log(
+        "JsonRPC errorHandler: not destroying socket ${socket?.address}:${socket?.port}",
+        level: LogLevel.Info,
+      );
       // socket?.destroy();
       // TODO do we need to recreate the socket?
     }
 
     void doneHandler() {
-      Logging.instance
-          .log("JsonRPC doneHandler: not destroying socket ${socket?.address}:${socket?.port}", level: LogLevel.Info);
+      Logging.instance.log(
+        "JsonRPC doneHandler: not destroying socket ${socket?.address}:${socket?.port}",
+        level: LogLevel.Info,
+      );
       // socket?.destroy();
       // TODO is this all we need?
     }
@@ -67,14 +76,25 @@ class JsonRPC {
 
     if (useSSL) {
       socket ??= await SecureSocket.connect(host, port,
-          timeout: connectionTimeout,
-          onBadCertificate: (_) => true);
-      socket!.listen(dataHandler,
-          onError: errorHandler, onDone: doneHandler, cancelOnError: true);
+          timeout: connectionTimeout, onBadCertificate: (_) => true);
+      _subscription ??= socket!.listen(
+        dataHandler,
+        onError: errorHandler,
+        onDone: doneHandler,
+        cancelOnError: true,
+      );
     } else {
-      socket ??= await Socket.connect(host, port, timeout: connectionTimeout);
-      socket!.listen(dataHandler,
-      onError: errorHandler, onDone: doneHandler, cancelOnError: true);
+      socket ??= await Socket.connect(
+        host,
+        port,
+        timeout: connectionTimeout,
+      );
+      _subscription ??= socket!.listen(
+        dataHandler,
+        onError: errorHandler,
+        onDone: doneHandler,
+        cancelOnError: true,
+      );
     }
 
     socket?.write('$jsonRpcRequest\r\n');

From d6da569f63297f395540ce5d2866f02efcf7d4b5 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 13:39:21 -0500
Subject: [PATCH 28/87] move dataHandler and errorHandler up in scope

---
 lib/electrumx_rpc/rpc.dart | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 364398490..4258e1a98 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -17,10 +17,13 @@ class JsonRPC {
   final String host;
   final int port;
   final Duration connectionTimeout;
-  Socket? socket;
 
+  Socket? socket;
   StreamSubscription<Uint8List>? _subscription;
 
+  void Function(List<int>)? _onData;
+  void Function(Object, StackTrace)? _onError;
+
   Future<dynamic> request(String jsonRpcRequest) async {
     final completer = Completer<dynamic>();
     final List<int> responseData = [];
@@ -49,6 +52,8 @@ class JsonRPC {
       }
     }
 
+    _onData = dataHandler;
+
     void errorHandler(Object error, StackTrace trace) {
       Logging.instance
           .log("JsonRPC errorHandler: $error\n$trace", level: LogLevel.Error);
@@ -61,6 +66,8 @@ class JsonRPC {
       // TODO do we need to recreate the socket?
     }
 
+    _onError = errorHandler;
+
     void doneHandler() {
       Logging.instance.log(
         "JsonRPC doneHandler: not destroying socket ${socket?.address}:${socket?.port}",
@@ -78,8 +85,8 @@ class JsonRPC {
       socket ??= await SecureSocket.connect(host, port,
           timeout: connectionTimeout, onBadCertificate: (_) => true);
       _subscription ??= socket!.listen(
-        dataHandler,
-        onError: errorHandler,
+        _onData,
+        onError: _onError,
         onDone: doneHandler,
         cancelOnError: true,
       );
@@ -90,8 +97,8 @@ class JsonRPC {
         timeout: connectionTimeout,
       );
       _subscription ??= socket!.listen(
-        dataHandler,
-        onError: errorHandler,
+        _onData,
+        onError: _onError,
         onDone: doneHandler,
         cancelOnError: true,
       );

From 92bb0b5ef306e5738380820460e4a5999e7f4f69 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 13:40:19 -0500
Subject: [PATCH 29/87] comment

---
 lib/electrumx_rpc/rpc.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 4258e1a98..626061aa2 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -80,6 +80,7 @@ class JsonRPC {
     if (socket != null) {
       // TODO check if the socket is valid, alive, connected, etc
     }
+    // Do we need to check the subscription, too?w
 
     if (useSSL) {
       socket ??= await SecureSocket.connect(host, port,

From e20868e5644b1ab0c541458b935346bdd074a398 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 15:55:24 -0500
Subject: [PATCH 30/87] comment mutex code

---
 lib/electrumx_rpc/rpc.dart | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 626061aa2..00b73b3c7 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
+// import 'package:mutex/mutex.dart';
 
 import 'package:stackduo/utilities/logger.dart';
 
@@ -21,6 +22,8 @@ class JsonRPC {
   Socket? socket;
   StreamSubscription<Uint8List>? _subscription;
 
+  // final m = Mutex();
+
   void Function(List<int>)? _onData;
   void Function(Object, StackTrace)? _onError;
 
@@ -80,7 +83,9 @@ class JsonRPC {
     if (socket != null) {
       // TODO check if the socket is valid, alive, connected, etc
     }
-    // Do we need to check the subscription, too?w
+    // Do we need to check the subscription, too?
+
+    // await m.acquire();
 
     if (useSSL) {
       socket ??= await SecureSocket.connect(host, port,
@@ -107,6 +112,8 @@ class JsonRPC {
 
     socket?.write('$jsonRpcRequest\r\n');
 
+    // m.release();
+
     return completer.future;
   }
 }

From 31c15485cf41c8ce91cfd809cb2bcdf42be400cd Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 15:55:36 -0500
Subject: [PATCH 31/87] comments

---
 lib/electrumx_rpc/rpc.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 00b73b3c7..3e5af0b5e 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -27,6 +27,8 @@ class JsonRPC {
   void Function(List<int>)? _onData;
   void Function(Object, StackTrace)? _onError;
 
+  List<dynamic>? _requestQueue; // TODO make Request model
+
   Future<dynamic> request(String jsonRpcRequest) async {
     final completer = Completer<dynamic>();
     final List<int> responseData = [];
@@ -39,7 +41,7 @@ class JsonRPC {
       if (data.last == 0x0A) {
         try {
           final response = json.decode(String.fromCharCodes(responseData));
-          completer.complete(response);
+          completer.complete(response); // TODO only complete on last chunk?
         } catch (e, s) {
           Logging.instance
               .log("JsonRPC json.decode: $e\n$s", level: LogLevel.Error);
@@ -89,7 +91,7 @@ class JsonRPC {
 
     if (useSSL) {
       socket ??= await SecureSocket.connect(host, port,
-          timeout: connectionTimeout, onBadCertificate: (_) => true);
+          timeout: connectionTimeout, onBadCertificate: (_) => true); // TODO do not automatically trust bad certificates
       _subscription ??= socket!.listen(
         _onData,
         onError: _onError,

From 14e50821399c322545e10f9e9e286e89e007abbe Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 15:55:55 -0500
Subject: [PATCH 32/87] console logging

---
 lib/electrumx_rpc/rpc.dart | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 3e5af0b5e..3fc470096 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -114,6 +114,11 @@ class JsonRPC {
 
     socket?.write('$jsonRpcRequest\r\n');
 
+    Logging.instance.log(
+      "JsonRPC errorHandler: wrote request $jsonRpcRequest to socket ${socket?.address}:${socket?.port}",
+      level: LogLevel.Info,
+    );
+
     // m.release();
 
     return completer.future;

From ec2c6df8ac59fa0034f3fe1f45b4214584d44846 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 15:56:08 -0500
Subject: [PATCH 33/87] null awareness

---
 lib/electrumx_rpc/rpc.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 3fc470096..198e053df 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -112,7 +112,7 @@ class JsonRPC {
       );
     }
 
-    socket?.write('$jsonRpcRequest\r\n');
+    socket!.write('$jsonRpcRequest\r\n');
 
     Logging.instance.log(
       "JsonRPC errorHandler: wrote request $jsonRpcRequest to socket ${socket?.address}:${socket?.port}",

From 4508f65aa2d02751a8dc3bd726b9a173abb07d7d Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 16:05:59 -0500
Subject: [PATCH 34/87] add getBlockHeadTip response/error checking

---
 lib/electrumx_rpc/electrumx.dart | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/electrumx_rpc/electrumx.dart b/lib/electrumx_rpc/electrumx.dart
index 31689681b..24e0a100a 100644
--- a/lib/electrumx_rpc/electrumx.dart
+++ b/lib/electrumx_rpc/electrumx.dart
@@ -310,6 +310,13 @@ class ElectrumX {
         requestID: requestID,
         command: 'blockchain.headers.subscribe',
       );
+      if (response["result"] == null) {
+        Logging.instance.log(
+          "getBlockHeadTip returned null response",
+          level: LogLevel.Error,
+        );
+        throw 'getBlockHeadTip returned null response';
+      }
       return Map<String, dynamic>.from(response["result"] as Map);
     } catch (e) {
       rethrow;

From 69ba3f052960df7825131433a6b25a2a21695928 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 16:06:56 -0500
Subject: [PATCH 35/87] re-add mutex; release in doneHandler

---
 lib/electrumx_rpc/rpc.dart | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 198e053df..6dcea4031 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
-// import 'package:mutex/mutex.dart';
+import 'package:mutex/mutex.dart';
 
 import 'package:stackduo/utilities/logger.dart';
 
@@ -22,7 +22,7 @@ class JsonRPC {
   Socket? socket;
   StreamSubscription<Uint8List>? _subscription;
 
-  // final m = Mutex();
+  final m = Mutex();
 
   void Function(List<int>)? _onData;
   void Function(Object, StackTrace)? _onError;
@@ -79,15 +79,21 @@ class JsonRPC {
         level: LogLevel.Info,
       );
       // socket?.destroy();
+      m.release();
       // TODO is this all we need?
     }
 
     if (socket != null) {
       // TODO check if the socket is valid, alive, connected, etc
+    } else {
+      Logging.instance.log(
+        "JsonRPC request: opening socket $host:$port",
+        level: LogLevel.Info,
+      );
     }
     // Do we need to check the subscription, too?
 
-    // await m.acquire();
+    await m.acquire();
 
     if (useSSL) {
       socket ??= await SecureSocket.connect(host, port,
@@ -115,12 +121,10 @@ class JsonRPC {
     socket!.write('$jsonRpcRequest\r\n');
 
     Logging.instance.log(
-      "JsonRPC errorHandler: wrote request $jsonRpcRequest to socket ${socket?.address}:${socket?.port}",
+      "JsonRPC request: wrote request $jsonRpcRequest to socket ${socket?.address}:${socket?.port}",
       level: LogLevel.Info,
     );
 
-    // m.release();
-
     return completer.future;
   }
 }

From fe121ed704b66eb555a2024b348386dbe9ae1dd4 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Wed, 24 May 2023 16:23:45 -0500
Subject: [PATCH 36/87] remove unused requestQueue

---
 lib/electrumx_rpc/rpc.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 6dcea4031..6a6426578 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -27,8 +27,6 @@ class JsonRPC {
   void Function(List<int>)? _onData;
   void Function(Object, StackTrace)? _onError;
 
-  List<dynamic>? _requestQueue; // TODO make Request model
-
   Future<dynamic> request(String jsonRpcRequest) async {
     final completer = Completer<dynamic>();
     final List<int> responseData = [];

From 8df0da504327465a13b6ae2a7f3b9b885ef96ec1 Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Thu, 25 May 2023 10:27:35 -0600
Subject: [PATCH 37/87] replace rpc.dart with rpc2.dart

---
 test/electrumx_test.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/electrumx_test.dart b/test/electrumx_test.dart
index 1280ebdb9..3ae162529 100644
--- a/test/electrumx_test.dart
+++ b/test/electrumx_test.dart
@@ -1,9 +1,9 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/electrumx_rpc/electrumx.dart';
-import 'package:stackduo/electrumx_rpc/rpc.dart';
-import 'package:stackduo/utilities/prefs.dart';
+import 'package:stackwallet/electrumx_rpc/electrumx.dart';
+import 'package:stackwallet/electrumx_rpc/rpc.dart';
+import 'package:stackwallet/utilities/prefs.dart';
 
 import 'electrumx_test.mocks.dart';
 import 'sample_data/get_anonymity_set_sample_data.dart';

From 83ee2f18fb905aea591fbc2cdaae26dbfc83301f Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Thu, 25 May 2023 10:29:46 -0600
Subject: [PATCH 38/87] change exception message :)

---
 lib/electrumx_rpc/rpc2.dart | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 lib/electrumx_rpc/rpc2.dart

diff --git a/lib/electrumx_rpc/rpc2.dart b/lib/electrumx_rpc/rpc2.dart
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/lib/electrumx_rpc/rpc2.dart
@@ -0,0 +1 @@
+

From e28261088ec0060121c7441afbe1026e7c4d9970 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 14:27:36 -0600
Subject: [PATCH 39/87] convert cached electrumx into a simple wrapper

---
 lib/electrumx_rpc/cached_electrumx.dart | 84 +++++++------------------
 1 file changed, 21 insertions(+), 63 deletions(-)

diff --git a/lib/electrumx_rpc/cached_electrumx.dart b/lib/electrumx_rpc/cached_electrumx.dart
index 7e858166d..2ae26d847 100644
--- a/lib/electrumx_rpc/cached_electrumx.dart
+++ b/lib/electrumx_rpc/cached_electrumx.dart
@@ -4,43 +4,23 @@ import 'package:stackduo/electrumx_rpc/electrumx.dart';
 import 'package:stackduo/hive/db.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/logger.dart';
-import 'package:stackduo/utilities/prefs.dart';
 import 'package:string_validator/string_validator.dart';
 
 class CachedElectrumX {
-  final ElectrumX? electrumXClient;
-
-  final String server;
-  final int port;
-  final bool useSSL;
-
-  final Prefs prefs;
-  final List<ElectrumXNode> failovers;
+  final ElectrumX electrumXClient;
 
   static const minCacheConfirms = 30;
 
   const CachedElectrumX({
-    required this.server,
-    required this.port,
-    required this.useSSL,
-    required this.prefs,
-    required this.failovers,
-    this.electrumXClient,
+    required this.electrumXClient,
   });
 
   factory CachedElectrumX.from({
-    required ElectrumXNode node,
-    required Prefs prefs,
-    required List<ElectrumXNode> failovers,
-    ElectrumX? electrumXClient,
+    required ElectrumX electrumXClient,
   }) =>
       CachedElectrumX(
-          server: node.address,
-          port: node.port,
-          useSSL: node.useSSL,
-          prefs: prefs,
-          failovers: failovers,
-          electrumXClient: electrumXClient);
+        electrumXClient: electrumXClient,
+      );
 
   Future<Map<String, dynamic>> getAnonymitySet({
     required String groupId,
@@ -66,16 +46,7 @@ class CachedElectrumX {
         set = Map<String, dynamic>.from(cachedSet);
       }
 
-      final client = electrumXClient ??
-          ElectrumX(
-            host: server,
-            port: port,
-            useSSL: useSSL,
-            prefs: prefs,
-            failovers: failovers,
-          );
-
-      final newSet = await client.getAnonymitySet(
+      final newSet = await electrumXClient.getAnonymitySet(
         groupId: groupId,
         blockhash: set["blockHash"] as String,
       );
@@ -151,16 +122,8 @@ class CachedElectrumX {
       final cachedTx = DB.instance.get<dynamic>(
           boxName: DB.instance.boxNameTxCache(coin: coin), key: txHash) as Map?;
       if (cachedTx == null) {
-        final client = electrumXClient ??
-            ElectrumX(
-              host: server,
-              port: port,
-              useSSL: useSSL,
-              prefs: prefs,
-              failovers: failovers,
-            );
-        final Map<String, dynamic> result =
-            await client.getTransaction(txHash: txHash, verbose: verbose);
+        final Map<String, dynamic> result = await electrumXClient
+            .getTransaction(txHash: txHash, verbose: verbose);
 
         result.remove("hex");
         result.remove("lelantusData");
@@ -187,31 +150,25 @@ class CachedElectrumX {
     }
   }
 
-  Future<List<dynamic>> getUsedCoinSerials({
+  Future<List<String>> getUsedCoinSerials({
     required Coin coin,
     int startNumber = 0,
   }) async {
     try {
-      List<dynamic>? cachedSerials = DB.instance.get<dynamic>(
+      final _list = DB.instance.get<dynamic>(
           boxName: DB.instance.boxNameUsedSerialsCache(coin: coin),
           key: "serials") as List?;
 
-      cachedSerials ??= [];
+      List<String> cachedSerials =
+          _list == null ? [] : List<String>.from(_list);
 
       final startNumber = cachedSerials.length;
 
-      final client = electrumXClient ??
-          ElectrumX(
-            host: server,
-            port: port,
-            useSSL: useSSL,
-            prefs: prefs,
-            failovers: failovers,
-          );
-
-      final serials = await client.getUsedCoinSerials(startNumber: startNumber);
-      List newSerials = [];
-      for (var element in (serials["serials"] as List)) {
+      final serials =
+          await electrumXClient.getUsedCoinSerials(startNumber: startNumber);
+      List<String> newSerials = [];
+
+      for (final element in (serials["serials"] as List)) {
         if (!isHexadecimal(element as String)) {
           newSerials.add(base64ToHex(element));
         } else {
@@ -221,9 +178,10 @@ class CachedElectrumX {
       cachedSerials.addAll(newSerials);
 
       await DB.instance.put<dynamic>(
-          boxName: DB.instance.boxNameUsedSerialsCache(coin: coin),
-          key: "serials",
-          value: cachedSerials);
+        boxName: DB.instance.boxNameUsedSerialsCache(coin: coin),
+        key: "serials",
+        value: cachedSerials,
+      );
 
       return cachedSerials;
     } catch (e, s) {

From e4f4f74f62784ee092824698559d4481313ac8a9 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 14:37:18 -0600
Subject: [PATCH 40/87] fix: cached electrumx constructor usage

---
 lib/services/coins/bitcoin/bitcoin_wallet.dart |  8 +++-----
 lib/services/coins/coin_service.dart           | 12 +-----------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/lib/services/coins/bitcoin/bitcoin_wallet.dart b/lib/services/coins/bitcoin/bitcoin_wallet.dart
index a7313fb60..2278588ec 100644
--- a/lib/services/coins/bitcoin/bitcoin_wallet.dart
+++ b/lib/services/coins/bitcoin/bitcoin_wallet.dart
@@ -1342,16 +1342,14 @@ class BitcoinWallet extends CoinServiceAPI
             ))
         .toList();
     final newNode = await getCurrentNode();
-    _cachedElectrumXClient = CachedElectrumX.from(
-      node: newNode,
-      prefs: _prefs,
-      failovers: failovers,
-    );
     _electrumXClient = ElectrumX.from(
       node: newNode,
       prefs: _prefs,
       failovers: failovers,
     );
+    _cachedElectrumXClient = CachedElectrumX.from(
+      electrumXClient: _electrumXClient,
+    );
 
     if (shouldRefresh) {
       unawaited(refresh());
diff --git a/lib/services/coins/coin_service.dart b/lib/services/coins/coin_service.dart
index fc279830b..e5b88400b 100644
--- a/lib/services/coins/coin_service.dart
+++ b/lib/services/coins/coin_service.dart
@@ -46,17 +46,7 @@ abstract class CoinServiceAPI {
       prefs: prefs,
     );
     final cachedClient = CachedElectrumX.from(
-      node: electrumxNode,
-      failovers: failovers
-          .map((e) => ElectrumXNode(
-                address: e.host,
-                port: e.port,
-                name: e.name,
-                id: e.id,
-                useSSL: e.useSSL,
-              ))
-          .toList(),
-      prefs: prefs,
+      electrumXClient: client,
     );
     switch (coin) {
       case Coin.bitcoin:

From a3fed44e4b52666c0c83aab83ba060cce2327c6c Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Thu, 25 May 2023 14:52:07 -0600
Subject: [PATCH 41/87] rpc2.dart -> rpc.dart

---
 lib/electrumx_rpc/rpc.dart  | 239 +++++++++++++++++++++++++-----------
 lib/electrumx_rpc/rpc2.dart |   1 -
 2 files changed, 167 insertions(+), 73 deletions(-)
 delete mode 100644 lib/electrumx_rpc/rpc2.dart

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 6a6426578..2c3af6b8a 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
-import 'package:mutex/mutex.dart';
 
+import 'package:mutex/mutex.dart';
 import 'package:stackduo/utilities/logger.dart';
 
 // hacky fix to receive large jsonrpc responses
@@ -19,110 +19,205 @@ class JsonRPC {
   final int port;
   final Duration connectionTimeout;
 
-  Socket? socket;
+  final _JsonRPCRequestQueue _requestQueue = _JsonRPCRequestQueue();
+  Socket? _socket;
   StreamSubscription<Uint8List>? _subscription;
 
-  final m = Mutex();
+  void _dataHandler(List<int> data) {
+    if (_requestQueue.isEmpty) {
+      // probably just return although this case should never actually hit
+      // TODO anything else here?
+      return;
+    }
 
-  void Function(List<int>)? _onData;
-  void Function(Object, StackTrace)? _onError;
+    final req = _requestQueue.next;
+    req.appendDataAndCheckIfComplete(data);
 
-  Future<dynamic> request(String jsonRpcRequest) async {
-    final completer = Completer<dynamic>();
-    final List<int> responseData = [];
-
-    void dataHandler(List<int> data) {
-      responseData.addAll(data);
-
-      // 0x0A is newline
-      // https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-basics.html
-      if (data.last == 0x0A) {
-        try {
-          final response = json.decode(String.fromCharCodes(responseData));
-          completer.complete(response); // TODO only complete on last chunk?
-        } catch (e, s) {
-          Logging.instance
-              .log("JsonRPC json.decode: $e\n$s", level: LogLevel.Error);
-          completer.completeError(e, s);
-        } finally {
-          Logging.instance.log(
-            "JsonRPC dataHandler: not destroying socket ${socket?.address}:${socket?.port}",
-            level: LogLevel.Info,
-          );
-          // socket?.destroy();
-          // TODO is this all we need to do?
-        }
-      }
+    if (req.isComplete) {
+      _onReqCompleted(req);
     }
+  }
+
+  void _errorHandler(Object error, StackTrace trace) {
+    Logging.instance.log(
+      "JsonRPC errorHandler: $error\n$trace",
+      level: LogLevel.Error,
+    );
+
+    final req = _requestQueue.next;
+    req.completer.completeError(error, trace);
+    _onReqCompleted(req);
+  }
 
-    _onData = dataHandler;
+  void _doneHandler() {
+    Logging.instance.log(
+      "JsonRPC doneHandler: "
+      "connection closed to ${_socket?.address}:${_socket?.port}, destroying socket",
+      level: LogLevel.Info,
+    );
+    _socket?.destroy();
+    _socket = null; // is this redundant?
+    // should we also cancel and/or null the subscription?
 
-    void errorHandler(Object error, StackTrace trace) {
-      Logging.instance
-          .log("JsonRPC errorHandler: $error\n$trace", level: LogLevel.Error);
-      completer.completeError(error, trace);
+    if (_requestQueue.isNotEmpty) {
+      // TODO iterate over the remaining requests and if they are not isComplete then complete the completer with an error
       Logging.instance.log(
-        "JsonRPC errorHandler: not destroying socket ${socket?.address}:${socket?.port}",
-        level: LogLevel.Info,
+        "JsonRPC doneHandler: queue not empty but connection closed, completing pending requests with errors",
+        level: LogLevel.Error,
       );
-      // socket?.destroy();
-      // TODO do we need to recreate the socket?
+      _errorPendingRequests();
+    }
+  }
+
+  Future<void> _onReqCompleted(_JsonRPCRequest req) async {
+    await _requestQueue.remove(req);
+    if (_requestQueue.isNotEmpty) {
+      _sendNextAvailableRequest();
+    }
+  }
+
+  void _sendNextAvailableRequest() {
+    if (_requestQueue.isEmpty) {
+      // TODO handle properly
+      throw Exception("JSON RPC queue empty");
     }
 
-    _onError = errorHandler;
+    final req = _requestQueue.next;
+
+    _socket!.write('${req.jsonRequest}\r\n');
+    Logging.instance.log(
+      "JsonRPC request: wrote request ${req.jsonRequest} "
+      "to socket ${_socket?.address}:${_socket?.port}",
+      level: LogLevel.Info,
+    );
+  }
 
-    void doneHandler() {
+  void _errorPendingRequests() {
+    if (_requestQueue.isNotEmpty) {
+      final req = _requestQueue.next;
+      if (!(req.isComplete)) {
+        req.completer.completeError(
+            'JsonRPC doneHandler: socket closed before request could complete');
+        _requestQueue.remove(req).then((ret) {
+          if (_requestQueue.isNotEmpty) {
+            _errorPendingRequests();
+          }
+        });
+      }
+    } else {
       Logging.instance.log(
-        "JsonRPC doneHandler: not destroying socket ${socket?.address}:${socket?.port}",
+        "JsonRPC _errorPendingRequests: done completing pending requests with errors",
         level: LogLevel.Info,
       );
-      // socket?.destroy();
-      m.release();
-      // TODO is this all we need?
     }
+  }
 
-    if (socket != null) {
-      // TODO check if the socket is valid, alive, connected, etc
-    } else {
+  Future<dynamic> request(String jsonRpcRequest) async {
+    // todo: handle this better?
+    // Do we need to check the subscription, too?
+    if (_socket == null) {
       Logging.instance.log(
         "JsonRPC request: opening socket $host:$port",
         level: LogLevel.Info,
       );
+      await connect();
     }
-    // Do we need to check the subscription, too?
 
-    await m.acquire();
+    final req = _JsonRPCRequest(
+      jsonRequest: jsonRpcRequest,
+      completer: Completer<dynamic>(),
+    );
+
+    await _requestQueue.add(req);
 
-    if (useSSL) {
-      socket ??= await SecureSocket.connect(host, port,
-          timeout: connectionTimeout, onBadCertificate: (_) => true); // TODO do not automatically trust bad certificates
-      _subscription ??= socket!.listen(
-        _onData,
-        onError: _onError,
-        onDone: doneHandler,
-        cancelOnError: true,
+    // if this is the only/first request then send it right away
+    if (_requestQueue.length == 1) {
+      _sendNextAvailableRequest();
+    } else {
+      Logging.instance.log(
+        "JsonRPC request: queued request $jsonRpcRequest "
+        "to socket ${_socket?.address}:${_socket?.port}",
+        level: LogLevel.Info,
       );
+    }
+
+    return req.completer.future;
+  }
+
+  Future<void> disconnect() async {
+    await _subscription?.cancel();
+    _subscription = null;
+    _socket?.destroy();
+  }
+
+  Future<void> connect() async {
+    if (useSSL) {
+      _socket ??= await SecureSocket.connect(
+        host,
+        port,
+        timeout: connectionTimeout,
+        onBadCertificate: (_) => true,
+      ); // TODO do not automatically trust bad certificates
     } else {
-      socket ??= await Socket.connect(
+      _socket ??= await Socket.connect(
         host,
         port,
         timeout: connectionTimeout,
       );
-      _subscription ??= socket!.listen(
-        _onData,
-        onError: _onError,
-        onDone: doneHandler,
-        cancelOnError: true,
-      );
     }
+    await _subscription?.cancel();
+    _subscription = _socket!.listen(
+      _dataHandler,
+      onError: _errorHandler,
+      onDone: _doneHandler,
+      cancelOnError: true,
+    );
+  }
+}
 
-    socket!.write('$jsonRpcRequest\r\n');
+// mutex *may* not be needed as the protected functions are not async
+class _JsonRPCRequestQueue {
+  final _m = Mutex();
+  final List<_JsonRPCRequest> _rq = [];
 
-    Logging.instance.log(
-      "JsonRPC request: wrote request $jsonRpcRequest to socket ${socket?.address}:${socket?.port}",
-      level: LogLevel.Info,
-    );
+  Future<void> add(_JsonRPCRequest req) async {
+    await _m.protect(() async => _rq.add(req));
+  }
+
+  Future<void> remove(_JsonRPCRequest req) async {
+    await _m.protect(() async => _rq.remove(req));
+  }
+
+  bool get isEmpty => _rq.isEmpty;
+  bool get isNotEmpty => _rq.isNotEmpty;
+  int get length => _rq.length;
+  _JsonRPCRequest get next => _rq.first;
+}
 
-    return completer.future;
+class _JsonRPCRequest {
+  final String jsonRequest;
+  final Completer<dynamic> completer;
+  final List<int> _responseData = [];
+
+  _JsonRPCRequest({required this.jsonRequest, required this.completer});
+
+  void appendDataAndCheckIfComplete(List<int> data) {
+    _responseData.addAll(data);
+    // 0x0A is newline
+    // https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-basics.html
+    if (data.last == 0x0A) {
+      try {
+        final response = json.decode(String.fromCharCodes(_responseData));
+        completer.complete(response);
+      } catch (e, s) {
+        Logging.instance.log(
+          "JsonRPC json.decode: $e\n$s",
+          level: LogLevel.Error,
+        );
+        completer.completeError(e, s);
+      }
+    }
   }
+
+  bool get isComplete => completer.isCompleted;
 }
diff --git a/lib/electrumx_rpc/rpc2.dart b/lib/electrumx_rpc/rpc2.dart
deleted file mode 100644
index 8b1378917..000000000
--- a/lib/electrumx_rpc/rpc2.dart
+++ /dev/null
@@ -1 +0,0 @@
-

From 3661021ce4871f102e71ab4d202c631fd0e4124d Mon Sep 17 00:00:00 2001
From: Josh Babb <sneurlax@gmail.com>
Date: Thu, 25 May 2023 15:59:43 -0500
Subject: [PATCH 42/87] remove comment did the TODO

---
 lib/electrumx_rpc/rpc.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 2c3af6b8a..1fd658b21 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -60,7 +60,6 @@ class JsonRPC {
     // should we also cancel and/or null the subscription?
 
     if (_requestQueue.isNotEmpty) {
-      // TODO iterate over the remaining requests and if they are not isComplete then complete the completer with an error
       Logging.instance.log(
         "JsonRPC doneHandler: queue not empty but connection closed, completing pending requests with errors",
         level: LogLevel.Error,

From aca3a074a9d078397a771bf9647e06a57fd4bc48 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 15:29:23 -0600
Subject: [PATCH 43/87] some clean up

---
 lib/electrumx_rpc/rpc.dart | 56 +++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 1fd658b21..2a5ea2726 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -26,7 +26,6 @@ class JsonRPC {
   void _dataHandler(List<int> data) {
     if (_requestQueue.isEmpty) {
       // probably just return although this case should never actually hit
-      // TODO anything else here?
       return;
     }
 
@@ -52,20 +51,23 @@ class JsonRPC {
   void _doneHandler() {
     Logging.instance.log(
       "JsonRPC doneHandler: "
-      "connection closed to ${_socket?.address}:${_socket?.port}, destroying socket",
+      "connection closed to ${_socket?.address}:$port, destroying socket",
       level: LogLevel.Info,
     );
-    _socket?.destroy();
-    _socket = null; // is this redundant?
-    // should we also cancel and/or null the subscription?
 
     if (_requestQueue.isNotEmpty) {
       Logging.instance.log(
-        "JsonRPC doneHandler: queue not empty but connection closed, completing pending requests with errors",
+        "JsonRPC doneHandler: queue not empty but connection closed, "
+        "completing pending requests with errors",
         level: LogLevel.Error,
       );
-      _errorPendingRequests();
+      _requestQueue.clear(
+        errorMessage: "JsonRPC doneHandler: socket closed "
+            "before request could complete",
+      );
     }
+
+    disconnect();
   }
 
   Future<void> _onReqCompleted(_JsonRPCRequest req) async {
@@ -91,26 +93,6 @@ class JsonRPC {
     );
   }
 
-  void _errorPendingRequests() {
-    if (_requestQueue.isNotEmpty) {
-      final req = _requestQueue.next;
-      if (!(req.isComplete)) {
-        req.completer.completeError(
-            'JsonRPC doneHandler: socket closed before request could complete');
-        _requestQueue.remove(req).then((ret) {
-          if (_requestQueue.isNotEmpty) {
-            _errorPendingRequests();
-          }
-        });
-      }
-    } else {
-      Logging.instance.log(
-        "JsonRPC _errorPendingRequests: done completing pending requests with errors",
-        level: LogLevel.Info,
-      );
-    }
-  }
-
   Future<dynamic> request(String jsonRpcRequest) async {
     // todo: handle this better?
     // Do we need to check the subscription, too?
@@ -135,7 +117,7 @@ class JsonRPC {
     } else {
       Logging.instance.log(
         "JsonRPC request: queued request $jsonRpcRequest "
-        "to socket ${_socket?.address}:${_socket?.port}",
+        "to socket ${_socket?.address}:$port",
         level: LogLevel.Info,
       );
     }
@@ -143,10 +125,10 @@ class JsonRPC {
     return req.completer.future;
   }
 
-  Future<void> disconnect() async {
-    await _subscription?.cancel();
-    _subscription = null;
+  void disconnect() {
+    _subscription?.cancel().then((_) => _subscription = null);
     _socket?.destroy();
+    _socket = null;
   }
 
   Future<void> connect() async {
@@ -187,6 +169,18 @@ class _JsonRPCRequestQueue {
     await _m.protect(() async => _rq.remove(req));
   }
 
+  Future<void> clear({required String errorMessage}) async {
+    await _m.protect(() async {
+      for (final req in _rq) {
+        if (!req.isComplete) {
+          req.completer.completeError(errorMessage);
+        }
+      }
+
+      _rq.clear();
+    });
+  }
+
   bool get isEmpty => _rq.isEmpty;
   bool get isNotEmpty => _rq.isNotEmpty;
   int get length => _rq.length;

From f4f9039d91052892e829e2a96e69c16bc3a24478 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 15:55:57 -0600
Subject: [PATCH 44/87] clean up log spam

---
 lib/electrumx_rpc/rpc.dart | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 2a5ea2726..1b4db39e1 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -86,11 +86,11 @@ class JsonRPC {
     final req = _requestQueue.next;
 
     _socket!.write('${req.jsonRequest}\r\n');
-    Logging.instance.log(
-      "JsonRPC request: wrote request ${req.jsonRequest} "
-      "to socket ${_socket?.address}:${_socket?.port}",
-      level: LogLevel.Info,
-    );
+    // Logging.instance.log(
+    //   "JsonRPC request: wrote request ${req.jsonRequest} "
+    //   "to socket ${_socket?.address}:${_socket?.port}",
+    //   level: LogLevel.Info,
+    // );
   }
 
   Future<dynamic> request(String jsonRpcRequest) async {
@@ -115,11 +115,11 @@ class JsonRPC {
     if (_requestQueue.length == 1) {
       _sendNextAvailableRequest();
     } else {
-      Logging.instance.log(
-        "JsonRPC request: queued request $jsonRpcRequest "
-        "to socket ${_socket?.address}:$port",
-        level: LogLevel.Info,
-      );
+      // Logging.instance.log(
+      //   "JsonRPC request: queued request $jsonRpcRequest "
+      //   "to socket ${_socket?.address}:$port",
+      //   level: LogLevel.Info,
+      // );
     }
 
     return req.completer.future;

From 81534d74a6f60709fb8e7af66150e11dad8b43bb Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 25 May 2023 16:34:03 -0600
Subject: [PATCH 45/87] fix: wrap connect in mutex protect to prevent race
 condition opening multiple sockets

---
 lib/electrumx_rpc/rpc.dart | 65 ++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 35 deletions(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 1b4db39e1..70c340c63 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -19,6 +19,7 @@ class JsonRPC {
   final int port;
   final Duration connectionTimeout;
 
+  final _requestMutex = Mutex();
   final _JsonRPCRequestQueue _requestQueue = _JsonRPCRequestQueue();
   Socket? _socket;
   StreamSubscription<Uint8List>? _subscription;
@@ -51,7 +52,7 @@ class JsonRPC {
   void _doneHandler() {
     Logging.instance.log(
       "JsonRPC doneHandler: "
-      "connection closed to ${_socket?.address}:$port, destroying socket",
+      "connection closed to $host:$port, destroying socket",
       level: LogLevel.Info,
     );
 
@@ -61,17 +62,23 @@ class JsonRPC {
         "completing pending requests with errors",
         level: LogLevel.Error,
       );
-      _requestQueue.clear(
-        errorMessage: "JsonRPC doneHandler: socket closed "
+
+      for (final req in _requestQueue.queue) {
+        if (!req.isComplete) {
+          req.completer.completeError(
+            "JsonRPC doneHandler: socket closed "
             "before request could complete",
-      );
+          );
+        }
+      }
+      _requestQueue.clear();
     }
 
     disconnect();
   }
 
-  Future<void> _onReqCompleted(_JsonRPCRequest req) async {
-    await _requestQueue.remove(req);
+  void _onReqCompleted(_JsonRPCRequest req) {
+    _requestQueue.remove(req);
     if (_requestQueue.isNotEmpty) {
       _sendNextAvailableRequest();
     }
@@ -88,7 +95,7 @@ class JsonRPC {
     _socket!.write('${req.jsonRequest}\r\n');
     // Logging.instance.log(
     //   "JsonRPC request: wrote request ${req.jsonRequest} "
-    //   "to socket ${_socket?.address}:${_socket?.port}",
+    //   "to socket $host:$port",
     //   level: LogLevel.Info,
     // );
   }
@@ -96,20 +103,22 @@ class JsonRPC {
   Future<dynamic> request(String jsonRpcRequest) async {
     // todo: handle this better?
     // Do we need to check the subscription, too?
-    if (_socket == null) {
-      Logging.instance.log(
-        "JsonRPC request: opening socket $host:$port",
-        level: LogLevel.Info,
-      );
-      await connect();
-    }
+    await _requestMutex.protect(() async {
+      if (_socket == null) {
+        Logging.instance.log(
+          "JsonRPC request: opening socket $host:$port",
+          level: LogLevel.Info,
+        );
+        await connect();
+      }
+    });
 
     final req = _JsonRPCRequest(
       jsonRequest: jsonRpcRequest,
       completer: Completer<dynamic>(),
     );
 
-    await _requestQueue.add(req);
+    _requestQueue.add(req);
 
     // if this is the only/first request then send it right away
     if (_requestQueue.length == 1) {
@@ -117,7 +126,7 @@ class JsonRPC {
     } else {
       // Logging.instance.log(
       //   "JsonRPC request: queued request $jsonRpcRequest "
-      //   "to socket ${_socket?.address}:$port",
+      //   "to socket $host:$port",
       //   level: LogLevel.Info,
       // );
     }
@@ -126,6 +135,7 @@ class JsonRPC {
   }
 
   void disconnect() {
+    // TODO: maybe clear req queue here and wrap in mutex?
     _subscription?.cancel().then((_) => _subscription = null);
     _socket?.destroy();
     _socket = null;
@@ -156,35 +166,20 @@ class JsonRPC {
   }
 }
 
-// mutex *may* not be needed as the protected functions are not async
 class _JsonRPCRequestQueue {
-  final _m = Mutex();
   final List<_JsonRPCRequest> _rq = [];
 
-  Future<void> add(_JsonRPCRequest req) async {
-    await _m.protect(() async => _rq.add(req));
-  }
-
-  Future<void> remove(_JsonRPCRequest req) async {
-    await _m.protect(() async => _rq.remove(req));
-  }
+  void add(_JsonRPCRequest req) => _rq.add(req);
 
-  Future<void> clear({required String errorMessage}) async {
-    await _m.protect(() async {
-      for (final req in _rq) {
-        if (!req.isComplete) {
-          req.completer.completeError(errorMessage);
-        }
-      }
+  bool remove(_JsonRPCRequest req) => _rq.remove(req);
 
-      _rq.clear();
-    });
-  }
+  void clear() => _rq.clear();
 
   bool get isEmpty => _rq.isEmpty;
   bool get isNotEmpty => _rq.isNotEmpty;
   int get length => _rq.length;
   _JsonRPCRequest get next => _rq.first;
+  List<_JsonRPCRequest> get queue => _rq.toList(growable: false);
 }
 
 class _JsonRPCRequest {

From a4f691ce779252b642164fb68a876c7e30334c39 Mon Sep 17 00:00:00 2001
From: Rylee Davis <55416366+ryleedavis@users.noreply.github.com>
Date: Fri, 26 May 2023 09:45:45 -0600
Subject: [PATCH 46/87] Custom pin length (#555)

* WIP: pinCount stuff

* pin decoration + and pinCount is 0

* pin length tweaks

* fixes error when backspacing pin + add icon to flushbar

* removed Constants.pinLength + changes to "change pin" setting

* testing pin output

* WIP: tests pass + commented out isRandom pin 1234

* removed pin output

---------

Co-authored-by: ryleedavis <rylee@cypherstack.com>
Co-authored-by: julian <julian@cypherstack.com>
---
 lib/pages/pinpad_views/create_pin_view.dart   |  46 +-
 lib/pages/pinpad_views/lock_screen_view.dart  |  34 +-
 .../change_pin_view/change_pin_view.dart      |  49 +--
 lib/utilities/constants.dart                  |   2 -
 .../custom_pin_put/custom_pin_put.dart        |   6 +-
 .../custom_pin_put/custom_pin_put_state.dart  |  40 +-
 test/widget_tests/custom_pin_put_test.dart    | 394 ++++++++++++++++--
 7 files changed, 448 insertions(+), 123 deletions(-)

diff --git a/lib/pages/pinpad_views/create_pin_view.dart b/lib/pages/pinpad_views/create_pin_view.dart
index e8597dcc3..bb829ac2b 100644
--- a/lib/pages/pinpad_views/create_pin_view.dart
+++ b/lib/pages/pinpad_views/create_pin_view.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
@@ -6,12 +7,11 @@ import 'package:stackduo/notifications/show_flush_bar.dart';
 import 'package:stackduo/pages/home_view/home_view.dart';
 import 'package:stackduo/providers/global/prefs_provider.dart';
 import 'package:stackduo/providers/global/secure_store_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/biometrics.dart';
-import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/flutter_secure_storage_interface.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackduo/widgets/custom_pin_put/custom_pin_put.dart';
@@ -35,10 +35,11 @@ class CreatePinView extends ConsumerStatefulWidget {
 class _CreatePinViewState extends ConsumerState<CreatePinView> {
   BoxDecoration get _pinPutDecoration {
     return BoxDecoration(
-      color: Theme.of(context).extension<StackColors>()!.textSubtitle3,
+      color: Theme.of(context).extension<StackColors>()!.infoItemIcons,
       border: Border.all(
-          width: 1,
-          color: Theme.of(context).extension<StackColors>()!.textSubtitle3),
+        width: 1,
+        color: Theme.of(context).extension<StackColors>()!.infoItemIcons,
+      ),
       borderRadius: BorderRadius.circular(6),
     );
   }
@@ -57,10 +58,13 @@ class _CreatePinViewState extends ConsumerState<CreatePinView> {
   late SecureStorageInterface _secureStore;
   late Biometrics biometrics;
 
+  int pinCount = 1;
+
   @override
   initState() {
     _secureStore = ref.read(secureStoreProvider);
     biometrics = widget.biometrics;
+
     super.initState();
   }
 
@@ -71,11 +75,13 @@ class _CreatePinViewState extends ConsumerState<CreatePinView> {
     _pinPutController2.dispose();
     _pinPutFocusNode1.dispose();
     _pinPutFocusNode2.dispose();
+
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    // int pinCount = 1;
     return Background(
       child: Scaffold(
         backgroundColor: Theme.of(context).extension<StackColors>()!.background,
@@ -116,7 +122,7 @@ class _CreatePinViewState extends ConsumerState<CreatePinView> {
                     height: 36,
                   ),
                   CustomPinPut(
-                    fieldsCount: Constants.pinLength,
+                    fieldsCount: pinCount,
                     eachFieldHeight: 12,
                     eachFieldWidth: 12,
                     textStyle: STextStyles.label(context).copyWith(
@@ -140,21 +146,23 @@ class _CreatePinViewState extends ConsumerState<CreatePinView> {
                     ),
                     isRandom:
                         ref.read(prefsChangeNotifierProvider).randomizePIN,
-                    submittedFieldDecoration: _pinPutDecoration.copyWith(
-                      color: Theme.of(context)
-                          .extension<StackColors>()!
-                          .infoItemIcons,
-                      border: Border.all(
-                        width: 1,
-                        color: Theme.of(context)
-                            .extension<StackColors>()!
-                            .infoItemIcons,
-                      ),
-                    ),
+                    submittedFieldDecoration: _pinPutDecoration,
                     selectedFieldDecoration: _pinPutDecoration,
                     followingFieldDecoration: _pinPutDecoration,
+                    onPinLengthChanged: (newLength) {
+                      setState(() {
+                        pinCount = newLength;
+                      });
+                    },
                     onSubmit: (String pin) {
-                      if (pin.length == Constants.pinLength) {
+                      if (pin.length < 4) {
+                        showFloatingFlushBar(
+                          type: FlushBarType.warning,
+                          message: "PIN not long enough!",
+                          iconAsset: Assets.svg.alertCircle,
+                          context: context,
+                        );
+                      } else {
                         _pageController.nextPage(
                           duration: const Duration(milliseconds: 300),
                           curve: Curves.linear,
@@ -184,7 +192,7 @@ class _CreatePinViewState extends ConsumerState<CreatePinView> {
                     height: 36,
                   ),
                   CustomPinPut(
-                    fieldsCount: Constants.pinLength,
+                    fieldsCount: pinCount,
                     eachFieldHeight: 12,
                     eachFieldWidth: 12,
                     textStyle: STextStyles.infoSmall(context).copyWith(
diff --git a/lib/pages/pinpad_views/lock_screen_view.dart b/lib/pages/pinpad_views/lock_screen_view.dart
index 55449d08b..2ca44c762 100644
--- a/lib/pages/pinpad_views/lock_screen_view.dart
+++ b/lib/pages/pinpad_views/lock_screen_view.dart
@@ -9,15 +9,14 @@ import 'package:stackduo/pages/wallet_view/wallet_view.dart';
 import 'package:stackduo/providers/global/prefs_provider.dart';
 import 'package:stackduo/providers/global/secure_store_provider.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 // import 'package:stackduo/providers/global/should_show_lockscreen_on_resume_state_provider.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/biometrics.dart';
-import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/flutter_secure_storage_interface.dart';
 import 'package:stackduo/utilities/show_loading.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackduo/widgets/custom_buttons/blue_text_button.dart';
@@ -189,10 +188,11 @@ class _LockscreenViewState extends ConsumerState<LockscreenView> {
 
   BoxDecoration get _pinPutDecoration {
     return BoxDecoration(
-      color: Theme.of(context).extension<StackColors>()!.textSubtitle2,
+      color: Theme.of(context).extension<StackColors>()!.infoItemIcons,
       border: Border.all(
-          width: 1,
-          color: Theme.of(context).extension<StackColors>()!.textSubtitle2),
+        width: 1,
+        color: Theme.of(context).extension<StackColors>()!.infoItemIcons,
+      ),
       borderRadius: BorderRadius.circular(6),
     );
   }
@@ -202,6 +202,7 @@ class _LockscreenViewState extends ConsumerState<LockscreenView> {
 
   late SecureStorageInterface _secureStore;
   late Biometrics biometrics;
+  int pinCount = 1;
 
   Widget get _body => Background(
         child: SafeArea(
@@ -274,14 +275,7 @@ class _LockscreenViewState extends ConsumerState<LockscreenView> {
                           height: 52,
                         ),
                         CustomPinPut(
-                          // I don't know why is this commented out so I am not wrapping it with Semantics
-                          // customKey: CustomKey(
-                          //   onPressed: _checkUseBiometrics,
-                          //   iconAssetName: Platform.isIOS
-                          //       ? Assets.svg.faceId
-                          //       : Assets.svg.fingerprint,
-                          // ),
-                          fieldsCount: Constants.pinLength,
+                          fieldsCount: pinCount,
                           eachFieldHeight: 12,
                           eachFieldWidth: 12,
                           textStyle: STextStyles.label(context).copyWith(
@@ -303,19 +297,7 @@ class _LockscreenViewState extends ConsumerState<LockscreenView> {
                                 .background,
                             counterText: "",
                           ),
-                          submittedFieldDecoration: _pinPutDecoration.copyWith(
-                            color: Theme.of(context)
-                                .extension<StackColors>()!
-                                .infoItemIcons,
-                            border: Border.all(
-                              width: 1,
-                              color: Theme.of(context)
-                                  .extension<StackColors>()!
-                                  .infoItemIcons,
-                            ),
-                          ),
-                          selectedFieldDecoration: _pinPutDecoration,
-                          followingFieldDecoration: _pinPutDecoration,
+                          submittedFieldDecoration: _pinPutDecoration,
                           isRandom: ref
                               .read(prefsChangeNotifierProvider)
                               .randomizePIN,
diff --git a/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart b/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart
index e4f36ccd2..acb363976 100644
--- a/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart
+++ b/lib/pages/settings_views/global_settings_view/security_views/change_pin_view/change_pin_view.dart
@@ -4,11 +4,10 @@ import 'package:stackduo/notifications/show_flush_bar.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/security_views/security_view.dart';
 import 'package:stackduo/providers/global/prefs_provider.dart';
 import 'package:stackduo/providers/global/secure_store_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/assets.dart';
-import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/flutter_secure_storage_interface.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackduo/widgets/custom_pin_put/custom_pin_put.dart';
@@ -27,10 +26,11 @@ class ChangePinView extends ConsumerStatefulWidget {
 class _ChangePinViewState extends ConsumerState<ChangePinView> {
   BoxDecoration get _pinPutDecoration {
     return BoxDecoration(
-      color: Theme.of(context).extension<StackColors>()!.textSubtitle2,
+      color: Theme.of(context).extension<StackColors>()!.infoItemIcons,
       border: Border.all(
-          width: 1,
-          color: Theme.of(context).extension<StackColors>()!.textSubtitle2),
+        width: 1,
+        color: Theme.of(context).extension<StackColors>()!.infoItemIcons,
+      ),
       borderRadius: BorderRadius.circular(6),
     );
   }
@@ -48,6 +48,8 @@ class _ChangePinViewState extends ConsumerState<ChangePinView> {
 
   late final SecureStorageInterface _secureStore;
 
+  int pinCount = 1;
+
   @override
   void initState() {
     _secureStore = ref.read(secureStoreProvider);
@@ -101,7 +103,7 @@ class _ChangePinViewState extends ConsumerState<ChangePinView> {
                     height: 52,
                   ),
                   CustomPinPut(
-                    fieldsCount: Constants.pinLength,
+                    fieldsCount: pinCount,
                     eachFieldHeight: 12,
                     eachFieldWidth: 12,
                     textStyle: STextStyles.label(context).copyWith(
@@ -125,21 +127,18 @@ class _ChangePinViewState extends ConsumerState<ChangePinView> {
                     ),
                     isRandom:
                         ref.read(prefsChangeNotifierProvider).randomizePIN,
-                    submittedFieldDecoration: _pinPutDecoration.copyWith(
-                      color: Theme.of(context)
-                          .extension<StackColors>()!
-                          .infoItemIcons,
-                      border: Border.all(
-                        width: 1,
-                        color: Theme.of(context)
-                            .extension<StackColors>()!
-                            .infoItemIcons,
-                      ),
-                    ),
+                    submittedFieldDecoration: _pinPutDecoration,
                     selectedFieldDecoration: _pinPutDecoration,
                     followingFieldDecoration: _pinPutDecoration,
                     onSubmit: (String pin) {
-                      if (pin.length == Constants.pinLength) {
+                      if (pin.length < 4) {
+                        showFloatingFlushBar(
+                          type: FlushBarType.warning,
+                          message: "PIN not long enough!",
+                          iconAsset: Assets.svg.alertCircle,
+                          context: context,
+                        );
+                      } else {
                         _pageController.nextPage(
                           duration: const Duration(milliseconds: 300),
                           curve: Curves.linear,
@@ -165,7 +164,7 @@ class _ChangePinViewState extends ConsumerState<ChangePinView> {
                     height: 52,
                   ),
                   CustomPinPut(
-                    fieldsCount: Constants.pinLength,
+                    fieldsCount: pinCount,
                     eachFieldHeight: 12,
                     eachFieldWidth: 12,
                     textStyle: STextStyles.infoSmall(context).copyWith(
@@ -192,17 +191,7 @@ class _ChangePinViewState extends ConsumerState<ChangePinView> {
                     ),
                     isRandom:
                         ref.read(prefsChangeNotifierProvider).randomizePIN,
-                    submittedFieldDecoration: _pinPutDecoration.copyWith(
-                      color: Theme.of(context)
-                          .extension<StackColors>()!
-                          .infoItemIcons,
-                      border: Border.all(
-                        width: 1,
-                        color: Theme.of(context)
-                            .extension<StackColors>()!
-                            .infoItemIcons,
-                      ),
-                    ),
+                    submittedFieldDecoration: _pinPutDecoration,
                     selectedFieldDecoration: _pinPutDecoration,
                     followingFieldDecoration: _pinPutDecoration,
                     onSubmit: (String pin) async {
diff --git a/lib/utilities/constants.dart b/lib/utilities/constants.dart
index c6082bbb0..7285e0a6d 100644
--- a/lib/utilities/constants.dart
+++ b/lib/utilities/constants.dart
@@ -35,8 +35,6 @@ abstract class Constants {
   static const int notificationsMax = 0xFFFFFFFF;
   static const Duration networkAliveTimerDuration = Duration(seconds: 10);
 
-  static const int pinLength = 4;
-
   // Enable Logger.print statements
   static const bool disableLogger = false;
 
diff --git a/lib/widgets/custom_pin_put/custom_pin_put.dart b/lib/widgets/custom_pin_put/custom_pin_put.dart
index ac8c8b7e0..3d9e30342 100644
--- a/lib/widgets/custom_pin_put/custom_pin_put.dart
+++ b/lib/widgets/custom_pin_put/custom_pin_put.dart
@@ -53,8 +53,10 @@ class CustomPinPut extends StatefulWidget {
     this.mainAxisSize = MainAxisSize.max,
     this.autofillHints,
     this.customKey,
-  })  : assert(fieldsCount > 0),
-        super(key: key);
+    this.onPinLengthChanged,
+  }) : super(key: key);
+
+  final void Function(int)? onPinLengthChanged;
 
   final double? width;
   final double? height;
diff --git a/lib/widgets/custom_pin_put/custom_pin_put_state.dart b/lib/widgets/custom_pin_put/custom_pin_put_state.dart
index 3ff6dbd58..dcadabfda 100644
--- a/lib/widgets/custom_pin_put/custom_pin_put_state.dart
+++ b/lib/widgets/custom_pin_put/custom_pin_put_state.dart
@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:stackduo/widgets/custom_pin_put/custom_pin_put.dart';
 import 'package:stackduo/widgets/custom_pin_put/pin_keyboard.dart';
@@ -10,6 +12,13 @@ class CustomPinPutState extends State<CustomPinPut>
 
   int get selectedIndex => _controller.value.text.length;
 
+  int _pinCount = 0;
+  int get pinCount => _pinCount;
+  set pinCount(int newCount) {
+    _pinCount = newCount;
+    widget.onPinLengthChanged?.call(newCount);
+  }
+
   @override
   void initState() {
     _controller = widget.controller ?? TextEditingController();
@@ -50,22 +59,19 @@ class CustomPinPutState extends State<CustomPinPut>
 
   @override
   Widget build(BuildContext context) {
-    // final bool randomize = ref
-    //     .read(prefsChangeNotifierProvider)
-    //     .randomizePIN;
     return SizedBox(
       width: widget.width,
       height: widget.height,
       child: Column(
         children: [
           SizedBox(
-            width: (30 * widget.fieldsCount) - 18,
+            width: max((30 * pinCount) - 18, 1),
             child: Stack(
               children: [
                 _hiddenTextField,
                 Align(
                   alignment: Alignment.bottomCenter,
-                  child: _fields,
+                  child: _fields(pinCount),
                 ),
               ],
             ),
@@ -75,15 +81,22 @@ class CustomPinPutState extends State<CustomPinPut>
               isRandom: widget.isRandom,
               customKey: widget.customKey,
               onNumberKeyPressed: (number) {
-                if (_controller.text.length < widget.fieldsCount) {
-                  _controller.text += number;
-                }
+                _controller.text += number;
+
+                // add a set state and have the counter increment
+                setState(() {
+                  pinCount = _controller.text.length;
+                });
               },
               onBackPressed: () {
                 final text = _controller.text;
                 if (text.isNotEmpty) {
                   _controller.text = text.substring(0, text.length - 1);
+                  setState(() {
+                    pinCount = _controller.text.length;
+                  });
                 }
+                // decrement counter here
               },
               onSubmitPressed: () {
                 final pin = _controller.value.text;
@@ -117,7 +130,7 @@ class CustomPinPutState extends State<CustomPinPut>
       textCapitalization: widget.textCapitalization,
       inputFormatters: widget.inputFormatters,
       enableInteractiveSelection: false,
-      maxLength: widget.fieldsCount,
+      maxLength: 10,
       showCursor: false,
       scrollPadding: EdgeInsets.zero,
       decoration: widget.inputDecoration,
@@ -127,21 +140,22 @@ class CustomPinPutState extends State<CustomPinPut>
     );
   }
 
-  Widget get _fields {
+  // have it include an int as a param
+  Widget _fields(int count) {
     return ValueListenableBuilder<String>(
       valueListenable: _textControllerValue,
       builder: (BuildContext context, value, Widget? child) {
         return Row(
           mainAxisSize: widget.mainAxisSize,
           mainAxisAlignment: widget.fieldsAlignment,
-          children: _buildFieldsWithSeparator(),
+          children: _buildFieldsWithSeparator(count),
         );
       },
     );
   }
 
-  List<Widget> _buildFieldsWithSeparator() {
-    final fields = Iterable<int>.generate(widget.fieldsCount).map((index) {
+  List<Widget> _buildFieldsWithSeparator(int count) {
+    final fields = Iterable<int>.generate(count).map((index) {
       return _getField(index);
     }).toList();
 
diff --git a/test/widget_tests/custom_pin_put_test.dart b/test/widget_tests/custom_pin_put_test.dart
index 4e6d06a5a..e6f4860fb 100644
--- a/test/widget_tests/custom_pin_put_test.dart
+++ b/test/widget_tests/custom_pin_put_test.dart
@@ -6,48 +6,110 @@ import 'package:stackduo/utilities/theme/stack_colors.dart';
 import 'package:stackduo/widgets/custom_pin_put/custom_pin_put.dart';
 import 'package:stackduo/widgets/custom_pin_put/pin_keyboard.dart';
 
-void main() {
-  group("CustomPinPut tests", () {
-    testWidgets("CustomPinPut with 4 fields builds correctly", (tester) async {
-      const pinPut = CustomPinPut(fieldsCount: 4);
+class PinWidget extends StatefulWidget {
+  const PinWidget({
+    super.key,
+    this.onSubmit,
+    this.controller,
+    required this.pinAnimation,
+    required this.isRandom,
+  });
+
+  final void Function(String)? onSubmit;
+  final TextEditingController? controller;
+  final bool isRandom;
+  final PinAnimationType pinAnimation;
+
+  @override
+  PinWidgetState createState() => PinWidgetState();
+}
+
+class PinWidgetState extends State<PinWidget> {
+  int pinCount = 1;
+
+  @override
+  Widget build(BuildContext context) {
+    bool submittedPinMatches = false;
+
+    return CustomPinPut(
+      fieldsCount: pinCount,
+      isRandom: widget.isRandom,
+      useNativeKeyboard: false,
+      eachFieldHeight: 12,
+      eachFieldWidth: 12,
+      textStyle: STextStyles.label(context).copyWith(
+        fontSize: 1,
+      ),
+      obscureText: "",
+      onPinLengthChanged: (newLength) {
+        setState(() {
+          pinCount = newLength;
+        });
+      },
+      onSubmit: widget.onSubmit,
+      controller: widget.controller,
+      pinAnimationType: widget.pinAnimation,
+    );
+  }
+}
 
+void main() {
+  group("CustomPinPut tests, non-random PIN", () {
+    testWidgets("CustomPinPut with 4 fields builds correctly, non-random PIN",
+        (tester) async {
       await tester.pumpWidget(
         MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
             ],
           ),
           home: const Material(
-            child: pinPut,
+            child: PinWidget(
+              pinAnimation: PinAnimationType.none,
+              isRandom: false,
+            ),
           ),
         ),
       );
 
       // expects 5 here. Four + the actual text field text
-      expect(find.text(""), findsNWidgets(5));
+      expect(find.text(""), findsNWidgets(1));
       expect(find.byType(PinKeyboard), findsOneWidget);
       expect(find.byType(BackspaceKey), findsOneWidget);
       expect(find.byType(NumberKey), findsNWidgets(10));
     });
 
-    testWidgets("CustomPinPut entering a pin successfully", (tester) async {
+    testWidgets("CustomPinPut entering a pin successfully, non-random PIN",
+        (tester) async {
       bool submittedPinMatches = false;
-      final pinPut = CustomPinPut(
-        fieldsCount: 4,
-        onSubmit: (pin) => submittedPinMatches = pin == "1234",
-        useNativeKeyboard: false,
-      );
 
       await tester.pumpWidget(
         MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
             ],
           ),
           home: Material(
-            child: pinPut,
+            child: PinWidget(
+              pinAnimation: PinAnimationType.none,
+              isRandom: false,
+              onSubmit: (pin) {
+                submittedPinMatches = pin == "1234";
+                print("pin entered: $pin");
+              },
+            ),
           ),
         ),
       );
@@ -69,27 +131,268 @@ void main() {
       await tester.tap(find.byWidgetPredicate(
           (widget) => widget is NumberKey && widget.number == "4"));
       await tester.pumpAndSettle();
+      await tester.tap(find.byType(SubmitKey));
+      await tester.pumpAndSettle();
 
       expect(submittedPinMatches, true);
     });
 
-    testWidgets("CustomPinPut pin enter fade animation", (tester) async {
+    testWidgets("CustomPinPut pin enter fade animation, non-random PIN",
+        (tester) async {
       final controller = TextEditingController();
-      final pinPut = CustomPinPut(
-        fieldsCount: 4,
-        pinAnimationType: PinAnimationType.fade,
-        controller: controller,
+
+      await tester.pumpWidget(
+        MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
+            ],
+          ),
+          home: Material(
+            child: PinWidget(
+              pinAnimation: PinAnimationType.none,
+              isRandom: false,
+              controller: controller,
+            ),
+          ),
+        ),
+      );
+
+      await tester.tap(find.byWidgetPredicate(
+          (widget) => widget is NumberKey && widget.number == "1"));
+      await tester.pumpAndSettle();
+      expect(controller.text, "1");
+
+      await tester.tap(find.byType(BackspaceKey));
+      await tester.pumpAndSettle();
+      expect(controller.text, "");
+    });
+
+    testWidgets("CustomPinPut pin enter scale animation, non-random PIN",
+        (tester) async {
+      final controller = TextEditingController();
+
+      await tester.pumpWidget(
+        MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
+            ],
+          ),
+          home: Material(
+            child: PinWidget(
+              pinAnimation: PinAnimationType.scale,
+              isRandom: false,
+              controller: controller,
+            ),
+          ),
+        ),
+      );
+
+      await tester.tap(find.byWidgetPredicate(
+          (widget) => widget is NumberKey && widget.number == "1"));
+      await tester.pumpAndSettle();
+      expect(controller.text, "1");
+
+      await tester.tap(find.byType(BackspaceKey));
+      await tester.pumpAndSettle();
+      expect(controller.text, "");
+    });
+
+    testWidgets("CustomPinPut pin enter rotate animation, non-random PIN",
+        (tester) async {
+      final controller = TextEditingController();
+
+      await tester.pumpWidget(
+        MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
+            ],
+          ),
+          home: Material(
+            child: PinWidget(
+              pinAnimation: PinAnimationType.rotation,
+              isRandom: false,
+              controller: controller,
+            ),
+          ),
+        ),
       );
 
+      await tester.tap(find.byWidgetPredicate(
+          (widget) => widget is NumberKey && widget.number == "1"));
+      await tester.pumpAndSettle();
+      expect(controller.text, "1");
+
+      await tester.tap(find.byType(BackspaceKey));
+      await tester.pumpAndSettle();
+      expect(controller.text, "");
+    });
+  });
+
+  testWidgets("PinKeyboard builds correctly, non-random PIN", (tester) async {
+    final keyboard = PinKeyboard(
+      onNumberKeyPressed: (_) {},
+      onBackPressed: () {},
+      onSubmitPressed: () {},
+      isRandom: false,
+    );
+
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: ThemeData(
+          extensions: [
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+                applicationThemesDirectoryPath: "test",
+              ),
+            ),
+          ],
+        ),
+        home: Material(
+          child: keyboard,
+        ),
+      ),
+    );
+
+    expect(find.byType(BackspaceKey), findsOneWidget);
+    expect(find.byType(SubmitKey), findsOneWidget);
+    expect(find.byType(NumberKey), findsNWidgets(10));
+    expect(find.text("0"), findsOneWidget);
+    expect(find.text("1"), findsOneWidget);
+    expect(find.text("2"), findsOneWidget);
+    expect(find.text("3"), findsOneWidget);
+    expect(find.text("4"), findsOneWidget);
+    expect(find.text("5"), findsOneWidget);
+    expect(find.text("6"), findsOneWidget);
+    expect(find.text("7"), findsOneWidget);
+    expect(find.text("8"), findsOneWidget);
+    expect(find.text("9"), findsOneWidget);
+    expect(find.byType(SvgPicture), findsNWidgets(2));
+  });
+
+  group("CustomPinPut tests, with random PIN", () {
+    testWidgets("CustomPinPut with 4 fields builds correctly, with random PIN",
+        (tester) async {
+      await tester.pumpWidget(
+        MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
+            ],
+          ),
+          home: const Material(
+            child: PinWidget(
+              pinAnimation: PinAnimationType.none,
+              isRandom: true,
+            ),
+          ),
+        ),
+      );
+
+      // expects 5 here. Four + the actual text field text
+      expect(find.text(""), findsNWidgets(1));
+      expect(find.byType(PinKeyboard), findsOneWidget);
+      expect(find.byType(BackspaceKey), findsOneWidget);
+      expect(find.byType(NumberKey), findsNWidgets(10));
+    });
+
+    // testWidgets("CustomPinPut entering a pin successfully, with random PIN",
+    //     (tester) async {
+    //   bool submittedPinMatches = false;
+    //
+    //   await tester.pumpWidget(
+    //     MaterialApp(
+    //       theme: ThemeData(
+    //         extensions: [
+    //           StackColors.fromStackColorTheme(
+    //             StackTheme.fromJson(
+    //               json: lightThemeJsonMap,
+    //               applicationThemesDirectoryPath: "test",
+    //             ),
+    //           ),
+    //         ],
+    //       ),
+    //       home: Material(
+    //         child: PinWidget(
+    //           pinAnimation: PinAnimationType.none,
+    //           isRandom: true,
+    //           onSubmit: (pin) {
+    //             submittedPinMatches = pin == "1234";
+    //             print("pin entered: $pin");
+    //           },
+    //         ),
+    //       ),
+    //     ),
+    //   );
+    //
+    //   await tester.tap(find.byWidgetPredicate(
+    //       (widget) => widget is NumberKey && widget.number == "1"));
+    //   await tester.pumpAndSettle();
+    //   await tester.tap(find.byWidgetPredicate(
+    //       (widget) => widget is NumberKey && widget.number == "2"));
+    //   await tester.pumpAndSettle();
+    //   await tester.tap(find.byWidgetPredicate(
+    //       (widget) => widget is NumberKey && widget.number == "6"));
+    //   await tester.pumpAndSettle();
+    //   await tester.tap(find.byType(BackspaceKey));
+    //   await tester.pumpAndSettle();
+    //   await tester.tap(find.byWidgetPredicate(
+    //       (widget) => widget is NumberKey && widget.number == "3"));
+    //   await tester.pumpAndSettle();
+    //   await tester.tap(find.byWidgetPredicate(
+    //       (widget) => widget is NumberKey && widget.number == "4"));
+    //   await tester.pumpAndSettle();
+    //   await tester.tap(find.byType(SubmitKey));
+    //   await tester.pumpAndSettle();
+    //
+    //   expect(submittedPinMatches, true);
+    // });
+
+    testWidgets("CustomPinPut pin enter fade animation, with random PIN",
+        (tester) async {
+      final controller = TextEditingController();
+
       await tester.pumpWidget(
         MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
             ],
           ),
           home: Material(
-            child: pinPut,
+            child: PinWidget(
+              pinAnimation: PinAnimationType.fade,
+              isRandom: true,
+              controller: controller,
+            ),
           ),
         ),
       );
@@ -104,23 +407,34 @@ void main() {
       expect(controller.text, "");
     });
 
-    testWidgets("CustomPinPut pin enter scale animation", (tester) async {
+    testWidgets("CustomPinPut pin enter scale animation, with random PIN",
+        (tester) async {
       final controller = TextEditingController();
       final pinPut = CustomPinPut(
         fieldsCount: 4,
         pinAnimationType: PinAnimationType.scale,
         controller: controller,
+        isRandom: true,
       );
 
       await tester.pumpWidget(
         MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
             ],
           ),
           home: Material(
-            child: pinPut,
+            child: PinWidget(
+              isRandom: true,
+              controller: controller,
+              pinAnimation: PinAnimationType.scale,
+            ),
           ),
         ),
       );
@@ -135,23 +449,34 @@ void main() {
       expect(controller.text, "");
     });
 
-    testWidgets("CustomPinPut pin enter rotate animation", (tester) async {
+    testWidgets("CustomPinPut pin enter rotate animation, with random PIN",
+        (tester) async {
       final controller = TextEditingController();
       final pinPut = CustomPinPut(
         fieldsCount: 4,
         pinAnimationType: PinAnimationType.rotation,
         controller: controller,
+        isRandom: true,
       );
 
       await tester.pumpWidget(
         MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
             ],
           ),
           home: Material(
-            child: pinPut,
+            child: PinWidget(
+              isRandom: true,
+              controller: controller,
+              pinAnimation: PinAnimationType.rotation,
+            ),
           ),
         ),
       );
@@ -167,18 +492,24 @@ void main() {
     });
   });
 
-  testWidgets("PinKeyboard builds correctly", (tester) async {
+  testWidgets("PinKeyboard builds correctly, with random PIN", (tester) async {
     final keyboard = PinKeyboard(
       onNumberKeyPressed: (_) {},
       onBackPressed: () {},
       onSubmitPressed: () {},
+      isRandom: true,
     );
 
     await tester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+                applicationThemesDirectoryPath: "test",
+              ),
+            ),
           ],
         ),
         home: Material(
@@ -188,6 +519,7 @@ void main() {
     );
 
     expect(find.byType(BackspaceKey), findsOneWidget);
+    expect(find.byType(SubmitKey), findsOneWidget);
     expect(find.byType(NumberKey), findsNWidgets(10));
     expect(find.text("0"), findsOneWidget);
     expect(find.text("1"), findsOneWidget);
@@ -199,6 +531,6 @@ void main() {
     expect(find.text("7"), findsOneWidget);
     expect(find.text("8"), findsOneWidget);
     expect(find.text("9"), findsOneWidget);
-    expect(find.byType(SvgPicture), findsOneWidget);
+    expect(find.byType(SvgPicture), findsNWidgets(2));
   });
 }

From 1da667ba84448b5f6dcb9b8a034c4bc5cd71062c Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 26 May 2023 12:48:10 -0600
Subject: [PATCH 47/87] debugging

---
 lib/electrumx_rpc/electrumx.dart |  5 +++++
 lib/electrumx_rpc/rpc.dart       | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/electrumx_rpc/electrumx.dart b/lib/electrumx_rpc/electrumx.dart
index 24e0a100a..1b7b7158e 100644
--- a/lib/electrumx_rpc/electrumx.dart
+++ b/lib/electrumx_rpc/electrumx.dart
@@ -132,6 +132,11 @@ class ElectrumX {
 
       final response = await _rpcClient!.request(jsonRequestString);
 
+      print("=================================================");
+      print("TYPE: ${response.runtimeType}");
+      print("RESPONSE: $response");
+      print("=================================================");
+
       if (response["error"] != null) {
         if (response["error"]
             .toString()
diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 70c340c63..00c72756d 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -65,10 +65,14 @@ class JsonRPC {
 
       for (final req in _requestQueue.queue) {
         if (!req.isComplete) {
-          req.completer.completeError(
-            "JsonRPC doneHandler: socket closed "
-            "before request could complete",
-          );
+          try {
+            throw Exception(
+              "JsonRPC doneHandler: socket closed "
+              "before request could complete",
+            );
+          } catch (e, s) {
+            req.completer.completeError(e, s);
+          }
         }
       }
       _requestQueue.clear();

From a2d229281edf426aadd3eb2b90dbf91a6126debc Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 26 May 2023 15:28:25 -0600
Subject: [PATCH 48/87] return onError

---
 lib/electrumx_rpc/rpc.dart | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index 00c72756d..e204a965f 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -135,7 +135,10 @@ class JsonRPC {
       // );
     }
 
-    return req.completer.future;
+    return req.completer.future.onError(
+      (error, stackTrace) =>
+          Exception("return req.completer.future.onError: $error"),
+    );
   }
 
   void disconnect() {

From eb8d0693d96ca0ef2b5a80e70faf1339de3848c6 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 26 May 2023 15:34:09 -0600
Subject: [PATCH 49/87] add timeout to requests

---
 lib/electrumx_rpc/rpc.dart | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index e204a965f..a426b96b1 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -97,6 +97,8 @@ class JsonRPC {
     final req = _requestQueue.next;
 
     _socket!.write('${req.jsonRequest}\r\n');
+
+    req.initiateTimeout(const Duration(seconds: 10));
     // Logging.instance.log(
     //   "JsonRPC request: wrote request ${req.jsonRequest} "
     //   "to socket $host:$port",
@@ -214,5 +216,17 @@ class _JsonRPCRequest {
     }
   }
 
+  void initiateTimeout(Duration timeout) {
+    Future<void>.delayed(timeout).then((_) {
+      if (!isComplete) {
+        try {
+          throw Exception("_JsonRPCRequest timed out: $jsonRequest");
+        } catch (e, s) {
+          completer.completeError(e, s);
+        }
+      }
+    });
+  }
+
   bool get isComplete => completer.isCompleted;
 }

From 249e75bb73ff17bbf19fefdb1cebb87f9231050f Mon Sep 17 00:00:00 2001
From: Rylee Davis <55416366+ryleedavis@users.noreply.github.com>
Date: Fri, 26 May 2023 09:45:45 -0600
Subject: [PATCH 50/87] Custom pin length (#555)

* WIP: pinCount stuff

* pin decoration + and pinCount is 0

* pin length tweaks

* fixes error when backspacing pin + add icon to flushbar

* removed Constants.pinLength + changes to "change pin" setting

* testing pin output

* WIP: tests pass + commented out isRandom pin 1234

* removed pin output

---------

Co-authored-by: ryleedavis <rylee@cypherstack.com>
Co-authored-by: julian <julian@cypherstack.com>
---
 lib/pages/pinpad_views/create_pin_view.dart | 25 +++++++++++----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/pages/pinpad_views/create_pin_view.dart b/lib/pages/pinpad_views/create_pin_view.dart
index bb829ac2b..0abc3106e 100644
--- a/lib/pages/pinpad_views/create_pin_view.dart
+++ b/lib/pages/pinpad_views/create_pin_view.dart
@@ -3,18 +3,19 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:stackduo/notifications/show_flush_bar.dart';
-import 'package:stackduo/pages/home_view/home_view.dart';
-import 'package:stackduo/providers/global/prefs_provider.dart';
-import 'package:stackduo/providers/global/secure_store_provider.dart';
-import 'package:stackduo/themes/stack_colors.dart';
-import 'package:stackduo/utilities/assets.dart';
-import 'package:stackduo/utilities/biometrics.dart';
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart';
-import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/widgets/background.dart';
-import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
-import 'package:stackduo/widgets/custom_pin_put/custom_pin_put.dart';
+import 'package:stackwallet/notifications/show_flush_bar.dart';
+import 'package:stackwallet/pages/home_view/home_view.dart';
+import 'package:stackwallet/providers/global/prefs_provider.dart';
+import 'package:stackwallet/providers/global/secure_store_provider.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/utilities/assets.dart';
+import 'package:stackwallet/utilities/biometrics.dart';
+import 'package:stackwallet/utilities/constants.dart';
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
+import 'package:stackwallet/utilities/text_styles.dart';
+import 'package:stackwallet/widgets/background.dart';
+import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackwallet/widgets/custom_pin_put/custom_pin_put.dart';
 
 class CreatePinView extends ConsumerStatefulWidget {
   const CreatePinView({

From 3138cc2048c6a08f4094288c52f76274856494a4 Mon Sep 17 00:00:00 2001
From: Rylee Davis <55416366+ryleedavis@users.noreply.github.com>
Date: Fri, 26 May 2023 09:45:45 -0600
Subject: [PATCH 51/87] Custom pin length (#555)

* WIP: pinCount stuff

* pin decoration + and pinCount is 0

* pin length tweaks

* fixes error when backspacing pin + add icon to flushbar

* removed Constants.pinLength + changes to "change pin" setting

* testing pin output

* WIP: tests pass + commented out isRandom pin 1234

* removed pin output

---------

Co-authored-by: ryleedavis <rylee@cypherstack.com>
Co-authored-by: julian <julian@cypherstack.com>
---
 lib/pages/pinpad_views/create_pin_view.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/pages/pinpad_views/create_pin_view.dart b/lib/pages/pinpad_views/create_pin_view.dart
index 0abc3106e..18e974ebf 100644
--- a/lib/pages/pinpad_views/create_pin_view.dart
+++ b/lib/pages/pinpad_views/create_pin_view.dart
@@ -10,7 +10,6 @@ import 'package:stackwallet/providers/global/secure_store_provider.dart';
 import 'package:stackwallet/themes/stack_colors.dart';
 import 'package:stackwallet/utilities/assets.dart';
 import 'package:stackwallet/utilities/biometrics.dart';
-import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/widgets/background.dart';

From 47de20cb3cafedbdcee94cc8a71a1c8d627d7b96 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 26 May 2023 17:43:17 -0600
Subject: [PATCH 52/87] merge clean up

---
 lib/pages/pinpad_views/create_pin_view.dart | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/pages/pinpad_views/create_pin_view.dart b/lib/pages/pinpad_views/create_pin_view.dart
index 18e974ebf..bb829ac2b 100644
--- a/lib/pages/pinpad_views/create_pin_view.dart
+++ b/lib/pages/pinpad_views/create_pin_view.dart
@@ -3,18 +3,18 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:stackwallet/notifications/show_flush_bar.dart';
-import 'package:stackwallet/pages/home_view/home_view.dart';
-import 'package:stackwallet/providers/global/prefs_provider.dart';
-import 'package:stackwallet/providers/global/secure_store_provider.dart';
-import 'package:stackwallet/themes/stack_colors.dart';
-import 'package:stackwallet/utilities/assets.dart';
-import 'package:stackwallet/utilities/biometrics.dart';
-import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart';
-import 'package:stackwallet/utilities/text_styles.dart';
-import 'package:stackwallet/widgets/background.dart';
-import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
-import 'package:stackwallet/widgets/custom_pin_put/custom_pin_put.dart';
+import 'package:stackduo/notifications/show_flush_bar.dart';
+import 'package:stackduo/pages/home_view/home_view.dart';
+import 'package:stackduo/providers/global/prefs_provider.dart';
+import 'package:stackduo/providers/global/secure_store_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/assets.dart';
+import 'package:stackduo/utilities/biometrics.dart';
+import 'package:stackduo/utilities/flutter_secure_storage_interface.dart';
+import 'package:stackduo/utilities/text_styles.dart';
+import 'package:stackduo/widgets/background.dart';
+import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackduo/widgets/custom_pin_put/custom_pin_put.dart';
 
 class CreatePinView extends ConsumerStatefulWidget {
   const CreatePinView({

From 49e40af7d3487f7e92753942c3e2e573adca3d67 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 26 May 2023 17:18:39 -0600
Subject: [PATCH 53/87] untested protected rpc version

---
 lib/electrumx_rpc/rpc2.dart | 261 ++++++++++++++++++++++++++++++++++++
 1 file changed, 261 insertions(+)
 create mode 100644 lib/electrumx_rpc/rpc2.dart

diff --git a/lib/electrumx_rpc/rpc2.dart b/lib/electrumx_rpc/rpc2.dart
new file mode 100644
index 000000000..15d2076cc
--- /dev/null
+++ b/lib/electrumx_rpc/rpc2.dart
@@ -0,0 +1,261 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+import 'package:mutex/mutex.dart';
+import 'package:stackwallet/utilities/logger.dart';
+
+// hacky fix to receive large jsonrpc responses
+class JsonRPC {
+  JsonRPC({
+    required this.host,
+    required this.port,
+    this.useSSL = false,
+    this.connectionTimeout = const Duration(seconds: 60),
+  });
+  final bool useSSL;
+  final String host;
+  final int port;
+  final Duration connectionTimeout;
+
+  final _requestMutex = Mutex();
+  final _JsonRPCRequestQueue _requestQueue = _JsonRPCRequestQueue();
+  Socket? _socket;
+  StreamSubscription<Uint8List>? _subscription;
+
+  void _dataHandler(List<int> data) {
+    _requestQueue.nextIncompleteReq.then((req) {
+      if (req != null) {
+        req.appendDataAndCheckIfComplete(data);
+
+        if (req.isComplete) {
+          _onReqCompleted(req);
+        }
+      } else {
+        Logging.instance.log(
+          "_dataHandler found a null req!",
+          level: LogLevel.Warning,
+        );
+      }
+    });
+  }
+
+  void _errorHandler(Object error, StackTrace trace) {
+    _requestQueue.nextIncompleteReq.then((req) {
+      if (req != null) {
+        req.completer.completeError(error, trace);
+        _onReqCompleted(req);
+      } else {
+        Logging.instance.log(
+          "_errorHandler found a null req!",
+          level: LogLevel.Warning,
+        );
+      }
+    });
+  }
+
+  void _doneHandler() {
+    Logging.instance.log(
+      "JsonRPC doneHandler: "
+      "connection closed to $host:$port, destroying socket",
+      level: LogLevel.Info,
+    );
+
+    disconnect(reason: "JsonRPC _doneHandler() called");
+  }
+
+  void _onReqCompleted(_JsonRPCRequest req) {
+    _requestQueue.remove(req).then((value) {
+      if (kDebugMode) {
+        print("Request removed from queue: $value");
+      }
+      // attempt to send next request
+      _sendNextAvailableRequest();
+    });
+  }
+
+  void _sendNextAvailableRequest() {
+    _requestQueue.nextIncompleteReq.then((req) {
+      if (req != null) {
+        // \r\n required by electrumx server
+        _socket!.write('${req.jsonRequest}\r\n');
+
+        // TODO different timeout length?
+        req.initiateTimeout(const Duration(seconds: 10));
+      } else {
+        Logging.instance.log(
+          "_sendNextAvailableRequest found a null req!",
+          level: LogLevel.Warning,
+        );
+      }
+    });
+  }
+
+  // TODO: non dynamic type
+  Future<dynamic> request(String jsonRpcRequest) async {
+    await _requestMutex.protect(() async {
+      if (_socket == null) {
+        Logging.instance.log(
+          "JsonRPC request: opening socket $host:$port",
+          level: LogLevel.Info,
+        );
+        await connect();
+      }
+    });
+
+    final req = _JsonRPCRequest(
+      jsonRequest: jsonRpcRequest,
+      completer: Completer<dynamic>(),
+    );
+
+    // if this is the only/first request then send it right away
+    await _requestQueue.add(
+      req,
+      onInitialRequestAdded: _sendNextAvailableRequest,
+    );
+
+    return req.completer.future.onError(
+      (error, stackTrace) => Exception(
+        "return req.completer.future.onError: $error",
+      ),
+    );
+  }
+
+  Future<void> disconnect({String reason = "none"}) async {
+    await _requestMutex.protect(() async {
+      await _subscription?.cancel();
+      _subscription = null;
+      _socket?.destroy();
+      _socket = null;
+
+      // clean up remaining queue
+      await _requestQueue.completeRemainingWithError(
+        "JsonRPC disconnect() called with reason: \"$reason\"",
+      );
+    });
+  }
+
+  Future<void> connect() async {
+    if (_socket != null) {
+      throw Exception(
+        "JsonRPC attempted to connect to an already existing socket!",
+      );
+    }
+
+    if (useSSL) {
+      _socket = await SecureSocket.connect(
+        host,
+        port,
+        timeout: connectionTimeout,
+        onBadCertificate: (_) => true,
+      ); // TODO do not automatically trust bad certificates
+    } else {
+      _socket = await Socket.connect(
+        host,
+        port,
+        timeout: connectionTimeout,
+      );
+    }
+
+    _subscription = _socket!.listen(
+      _dataHandler,
+      onError: _errorHandler,
+      onDone: _doneHandler,
+      cancelOnError: true,
+    );
+  }
+}
+
+class _JsonRPCRequestQueue {
+  final m = Mutex();
+
+  final List<_JsonRPCRequest> _rq = [];
+
+  Future<void> add(
+    _JsonRPCRequest req, {
+    VoidCallback? onInitialRequestAdded,
+  }) async {
+    return await m.protect(() async {
+      _rq.add(req);
+      if (_rq.length == 1) {
+        onInitialRequestAdded?.call();
+      }
+    });
+  }
+
+  Future<bool> remove(_JsonRPCRequest req) async {
+    return await m.protect(() async => _rq.remove(req));
+  }
+
+  Future<_JsonRPCRequest?> get nextIncompleteReq async {
+    return await m.protect(() async {
+      try {
+        return _rq.firstWhere((e) => !e.isComplete);
+      } catch (_) {
+        // no incomplete requests found
+        return null;
+      }
+    });
+  }
+
+  Future<void> completeRemainingWithError(
+    String error, {
+    StackTrace? stackTrace,
+  }) async {
+    await m.protect(() async {
+      for (final req in _rq) {
+        if (!req.isComplete) {
+          req.completer.completeError(Exception(error), stackTrace);
+        }
+      }
+      _rq.clear();
+    });
+  }
+
+  Future<bool> get isEmpty async {
+    return await m.protect(() async {
+      return _rq.isEmpty;
+    });
+  }
+}
+
+class _JsonRPCRequest {
+  final String jsonRequest;
+  final Completer<dynamic> completer;
+  final List<int> _responseData = [];
+
+  _JsonRPCRequest({required this.jsonRequest, required this.completer});
+
+  void appendDataAndCheckIfComplete(List<int> data) {
+    _responseData.addAll(data);
+    // 0x0A is newline
+    // https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-basics.html
+    if (data.last == 0x0A) {
+      try {
+        final response = json.decode(String.fromCharCodes(_responseData));
+        completer.complete(response);
+      } catch (e, s) {
+        Logging.instance.log(
+          "JsonRPC json.decode: $e\n$s",
+          level: LogLevel.Error,
+        );
+        completer.completeError(e, s);
+      }
+    }
+  }
+
+  void initiateTimeout(Duration timeout) {
+    Future<void>.delayed(timeout).then((_) {
+      if (!isComplete) {
+        try {
+          throw Exception("_JsonRPCRequest timed out: $jsonRequest");
+        } catch (e, s) {
+          completer.completeError(e, s);
+        }
+      }
+    });
+  }
+
+  bool get isComplete => completer.isCompleted;
+}

From 05f0a727247adbd8a2e779f7f2f49a80fff31960 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 26 May 2023 17:45:14 -0600
Subject: [PATCH 54/87] update tests

---
 test/cached_electrumx_test.dart | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/test/cached_electrumx_test.dart b/test/cached_electrumx_test.dart
index c3df6c2e8..052bf87b2 100644
--- a/test/cached_electrumx_test.dart
+++ b/test/cached_electrumx_test.dart
@@ -142,11 +142,7 @@ void main() {
       useSSL: true,
     );
 
-    final client = CachedElectrumX.from(
-        node: node,
-        prefs: MockPrefs(),
-        failovers: [],
-        electrumXClient: MockElectrumX());
+    final client = CachedElectrumX.from(electrumXClient: MockElectrumX());
 
     expect(client, isA<CachedElectrumX>());
   });

From 3acb6f80b429531d40faf8d7d3ae177d14b2654e Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 29 May 2023 09:16:25 -0600
Subject: [PATCH 55/87] cleaned up electrumx rpc

---
 lib/electrumx_rpc/electrumx.dart |  27 ++--
 lib/electrumx_rpc/rpc.dart       | 262 ++++++++++++++++++-------------
 lib/electrumx_rpc/rpc2.dart      | 261 ------------------------------
 3 files changed, 173 insertions(+), 377 deletions(-)
 delete mode 100644 lib/electrumx_rpc/rpc2.dart

diff --git a/lib/electrumx_rpc/electrumx.dart b/lib/electrumx_rpc/electrumx.dart
index 1b7b7158e..78adc6cd5 100644
--- a/lib/electrumx_rpc/electrumx.dart
+++ b/lib/electrumx_rpc/electrumx.dart
@@ -132,13 +132,12 @@ class ElectrumX {
 
       final response = await _rpcClient!.request(jsonRequestString);
 
-      print("=================================================");
-      print("TYPE: ${response.runtimeType}");
-      print("RESPONSE: $response");
-      print("=================================================");
+      if (response.exception != null) {
+        throw response.exception!;
+      }
 
-      if (response["error"] != null) {
-        if (response["error"]
+      if (response.data["error"] != null) {
+        if (response.data["error"]
             .toString()
             .contains("No such mempool or blockchain transaction")) {
           throw NoSuchTransactionException(
@@ -148,11 +147,15 @@ class ElectrumX {
         }
 
         throw Exception(
-            "JSONRPC response     \ncommand: $command     \nargs: $args     \nerror: $response");
+          "JSONRPC response\n"
+          "     command: $command\n"
+          "     args: $args\n"
+          "     error: $response.data",
+        );
       }
 
       currentFailoverIndex = -1;
-      return response;
+      return response.data;
     } on WifiOnlyException {
       rethrow;
     } on SocketException {
@@ -233,7 +236,13 @@ class ElectrumX {
       // Logging.instance.log("batch request: $request");
 
       // send batch request
-      final response = (await _rpcClient!.request(request)) as List<dynamic>;
+      final jsonRpcResponse = (await _rpcClient!.request(request));
+
+      if (jsonRpcResponse.exception != null) {
+        throw jsonRpcResponse.exception!;
+      }
+
+      final response = jsonRpcResponse.data as List;
 
       // check for errors, format and throw if there are any
       final List<String> errors = [];
diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index a426b96b1..a62f7511d 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 
+import 'package:flutter/foundation.dart';
 import 'package:mutex/mutex.dart';
 import 'package:stackduo/utilities/logger.dart';
 
-// hacky fix to receive large jsonrpc responses
+// Json RPC class to handle connecting to electrumx servers
 class JsonRPC {
   JsonRPC({
     required this.host,
@@ -25,90 +25,60 @@ class JsonRPC {
   StreamSubscription<Uint8List>? _subscription;
 
   void _dataHandler(List<int> data) {
-    if (_requestQueue.isEmpty) {
-      // probably just return although this case should never actually hit
-      return;
-    }
-
-    final req = _requestQueue.next;
-    req.appendDataAndCheckIfComplete(data);
+    _requestQueue.nextIncompleteReq.then((req) {
+      if (req != null) {
+        req.appendDataAndCheckIfComplete(data);
 
-    if (req.isComplete) {
-      _onReqCompleted(req);
-    }
+        if (req.isComplete) {
+          _onReqCompleted(req);
+        }
+      } else {
+        Logging.instance.log(
+          "_dataHandler found a null req!",
+          level: LogLevel.Warning,
+        );
+      }
+    });
   }
 
   void _errorHandler(Object error, StackTrace trace) {
-    Logging.instance.log(
-      "JsonRPC errorHandler: $error\n$trace",
-      level: LogLevel.Error,
-    );
-
-    final req = _requestQueue.next;
-    req.completer.completeError(error, trace);
-    _onReqCompleted(req);
+    _requestQueue.nextIncompleteReq.then((req) {
+      if (req != null) {
+        req.completer.completeError(error, trace);
+        _onReqCompleted(req);
+      }
+    });
   }
 
   void _doneHandler() {
-    Logging.instance.log(
-      "JsonRPC doneHandler: "
-      "connection closed to $host:$port, destroying socket",
-      level: LogLevel.Info,
-    );
-
-    if (_requestQueue.isNotEmpty) {
-      Logging.instance.log(
-        "JsonRPC doneHandler: queue not empty but connection closed, "
-        "completing pending requests with errors",
-        level: LogLevel.Error,
-      );
-
-      for (final req in _requestQueue.queue) {
-        if (!req.isComplete) {
-          try {
-            throw Exception(
-              "JsonRPC doneHandler: socket closed "
-              "before request could complete",
-            );
-          } catch (e, s) {
-            req.completer.completeError(e, s);
-          }
-        }
-      }
-      _requestQueue.clear();
-    }
-
-    disconnect();
+    disconnect(reason: "JsonRPC _doneHandler() called");
   }
 
   void _onReqCompleted(_JsonRPCRequest req) {
-    _requestQueue.remove(req);
-    if (_requestQueue.isNotEmpty) {
+    _requestQueue.remove(req).then((_) {
+      // attempt to send next request
       _sendNextAvailableRequest();
-    }
+    });
   }
 
   void _sendNextAvailableRequest() {
-    if (_requestQueue.isEmpty) {
-      // TODO handle properly
-      throw Exception("JSON RPC queue empty");
-    }
-
-    final req = _requestQueue.next;
-
-    _socket!.write('${req.jsonRequest}\r\n');
-
-    req.initiateTimeout(const Duration(seconds: 10));
-    // Logging.instance.log(
-    //   "JsonRPC request: wrote request ${req.jsonRequest} "
-    //   "to socket $host:$port",
-    //   level: LogLevel.Info,
-    // );
+    _requestQueue.nextIncompleteReq.then((req) {
+      if (req != null) {
+        // \r\n required by electrumx server
+        _socket!.write('${req.jsonRequest}\r\n');
+
+        // TODO different timeout length?
+        req.initiateTimeout(
+          const Duration(seconds: 10),
+          onTimedOut: () {
+            _requestQueue.remove(req);
+          },
+        );
+      }
+    });
   }
 
-  Future<dynamic> request(String jsonRpcRequest) async {
-    // todo: handle this better?
-    // Do we need to check the subscription, too?
+  Future<JsonRPCResponse> request(String jsonRpcRequest) async {
     await _requestMutex.protect(() async {
       if (_socket == null) {
         Logging.instance.log(
@@ -121,51 +91,69 @@ class JsonRPC {
 
     final req = _JsonRPCRequest(
       jsonRequest: jsonRpcRequest,
-      completer: Completer<dynamic>(),
+      completer: Completer<JsonRPCResponse>(),
     );
 
-    _requestQueue.add(req);
+    final future = req.completer.future.onError(
+      (error, stackTrace) async {
+        await disconnect(
+          reason: "return req.completer.future.onError: $error\n$stackTrace",
+        );
+        return JsonRPCResponse(
+          exception: error is Exception
+              ? error
+              : Exception(
+                  "req.completer.future.onError: $error\n$stackTrace",
+                ),
+        );
+      },
+    );
 
     // if this is the only/first request then send it right away
-    if (_requestQueue.length == 1) {
-      _sendNextAvailableRequest();
-    } else {
-      // Logging.instance.log(
-      //   "JsonRPC request: queued request $jsonRpcRequest "
-      //   "to socket $host:$port",
-      //   level: LogLevel.Info,
-      // );
-    }
-
-    return req.completer.future.onError(
-      (error, stackTrace) =>
-          Exception("return req.completer.future.onError: $error"),
+    await _requestQueue.add(
+      req,
+      onInitialRequestAdded: _sendNextAvailableRequest,
     );
+
+    return future;
   }
 
-  void disconnect() {
-    // TODO: maybe clear req queue here and wrap in mutex?
-    _subscription?.cancel().then((_) => _subscription = null);
-    _socket?.destroy();
-    _socket = null;
+  Future<void> disconnect({required String reason}) async {
+    await _requestMutex.protect(() async {
+      await _subscription?.cancel();
+      _subscription = null;
+      _socket?.destroy();
+      _socket = null;
+
+      // clean up remaining queue
+      await _requestQueue.completeRemainingWithError(
+        "JsonRPC disconnect() called with reason: \"$reason\"",
+      );
+    });
   }
 
   Future<void> connect() async {
+    if (_socket != null) {
+      throw Exception(
+        "JsonRPC attempted to connect to an already existing socket!",
+      );
+    }
+
     if (useSSL) {
-      _socket ??= await SecureSocket.connect(
+      _socket = await SecureSocket.connect(
         host,
         port,
         timeout: connectionTimeout,
         onBadCertificate: (_) => true,
       ); // TODO do not automatically trust bad certificates
     } else {
-      _socket ??= await Socket.connect(
+      _socket = await Socket.connect(
         host,
         port,
         timeout: connectionTimeout,
       );
     }
-    await _subscription?.cancel();
+
     _subscription = _socket!.listen(
       _dataHandler,
       onError: _errorHandler,
@@ -176,36 +164,85 @@ class JsonRPC {
 }
 
 class _JsonRPCRequestQueue {
+  final _lock = Mutex();
   final List<_JsonRPCRequest> _rq = [];
 
-  void add(_JsonRPCRequest req) => _rq.add(req);
+  Future<void> add(
+    _JsonRPCRequest req, {
+    VoidCallback? onInitialRequestAdded,
+  }) async {
+    return await _lock.protect(() async {
+      _rq.add(req);
+      if (_rq.length == 1) {
+        onInitialRequestAdded?.call();
+      }
+    });
+  }
+
+  Future<bool> remove(_JsonRPCRequest req) async {
+    return await _lock.protect(() async {
+      final result = _rq.remove(req);
+      return result;
+    });
+  }
+
+  Future<_JsonRPCRequest?> get nextIncompleteReq async {
+    return await _lock.protect(() async {
+      int removeCount = 0;
+      _JsonRPCRequest? returnValue;
+      for (final req in _rq) {
+        if (req.isComplete) {
+          removeCount++;
+        } else {
+          returnValue = req;
+          break;
+        }
+      }
 
-  bool remove(_JsonRPCRequest req) => _rq.remove(req);
+      _rq.removeRange(0, removeCount);
 
-  void clear() => _rq.clear();
+      return returnValue;
+    });
+  }
 
-  bool get isEmpty => _rq.isEmpty;
-  bool get isNotEmpty => _rq.isNotEmpty;
-  int get length => _rq.length;
-  _JsonRPCRequest get next => _rq.first;
-  List<_JsonRPCRequest> get queue => _rq.toList(growable: false);
+  Future<void> completeRemainingWithError(
+    String error, {
+    StackTrace? stackTrace,
+  }) async {
+    await _lock.protect(() async {
+      for (final req in _rq) {
+        if (!req.isComplete) {
+          req.completer.completeError(Exception(error), stackTrace);
+        }
+      }
+      _rq.clear();
+    });
+  }
+
+  Future<bool> get isEmpty async {
+    return await _lock.protect(() async {
+      return _rq.isEmpty;
+    });
+  }
 }
 
 class _JsonRPCRequest {
+  // 0x0A is newline
+  // https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-basics.html
+  static const int separatorByte = 0x0A;
+
   final String jsonRequest;
-  final Completer<dynamic> completer;
+  final Completer<JsonRPCResponse> completer;
   final List<int> _responseData = [];
 
   _JsonRPCRequest({required this.jsonRequest, required this.completer});
 
   void appendDataAndCheckIfComplete(List<int> data) {
     _responseData.addAll(data);
-    // 0x0A is newline
-    // https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-basics.html
-    if (data.last == 0x0A) {
+    if (data.last == separatorByte) {
       try {
         final response = json.decode(String.fromCharCodes(_responseData));
-        completer.complete(response);
+        completer.complete(JsonRPCResponse(data: response));
       } catch (e, s) {
         Logging.instance.log(
           "JsonRPC json.decode: $e\n$s",
@@ -216,13 +253,17 @@ class _JsonRPCRequest {
     }
   }
 
-  void initiateTimeout(Duration timeout) {
+  void initiateTimeout(
+    Duration timeout, {
+    VoidCallback? onTimedOut,
+  }) {
     Future<void>.delayed(timeout).then((_) {
       if (!isComplete) {
         try {
           throw Exception("_JsonRPCRequest timed out: $jsonRequest");
         } catch (e, s) {
           completer.completeError(e, s);
+          onTimedOut?.call();
         }
       }
     });
@@ -230,3 +271,10 @@ class _JsonRPCRequest {
 
   bool get isComplete => completer.isCompleted;
 }
+
+class JsonRPCResponse {
+  final dynamic data;
+  final Exception? exception;
+
+  JsonRPCResponse({this.data, this.exception});
+}
diff --git a/lib/electrumx_rpc/rpc2.dart b/lib/electrumx_rpc/rpc2.dart
deleted file mode 100644
index 15d2076cc..000000000
--- a/lib/electrumx_rpc/rpc2.dart
+++ /dev/null
@@ -1,261 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:flutter/foundation.dart';
-import 'package:mutex/mutex.dart';
-import 'package:stackwallet/utilities/logger.dart';
-
-// hacky fix to receive large jsonrpc responses
-class JsonRPC {
-  JsonRPC({
-    required this.host,
-    required this.port,
-    this.useSSL = false,
-    this.connectionTimeout = const Duration(seconds: 60),
-  });
-  final bool useSSL;
-  final String host;
-  final int port;
-  final Duration connectionTimeout;
-
-  final _requestMutex = Mutex();
-  final _JsonRPCRequestQueue _requestQueue = _JsonRPCRequestQueue();
-  Socket? _socket;
-  StreamSubscription<Uint8List>? _subscription;
-
-  void _dataHandler(List<int> data) {
-    _requestQueue.nextIncompleteReq.then((req) {
-      if (req != null) {
-        req.appendDataAndCheckIfComplete(data);
-
-        if (req.isComplete) {
-          _onReqCompleted(req);
-        }
-      } else {
-        Logging.instance.log(
-          "_dataHandler found a null req!",
-          level: LogLevel.Warning,
-        );
-      }
-    });
-  }
-
-  void _errorHandler(Object error, StackTrace trace) {
-    _requestQueue.nextIncompleteReq.then((req) {
-      if (req != null) {
-        req.completer.completeError(error, trace);
-        _onReqCompleted(req);
-      } else {
-        Logging.instance.log(
-          "_errorHandler found a null req!",
-          level: LogLevel.Warning,
-        );
-      }
-    });
-  }
-
-  void _doneHandler() {
-    Logging.instance.log(
-      "JsonRPC doneHandler: "
-      "connection closed to $host:$port, destroying socket",
-      level: LogLevel.Info,
-    );
-
-    disconnect(reason: "JsonRPC _doneHandler() called");
-  }
-
-  void _onReqCompleted(_JsonRPCRequest req) {
-    _requestQueue.remove(req).then((value) {
-      if (kDebugMode) {
-        print("Request removed from queue: $value");
-      }
-      // attempt to send next request
-      _sendNextAvailableRequest();
-    });
-  }
-
-  void _sendNextAvailableRequest() {
-    _requestQueue.nextIncompleteReq.then((req) {
-      if (req != null) {
-        // \r\n required by electrumx server
-        _socket!.write('${req.jsonRequest}\r\n');
-
-        // TODO different timeout length?
-        req.initiateTimeout(const Duration(seconds: 10));
-      } else {
-        Logging.instance.log(
-          "_sendNextAvailableRequest found a null req!",
-          level: LogLevel.Warning,
-        );
-      }
-    });
-  }
-
-  // TODO: non dynamic type
-  Future<dynamic> request(String jsonRpcRequest) async {
-    await _requestMutex.protect(() async {
-      if (_socket == null) {
-        Logging.instance.log(
-          "JsonRPC request: opening socket $host:$port",
-          level: LogLevel.Info,
-        );
-        await connect();
-      }
-    });
-
-    final req = _JsonRPCRequest(
-      jsonRequest: jsonRpcRequest,
-      completer: Completer<dynamic>(),
-    );
-
-    // if this is the only/first request then send it right away
-    await _requestQueue.add(
-      req,
-      onInitialRequestAdded: _sendNextAvailableRequest,
-    );
-
-    return req.completer.future.onError(
-      (error, stackTrace) => Exception(
-        "return req.completer.future.onError: $error",
-      ),
-    );
-  }
-
-  Future<void> disconnect({String reason = "none"}) async {
-    await _requestMutex.protect(() async {
-      await _subscription?.cancel();
-      _subscription = null;
-      _socket?.destroy();
-      _socket = null;
-
-      // clean up remaining queue
-      await _requestQueue.completeRemainingWithError(
-        "JsonRPC disconnect() called with reason: \"$reason\"",
-      );
-    });
-  }
-
-  Future<void> connect() async {
-    if (_socket != null) {
-      throw Exception(
-        "JsonRPC attempted to connect to an already existing socket!",
-      );
-    }
-
-    if (useSSL) {
-      _socket = await SecureSocket.connect(
-        host,
-        port,
-        timeout: connectionTimeout,
-        onBadCertificate: (_) => true,
-      ); // TODO do not automatically trust bad certificates
-    } else {
-      _socket = await Socket.connect(
-        host,
-        port,
-        timeout: connectionTimeout,
-      );
-    }
-
-    _subscription = _socket!.listen(
-      _dataHandler,
-      onError: _errorHandler,
-      onDone: _doneHandler,
-      cancelOnError: true,
-    );
-  }
-}
-
-class _JsonRPCRequestQueue {
-  final m = Mutex();
-
-  final List<_JsonRPCRequest> _rq = [];
-
-  Future<void> add(
-    _JsonRPCRequest req, {
-    VoidCallback? onInitialRequestAdded,
-  }) async {
-    return await m.protect(() async {
-      _rq.add(req);
-      if (_rq.length == 1) {
-        onInitialRequestAdded?.call();
-      }
-    });
-  }
-
-  Future<bool> remove(_JsonRPCRequest req) async {
-    return await m.protect(() async => _rq.remove(req));
-  }
-
-  Future<_JsonRPCRequest?> get nextIncompleteReq async {
-    return await m.protect(() async {
-      try {
-        return _rq.firstWhere((e) => !e.isComplete);
-      } catch (_) {
-        // no incomplete requests found
-        return null;
-      }
-    });
-  }
-
-  Future<void> completeRemainingWithError(
-    String error, {
-    StackTrace? stackTrace,
-  }) async {
-    await m.protect(() async {
-      for (final req in _rq) {
-        if (!req.isComplete) {
-          req.completer.completeError(Exception(error), stackTrace);
-        }
-      }
-      _rq.clear();
-    });
-  }
-
-  Future<bool> get isEmpty async {
-    return await m.protect(() async {
-      return _rq.isEmpty;
-    });
-  }
-}
-
-class _JsonRPCRequest {
-  final String jsonRequest;
-  final Completer<dynamic> completer;
-  final List<int> _responseData = [];
-
-  _JsonRPCRequest({required this.jsonRequest, required this.completer});
-
-  void appendDataAndCheckIfComplete(List<int> data) {
-    _responseData.addAll(data);
-    // 0x0A is newline
-    // https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-basics.html
-    if (data.last == 0x0A) {
-      try {
-        final response = json.decode(String.fromCharCodes(_responseData));
-        completer.complete(response);
-      } catch (e, s) {
-        Logging.instance.log(
-          "JsonRPC json.decode: $e\n$s",
-          level: LogLevel.Error,
-        );
-        completer.completeError(e, s);
-      }
-    }
-  }
-
-  void initiateTimeout(Duration timeout) {
-    Future<void>.delayed(timeout).then((_) {
-      if (!isComplete) {
-        try {
-          throw Exception("_JsonRPCRequest timed out: $jsonRequest");
-        } catch (e, s) {
-          completer.completeError(e, s);
-        }
-      }
-    });
-  }
-
-  bool get isComplete => completer.isCompleted;
-}

From 4eaf3bd8148ddbba99e63f62a46fee9bba1b610b Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 29 May 2023 09:54:14 -0600
Subject: [PATCH 56/87] fix: bug in setting _isConnected as well as adding call
 to refresh on reconnection established

---
 lib/services/coins/bitcoin/bitcoin_wallet.dart | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/services/coins/bitcoin/bitcoin_wallet.dart b/lib/services/coins/bitcoin/bitcoin_wallet.dart
index 2278588ec..0fa906a9e 100644
--- a/lib/services/coins/bitcoin/bitcoin_wallet.dart
+++ b/lib/services/coins/bitcoin/bitcoin_wallet.dart
@@ -1201,13 +1201,18 @@ class BitcoinWallet extends CoinServiceAPI
 
   void _periodicPingCheck() async {
     bool hasNetwork = await testNetworkConnection();
-    _isConnected = hasNetwork;
+
     if (_isConnected != hasNetwork) {
       NodeConnectionStatus status = hasNetwork
           ? NodeConnectionStatus.connected
           : NodeConnectionStatus.disconnected;
       GlobalEventBus.instance
           .fire(NodeConnectionStatusChangedEvent(status, walletId, coin));
+
+      _isConnected = hasNetwork;
+      if (hasNetwork) {
+        unawaited(refresh());
+      }
     }
   }
 

From 1e68d3d6e85cbc4b625ef45076ef16641b0b0b94 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 29 May 2023 10:30:41 -0600
Subject: [PATCH 57/87] fix: update electrumx tests

---
 test/electrumx_test.dart                      |  233 +-
 test/electrumx_test.mocks.dart                |   76 +-
 .../notification_card_test.mocks.dart         |  131 ++
 .../pages/send_view/send_view_test.mocks.dart |  190 +-
 ...allet_settings_view_screen_test.mocks.dart |  438 ++--
 .../bitcoin/bitcoin_wallet_test.mocks.dart    |  226 +-
 .../bitcoincash_wallet_test.mocks.dart        |  564 +++++
 .../dogecoin/dogecoin_wallet_test.mocks.dart  |  564 +++++
 .../coins/firo/firo_wallet_test.mocks.dart    | 1152 ++++++++++
 test/services/coins/manager_test.mocks.dart   | 1575 +++++--------
 .../namecoin/namecoin_wallet_test.mocks.dart  |  564 +++++
 .../particl/particl_wallet_test.mocks.dart    |  564 +++++
 .../favorite_toggle_test.mocks.dart           |  131 ++
 .../custom_loading_overlay_test.mocks.dart    |  131 ++
 .../desktop/desktop_scaffold_test.mocks.dart  |  131 ++
 .../managed_favorite_test.mocks.dart          |  210 +-
 .../table_view/table_view_row_test.mocks.dart |  328 ++-
 test/widget_tests/trade_card_test.mocks.dart  |  131 ++
 .../transaction_card_test.mocks.dart          | 2003 +++++++++++++----
 test/widget_tests/wallet_card_test.mocks.dart | 1861 +++++++++++++++
 .../wallet_info_row_test.mocks.dart           |  364 ++-
 21 files changed, 9450 insertions(+), 2117 deletions(-)
 create mode 100644 test/notifications/notification_card_test.mocks.dart
 create mode 100644 test/services/coins/bitcoincash/bitcoincash_wallet_test.mocks.dart
 create mode 100644 test/services/coins/dogecoin/dogecoin_wallet_test.mocks.dart
 create mode 100644 test/services/coins/firo/firo_wallet_test.mocks.dart
 create mode 100644 test/services/coins/namecoin/namecoin_wallet_test.mocks.dart
 create mode 100644 test/services/coins/particl/particl_wallet_test.mocks.dart
 create mode 100644 test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart
 create mode 100644 test/widget_tests/custom_loading_overlay_test.mocks.dart
 create mode 100644 test/widget_tests/desktop/desktop_scaffold_test.mocks.dart
 create mode 100644 test/widget_tests/trade_card_test.mocks.dart
 create mode 100644 test/widget_tests/wallet_card_test.mocks.dart

diff --git a/test/electrumx_test.dart b/test/electrumx_test.dart
index 3ae162529..8d29f63e9 100644
--- a/test/electrumx_test.dart
+++ b/test/electrumx_test.dart
@@ -57,16 +57,18 @@ void main() {
     const jsonArgs = '["",true]';
     when(
       mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+        '{"jsonrpc": "2.0", "id": "some requestId",'
+        '"method": "$command","params": $jsonArgs}',
+      ),
     ).thenAnswer(
-      (_) async => {
+      (_) async => JsonRPCResponse(data: {
         "jsonrpc": "2.0",
         "error": {
           "code": 1,
           "message": "None should be a transaction hash",
         },
         "id": "some requestId",
-      },
+      }),
     );
 
     final mockPrefs = MockPrefs();
@@ -93,13 +95,15 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": {"height": 520481, "hex": "some block hex string"},
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -126,7 +130,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -153,9 +159,15 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {"jsonrpc": "2.0", "result": null, "id": "some requestId"},
+        (_) async => JsonRPCResponse(data: {
+          "jsonrpc": "2.0",
+          "result": null,
+          "id": "some requestId",
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -181,7 +193,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -208,9 +222,11 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": {
             "genesis_hash":
@@ -225,7 +241,7 @@ void main() {
             "hash_function": "sha256"
           },
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -263,7 +279,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -290,13 +308,15 @@ void main() {
       const jsonArgs = '["some raw transaction string"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": "the txid of the rawtx",
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -323,7 +343,9 @@ void main() {
       const jsonArgs = '["some raw transaction string"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -353,16 +375,18 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": {
             "confirmed": 103873966,
             "unconfirmed": 23684400,
           },
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -389,7 +413,9 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -418,9 +444,11 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": [
             {
@@ -435,7 +463,7 @@ void main() {
             }
           ],
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -473,7 +501,9 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -502,9 +532,11 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": [
             {
@@ -523,7 +555,7 @@ void main() {
             }
           ],
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -565,7 +597,9 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -594,13 +628,15 @@ void main() {
       const jsonArgs = '["${SampleGetTransactionData.txHash0}",true]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": SampleGetTransactionData.txData0,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -629,7 +665,9 @@ void main() {
       const jsonArgs = '["${SampleGetTransactionData.txHash0}",true]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -659,13 +697,15 @@ void main() {
       const jsonArgs = '["1",""]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": GetAnonymitySetSampleData.data,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -692,7 +732,9 @@ void main() {
       const jsonArgs = '["1",""]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -721,13 +763,15 @@ void main() {
       const jsonArgs = '["some mints"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": "mint meta data",
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -754,7 +798,9 @@ void main() {
       const jsonArgs = '["some mints"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -783,13 +829,15 @@ void main() {
       const jsonArgs = '["0"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": GetUsedSerialsSampleData.serials,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -816,7 +864,9 @@ void main() {
       const jsonArgs = '["0"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -845,9 +895,15 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {"jsonrpc": "2.0", "result": 1, "id": "some requestId"},
+        (_) async => JsonRPCResponse(data: {
+          "jsonrpc": "2.0",
+          "result": 1,
+          "id": "some requestId",
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -873,7 +929,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -886,7 +944,10 @@ void main() {
           prefs: mockPrefs,
           failovers: []);
 
-      expect(() => client.getLatestCoinId(requestID: "some requestId"),
+      expect(
+          () => client.getLatestCoinId(
+                requestID: "some requestId",
+              ),
           throwsA(isA<Exception>()));
       verify(mockPrefs.wifiOnly).called(1);
       verifyNoMoreInteractions(mockPrefs);
@@ -900,13 +961,15 @@ void main() {
       const jsonArgs = '["1",""]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": GetAnonymitySetSampleData.data,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -933,7 +996,9 @@ void main() {
       const jsonArgs = '["1",""]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -947,8 +1012,10 @@ void main() {
           failovers: []);
 
       expect(
-          () =>
-              client.getAnonymitySet(groupId: "1", requestID: "some requestId"),
+          () => client.getAnonymitySet(
+                groupId: "1",
+                requestID: "some requestId",
+              ),
           throwsA(isA<Exception>()));
       verify(mockPrefs.wifiOnly).called(1);
       verifyNoMoreInteractions(mockPrefs);
@@ -962,13 +1029,15 @@ void main() {
       const jsonArgs = '["some mints"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": "mint meta data",
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -995,7 +1064,9 @@ void main() {
       const jsonArgs = '["some mints"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -1010,7 +1081,9 @@ void main() {
 
       expect(
           () => client.getMintData(
-              mints: "some mints", requestID: "some requestId"),
+                mints: "some mints",
+                requestID: "some requestId",
+              ),
           throwsA(isA<Exception>()));
       verify(mockPrefs.wifiOnly).called(1);
       verifyNoMoreInteractions(mockPrefs);
@@ -1024,13 +1097,15 @@ void main() {
       const jsonArgs = '["0"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": GetUsedSerialsSampleData.serials,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -1057,7 +1132,9 @@ void main() {
       const jsonArgs = '["0"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -1086,9 +1163,15 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {"jsonrpc": "2.0", "result": 1, "id": "some requestId"},
+        (_) async => JsonRPCResponse(data: {
+          "jsonrpc": "2.0",
+          "result": 1,
+          "id": "some requestId",
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -1114,7 +1197,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -1141,15 +1226,17 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": {
             "rate": 1000,
           },
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -1175,7 +1262,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
diff --git a/test/electrumx_test.mocks.dart b/test/electrumx_test.mocks.dart
index 2f3abf347..8c9649d20 100644
--- a/test/electrumx_test.mocks.dart
+++ b/test/electrumx_test.mocks.dart
@@ -33,6 +33,17 @@ class _FakeDuration_0 extends _i1.SmartFake implements Duration {
         );
 }
 
+class _FakeJsonRPCResponse_1 extends _i1.SmartFake
+    implements _i2.JsonRPCResponse {
+  _FakeJsonRPCResponse_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
 /// A class which mocks [JsonRPC].
 ///
 /// See the documentation for Mockito's code generation for more information.
@@ -47,40 +58,16 @@ class MockJsonRPC extends _i1.Mock implements _i2.JsonRPC {
         returnValue: false,
       ) as bool);
   @override
-  set useSSL(bool? _useSSL) => super.noSuchMethod(
-        Invocation.setter(
-          #useSSL,
-          _useSSL,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
       ) as String);
   @override
-  set host(String? _host) => super.noSuchMethod(
-        Invocation.setter(
-          #host,
-          _host,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
   int get port => (super.noSuchMethod(
         Invocation.getter(#port),
         returnValue: 0,
       ) as int);
   @override
-  set port(int? _port) => super.noSuchMethod(
-        Invocation.setter(
-          #port,
-          _port,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
   Duration get connectionTimeout => (super.noSuchMethod(
         Invocation.getter(#connectionTimeout),
         returnValue: _FakeDuration_0(
@@ -89,21 +76,40 @@ class MockJsonRPC extends _i1.Mock implements _i2.JsonRPC {
         ),
       ) as Duration);
   @override
-  set connectionTimeout(Duration? _connectionTimeout) => super.noSuchMethod(
-        Invocation.setter(
-          #connectionTimeout,
-          _connectionTimeout,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i3.Future<dynamic> request(String? jsonRpcRequest) => (super.noSuchMethod(
+  _i3.Future<_i2.JsonRPCResponse> request(String? jsonRpcRequest) =>
+      (super.noSuchMethod(
         Invocation.method(
           #request,
           [jsonRpcRequest],
         ),
-        returnValue: _i3.Future<dynamic>.value(),
-      ) as _i3.Future<dynamic>);
+        returnValue:
+            _i3.Future<_i2.JsonRPCResponse>.value(_FakeJsonRPCResponse_1(
+          this,
+          Invocation.method(
+            #request,
+            [jsonRpcRequest],
+          ),
+        )),
+      ) as _i3.Future<_i2.JsonRPCResponse>);
+  @override
+  _i3.Future<void> disconnect({required String? reason}) => (super.noSuchMethod(
+        Invocation.method(
+          #disconnect,
+          [],
+          {#reason: reason},
+        ),
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
+  @override
+  _i3.Future<void> connect() => (super.noSuchMethod(
+        Invocation.method(
+          #connect,
+          [],
+        ),
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 }
 
 /// A class which mocks [Prefs].
diff --git a/test/notifications/notification_card_test.mocks.dart b/test/notifications/notification_card_test.mocks.dart
new file mode 100644
index 000000000..bb8b8ae74
--- /dev/null
+++ b/test/notifications/notification_card_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/notifications/notification_card_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/pages/send_view/send_view_test.mocks.dart b/test/pages/send_view/send_view_test.mocks.dart
index 60041c9d9..2276836ce 100644
--- a/test/pages/send_view/send_view_test.mocks.dart
+++ b/test/pages/send_view/send_view_test.mocks.dart
@@ -1,5 +1,5 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/pages/send_view/send_view_test.dart.
+// in stackwallet/test/pages/send_view/send_view_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
@@ -13,30 +13,33 @@ import 'package:bitcoindart/bitcoindart.dart' as _i14;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i13;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i11;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i10;
-import 'package:stackduo/models/balance.dart' as _i12;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i18;
-import 'package:stackduo/models/node_model.dart' as _i26;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i9;
-import 'package:stackduo/models/signing_data.dart' as _i29;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i27;
-import 'package:stackduo/services/coins/coin_service.dart' as _i20;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/locale_service.dart' as _i31;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i8;
-import 'package:stackduo/services/wallets.dart' as _i21;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i15;
-import 'package:stackduo/utilities/enums/backup_frequency_type.dart' as _i33;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i28;
-import 'package:stackduo/utilities/enums/sync_type_enum.dart' as _i32;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
+import 'package:stackwallet/db/isar/main_db.dart' as _i13;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i11;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i10;
+import 'package:stackwallet/models/balance.dart' as _i12;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i18;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i33;
+import 'package:stackwallet/models/node_model.dart' as _i26;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i9;
+import 'package:stackwallet/models/signing_data.dart' as _i29;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i27;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i20;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/locale_service.dart' as _i31;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i8;
+import 'package:stackwallet/services/wallets.dart' as _i21;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i32;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i15;
+import 'package:stackwallet/utilities/enums/backup_frequency_type.dart' as _i35;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i22;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i28;
+import 'package:stackwallet/utilities/enums/sync_type_enum.dart' as _i34;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
     as _i7;
-import 'package:stackduo/utilities/prefs.dart' as _i24;
+import 'package:stackwallet/utilities/prefs.dart' as _i24;
 import 'package:tuple/tuple.dart' as _i16;
 
 // ignore_for_file: type=lint
@@ -1647,6 +1650,25 @@ class MockBitcoinWallet extends _i1.Mock implements _i27.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i23.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
   void initWalletDB({_i13.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
@@ -2205,6 +2227,105 @@ class MockLocaleService extends _i1.Mock implements _i31.LocaleService {
       );
 }
 
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i32.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i13.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_10(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i13.MainDB);
+  @override
+  List<_i33.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i33.StackTheme>[],
+      ) as List<_i33.StackTheme>);
+  @override
+  void init(_i13.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i23.Future<void> install({required _i30.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<bool>.value(false),
+      ) as _i23.Future<bool>);
+  @override
+  _i23.Future<List<_i32.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i23.Future<List<_i32.StackThemeMetaData>>.value(
+            <_i32.StackThemeMetaData>[]),
+      ) as _i23.Future<List<_i32.StackThemeMetaData>>);
+  @override
+  _i23.Future<_i30.Uint8List> fetchTheme(
+          {required _i32.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i23.Future<_i30.Uint8List>.value(_i30.Uint8List(0)),
+      ) as _i23.Future<_i30.Uint8List>);
+  @override
+  _i33.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i33.StackTheme?);
+}
+
 /// A class which mocks [Prefs].
 ///
 /// See the documentation for Mockito's code generation for more information.
@@ -2264,12 +2385,12 @@ class MockPrefs extends _i1.Mock implements _i24.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  _i32.SyncingType get syncType => (super.noSuchMethod(
+  _i34.SyncingType get syncType => (super.noSuchMethod(
         Invocation.getter(#syncType),
-        returnValue: _i32.SyncingType.currentWalletOnly,
-      ) as _i32.SyncingType);
+        returnValue: _i34.SyncingType.currentWalletOnly,
+      ) as _i34.SyncingType);
   @override
-  set syncType(_i32.SyncingType? syncType) => super.noSuchMethod(
+  set syncType(_i34.SyncingType? syncType) => super.noSuchMethod(
         Invocation.setter(
           #syncType,
           syncType,
@@ -2415,12 +2536,12 @@ class MockPrefs extends _i1.Mock implements _i24.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  _i33.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
+  _i35.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
         Invocation.getter(#backupFrequencyType),
-        returnValue: _i33.BackupFrequencyType.everyTenMinutes,
-      ) as _i33.BackupFrequencyType);
+        returnValue: _i35.BackupFrequencyType.everyTenMinutes,
+      ) as _i35.BackupFrequencyType);
   @override
-  set backupFrequencyType(_i33.BackupFrequencyType? backupFrequencyType) =>
+  set backupFrequencyType(_i35.BackupFrequencyType? backupFrequencyType) =>
       super.noSuchMethod(
         Invocation.setter(
           #backupFrequencyType,
@@ -2787,6 +2908,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
diff --git a/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
index db4ad51c9..df8c7958c 100644
--- a/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
@@ -1,26 +1,25 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.dart.
+// in stackwallet/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i9;
-import 'dart:ui' as _i15;
+import 'dart:async' as _i8;
+import 'dart:ui' as _i14;
 
-import 'package:local_auth/auth_strings.dart' as _i12;
-import 'package:local_auth/local_auth.dart' as _i11;
+import 'package:local_auth/auth_strings.dart' as _i11;
+import 'package:local_auth/local_auth.dart' as _i10;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i7;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i8;
-import 'package:stackduo/models/balance.dart' as _i5;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/models.dart' as _i4;
-import 'package:stackduo/services/coins/coin_service.dart' as _i3;
-import 'package:stackduo/services/coins/manager.dart' as _i16;
-import 'package:stackduo/services/wallets_service.dart' as _i14;
-import 'package:stackduo/utilities/amount/amount.dart' as _i6;
-import 'package:stackduo/utilities/biometrics.dart' as _i13;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i10;
-import 'package:stackduo/utilities/prefs.dart' as _i2;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i7;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i2;
+import 'package:stackwallet/models/balance.dart' as _i5;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i16;
+import 'package:stackwallet/models/models.dart' as _i4;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i3;
+import 'package:stackwallet/services/coins/manager.dart' as _i15;
+import 'package:stackwallet/services/wallets_service.dart' as _i13;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i6;
+import 'package:stackwallet/utilities/biometrics.dart' as _i12;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i9;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -33,8 +32,8 @@ import 'package:stackduo/utilities/prefs.dart' as _i2;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakePrefs_0 extends _i1.SmartFake implements _i2.Prefs {
-  _FakePrefs_0(
+class _FakeElectrumX_0 extends _i1.SmartFake implements _i2.ElectrumX {
+  _FakeElectrumX_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -93,38 +92,18 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
   }
 
   @override
-  String get server => (super.noSuchMethod(
-        Invocation.getter(#server),
-        returnValue: '',
-      ) as String);
-  @override
-  int get port => (super.noSuchMethod(
-        Invocation.getter(#port),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get useSSL => (super.noSuchMethod(
-        Invocation.getter(#useSSL),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i2.Prefs get prefs => (super.noSuchMethod(
-        Invocation.getter(#prefs),
-        returnValue: _FakePrefs_0(
+  _i2.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_0(
           this,
-          Invocation.getter(#prefs),
+          Invocation.getter(#electrumXClient),
         ),
-      ) as _i2.Prefs);
-  @override
-  List<_i8.ElectrumXNode> get failovers => (super.noSuchMethod(
-        Invocation.getter(#failovers),
-        returnValue: <_i8.ElectrumXNode>[],
-      ) as List<_i8.ElectrumXNode>);
+      ) as _i2.ElectrumX);
   @override
-  _i9.Future<Map<String, dynamic>> getAnonymitySet({
+  _i8.Future<Map<String, dynamic>> getAnonymitySet({
     required String? groupId,
     String? blockhash = r'',
-    required _i10.Coin? coin,
+    required _i9.Coin? coin,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -137,8 +116,8 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
           },
         ),
         returnValue:
-            _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i9.Future<Map<String, dynamic>>);
+            _i8.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i8.Future<Map<String, dynamic>>);
   @override
   String base64ToHex(String? source) => (super.noSuchMethod(
         Invocation.method(
@@ -156,9 +135,9 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
         returnValue: '',
       ) as String);
   @override
-  _i9.Future<Map<String, dynamic>> getTransaction({
+  _i8.Future<Map<String, dynamic>> getTransaction({
     required String? txHash,
-    required _i10.Coin? coin,
+    required _i9.Coin? coin,
     bool? verbose = true,
   }) =>
       (super.noSuchMethod(
@@ -172,11 +151,11 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
           },
         ),
         returnValue:
-            _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i9.Future<Map<String, dynamic>>);
+            _i8.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i8.Future<Map<String, dynamic>>);
   @override
-  _i9.Future<List<dynamic>> getUsedCoinSerials({
-    required _i10.Coin? coin,
+  _i8.Future<List<String>> getUsedCoinSerials({
+    required _i9.Coin? coin,
     int? startNumber = 0,
   }) =>
       (super.noSuchMethod(
@@ -188,43 +167,43 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
             #startNumber: startNumber,
           },
         ),
-        returnValue: _i9.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i9.Future<List<dynamic>>);
+        returnValue: _i8.Future<List<String>>.value(<String>[]),
+      ) as _i8.Future<List<String>>);
   @override
-  _i9.Future<void> clearSharedTransactionCache({required _i10.Coin? coin}) =>
+  _i8.Future<void> clearSharedTransactionCache({required _i9.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #clearSharedTransactionCache,
           [],
           {#coin: coin},
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
 }
 
 /// A class which mocks [LocalAuthentication].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockLocalAuthentication extends _i1.Mock
-    implements _i11.LocalAuthentication {
+    implements _i10.LocalAuthentication {
   MockLocalAuthentication() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i9.Future<bool> get canCheckBiometrics => (super.noSuchMethod(
+  _i8.Future<bool> get canCheckBiometrics => (super.noSuchMethod(
         Invocation.getter(#canCheckBiometrics),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<bool> authenticateWithBiometrics({
+  _i8.Future<bool> authenticateWithBiometrics({
     required String? localizedReason,
     bool? useErrorDialogs = true,
     bool? stickyAuth = false,
-    _i12.AndroidAuthMessages? androidAuthStrings =
-        const _i12.AndroidAuthMessages(),
-    _i12.IOSAuthMessages? iOSAuthStrings = const _i12.IOSAuthMessages(),
+    _i11.AndroidAuthMessages? androidAuthStrings =
+        const _i11.AndroidAuthMessages(),
+    _i11.IOSAuthMessages? iOSAuthStrings = const _i11.IOSAuthMessages(),
     bool? sensitiveTransaction = true,
   }) =>
       (super.noSuchMethod(
@@ -240,16 +219,16 @@ class MockLocalAuthentication extends _i1.Mock
             #sensitiveTransaction: sensitiveTransaction,
           },
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<bool> authenticate({
+  _i8.Future<bool> authenticate({
     required String? localizedReason,
     bool? useErrorDialogs = true,
     bool? stickyAuth = false,
-    _i12.AndroidAuthMessages? androidAuthStrings =
-        const _i12.AndroidAuthMessages(),
-    _i12.IOSAuthMessages? iOSAuthStrings = const _i12.IOSAuthMessages(),
+    _i11.AndroidAuthMessages? androidAuthStrings =
+        const _i11.AndroidAuthMessages(),
+    _i11.IOSAuthMessages? iOSAuthStrings = const _i11.IOSAuthMessages(),
     bool? sensitiveTransaction = true,
     bool? biometricOnly = false,
   }) =>
@@ -267,46 +246,46 @@ class MockLocalAuthentication extends _i1.Mock
             #biometricOnly: biometricOnly,
           },
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<bool> stopAuthentication() => (super.noSuchMethod(
+  _i8.Future<bool> stopAuthentication() => (super.noSuchMethod(
         Invocation.method(
           #stopAuthentication,
           [],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<bool> isDeviceSupported() => (super.noSuchMethod(
+  _i8.Future<bool> isDeviceSupported() => (super.noSuchMethod(
         Invocation.method(
           #isDeviceSupported,
           [],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<List<_i11.BiometricType>> getAvailableBiometrics() =>
+  _i8.Future<List<_i10.BiometricType>> getAvailableBiometrics() =>
       (super.noSuchMethod(
         Invocation.method(
           #getAvailableBiometrics,
           [],
         ),
         returnValue:
-            _i9.Future<List<_i11.BiometricType>>.value(<_i11.BiometricType>[]),
-      ) as _i9.Future<List<_i11.BiometricType>>);
+            _i8.Future<List<_i10.BiometricType>>.value(<_i10.BiometricType>[]),
+      ) as _i8.Future<List<_i10.BiometricType>>);
 }
 
 /// A class which mocks [Biometrics].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBiometrics extends _i1.Mock implements _i13.Biometrics {
+class MockBiometrics extends _i1.Mock implements _i12.Biometrics {
   MockBiometrics() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i9.Future<bool> authenticate({
+  _i8.Future<bool> authenticate({
     required String? cancelButtonText,
     required String? localizedReason,
     required String? title,
@@ -321,28 +300,28 @@ class MockBiometrics extends _i1.Mock implements _i13.Biometrics {
             #title: title,
           },
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
 }
 
 /// A class which mocks [WalletsService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
+class MockWalletsService extends _i1.Mock implements _i13.WalletsService {
   @override
-  _i9.Future<Map<String, _i14.WalletInfo>> get walletNames =>
+  _i8.Future<Map<String, _i13.WalletInfo>> get walletNames =>
       (super.noSuchMethod(
         Invocation.getter(#walletNames),
-        returnValue: _i9.Future<Map<String, _i14.WalletInfo>>.value(
-            <String, _i14.WalletInfo>{}),
-      ) as _i9.Future<Map<String, _i14.WalletInfo>>);
+        returnValue: _i8.Future<Map<String, _i13.WalletInfo>>.value(
+            <String, _i13.WalletInfo>{}),
+      ) as _i8.Future<Map<String, _i13.WalletInfo>>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
   @override
-  _i9.Future<bool> renameWallet({
+  _i8.Future<bool> renameWallet({
     required String? from,
     required String? to,
     required bool? shouldNotifyListeners,
@@ -357,21 +336,21 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             #shouldNotifyListeners: shouldNotifyListeners,
           },
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  Map<String, _i14.WalletInfo> fetchWalletsData() => (super.noSuchMethod(
+  Map<String, _i13.WalletInfo> fetchWalletsData() => (super.noSuchMethod(
         Invocation.method(
           #fetchWalletsData,
           [],
         ),
-        returnValue: <String, _i14.WalletInfo>{},
-      ) as Map<String, _i14.WalletInfo>);
+        returnValue: <String, _i13.WalletInfo>{},
+      ) as Map<String, _i13.WalletInfo>);
   @override
-  _i9.Future<void> addExistingStackWallet({
+  _i8.Future<void> addExistingStackWallet({
     required String? name,
     required String? walletId,
-    required _i10.Coin? coin,
+    required _i9.Coin? coin,
     required bool? shouldNotifyListeners,
   }) =>
       (super.noSuchMethod(
@@ -385,13 +364,13 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             #shouldNotifyListeners: shouldNotifyListeners,
           },
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<String?> addNewWallet({
+  _i8.Future<String?> addNewWallet({
     required String? name,
-    required _i10.Coin? coin,
+    required _i9.Coin? coin,
     required bool? shouldNotifyListeners,
   }) =>
       (super.noSuchMethod(
@@ -404,46 +383,46 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             #shouldNotifyListeners: shouldNotifyListeners,
           },
         ),
-        returnValue: _i9.Future<String?>.value(),
-      ) as _i9.Future<String?>);
+        returnValue: _i8.Future<String?>.value(),
+      ) as _i8.Future<String?>);
   @override
-  _i9.Future<List<String>> getFavoriteWalletIds() => (super.noSuchMethod(
+  _i8.Future<List<String>> getFavoriteWalletIds() => (super.noSuchMethod(
         Invocation.method(
           #getFavoriteWalletIds,
           [],
         ),
-        returnValue: _i9.Future<List<String>>.value(<String>[]),
-      ) as _i9.Future<List<String>>);
+        returnValue: _i8.Future<List<String>>.value(<String>[]),
+      ) as _i8.Future<List<String>>);
   @override
-  _i9.Future<void> saveFavoriteWalletIds(List<String>? walletIds) =>
+  _i8.Future<void> saveFavoriteWalletIds(List<String>? walletIds) =>
       (super.noSuchMethod(
         Invocation.method(
           #saveFavoriteWalletIds,
           [walletIds],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> addFavorite(String? walletId) => (super.noSuchMethod(
+  _i8.Future<void> addFavorite(String? walletId) => (super.noSuchMethod(
         Invocation.method(
           #addFavorite,
           [walletId],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> removeFavorite(String? walletId) => (super.noSuchMethod(
+  _i8.Future<void> removeFavorite(String? walletId) => (super.noSuchMethod(
         Invocation.method(
           #removeFavorite,
           [walletId],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> moveFavorite({
+  _i8.Future<void> moveFavorite({
     required int? fromIndex,
     required int? toIndex,
   }) =>
@@ -456,48 +435,48 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             #toIndex: toIndex,
           },
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<bool> checkForDuplicate(String? name) => (super.noSuchMethod(
+  _i8.Future<bool> checkForDuplicate(String? name) => (super.noSuchMethod(
         Invocation.method(
           #checkForDuplicate,
           [name],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<String?> getWalletId(String? walletName) => (super.noSuchMethod(
+  _i8.Future<String?> getWalletId(String? walletName) => (super.noSuchMethod(
         Invocation.method(
           #getWalletId,
           [walletName],
         ),
-        returnValue: _i9.Future<String?>.value(),
-      ) as _i9.Future<String?>);
+        returnValue: _i8.Future<String?>.value(),
+      ) as _i8.Future<String?>);
   @override
-  _i9.Future<bool> isMnemonicVerified({required String? walletId}) =>
+  _i8.Future<bool> isMnemonicVerified({required String? walletId}) =>
       (super.noSuchMethod(
         Invocation.method(
           #isMnemonicVerified,
           [],
           {#walletId: walletId},
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<void> setMnemonicVerified({required String? walletId}) =>
+  _i8.Future<void> setMnemonicVerified({required String? walletId}) =>
       (super.noSuchMethod(
         Invocation.method(
           #setMnemonicVerified,
           [],
           {#walletId: walletId},
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<int> deleteWallet(
+  _i8.Future<int> deleteWallet(
     String? name,
     bool? shouldNotifyListeners,
   ) =>
@@ -509,20 +488,20 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             shouldNotifyListeners,
           ],
         ),
-        returnValue: _i9.Future<int>.value(0),
-      ) as _i9.Future<int>);
+        returnValue: _i8.Future<int>.value(0),
+      ) as _i8.Future<int>);
   @override
-  _i9.Future<void> refreshWallets(bool? shouldNotifyListeners) =>
+  _i8.Future<void> refreshWallets(bool? shouldNotifyListeners) =>
       (super.noSuchMethod(
         Invocation.method(
           #refreshWallets,
           [shouldNotifyListeners],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  void addListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i14.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -530,7 +509,7 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i14.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -558,7 +537,7 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i16.Manager {
+class MockManager extends _i1.Mock implements _i15.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -586,10 +565,10 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i10.Coin get coin => (super.noSuchMethod(
+  _i9.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i10.Coin.bitcoin,
-      ) as _i10.Coin);
+        returnValue: _i9.Coin.bitcoin,
+      ) as _i9.Coin);
   @override
   bool get isRefreshing => (super.noSuchMethod(
         Invocation.getter(#isRefreshing),
@@ -622,23 +601,23 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i9.Future<_i4.FeeObject> get fees => (super.noSuchMethod(
+  _i8.Future<_i4.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i9.Future<_i4.FeeObject>.value(_FakeFeeObject_2(
+        returnValue: _i8.Future<_i4.FeeObject>.value(_FakeFeeObject_2(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i9.Future<_i4.FeeObject>);
+      ) as _i8.Future<_i4.FeeObject>);
   @override
-  _i9.Future<int> get maxFee => (super.noSuchMethod(
+  _i8.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
-        returnValue: _i9.Future<int>.value(0),
-      ) as _i9.Future<int>);
+        returnValue: _i8.Future<int>.value(0),
+      ) as _i8.Future<int>);
   @override
-  _i9.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+  _i8.Future<String> get currentReceivingAddress => (super.noSuchMethod(
         Invocation.getter(#currentReceivingAddress),
-        returnValue: _i9.Future<String>.value(''),
-      ) as _i9.Future<String>);
+        returnValue: _i8.Future<String>.value(''),
+      ) as _i8.Future<String>);
   @override
   _i5.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
@@ -648,16 +627,16 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i9.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
+  _i8.Future<List<_i16.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i9.Future<List<_i17.Transaction>>.value(<_i17.Transaction>[]),
-      ) as _i9.Future<List<_i17.Transaction>>);
+            _i8.Future<List<_i16.Transaction>>.value(<_i16.Transaction>[]),
+      ) as _i8.Future<List<_i16.Transaction>>);
   @override
-  _i9.Future<List<_i17.UTXO>> get utxos => (super.noSuchMethod(
+  _i8.Future<List<_i16.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i9.Future<List<_i17.UTXO>>.value(<_i17.UTXO>[]),
-      ) as _i9.Future<List<_i17.UTXO>>);
+        returnValue: _i8.Future<List<_i16.UTXO>>.value(<_i16.UTXO>[]),
+      ) as _i8.Future<List<_i16.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -677,15 +656,15 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: '',
       ) as String);
   @override
-  _i9.Future<List<String>> get mnemonic => (super.noSuchMethod(
+  _i8.Future<List<String>> get mnemonic => (super.noSuchMethod(
         Invocation.getter(#mnemonic),
-        returnValue: _i9.Future<List<String>>.value(<String>[]),
-      ) as _i9.Future<List<String>>);
+        returnValue: _i8.Future<List<String>>.value(<String>[]),
+      ) as _i8.Future<List<String>>);
   @override
-  _i9.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+  _i8.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
         Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i9.Future<String?>.value(),
-      ) as _i9.Future<String?>);
+        returnValue: _i8.Future<String?>.value(),
+      ) as _i8.Future<String?>);
   @override
   bool get isConnected => (super.noSuchMethod(
         Invocation.getter(#isConnected),
@@ -707,6 +686,11 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -722,24 +706,24 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i9.Future<String> get xpub => (super.noSuchMethod(
+  _i8.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
-        returnValue: _i9.Future<String>.value(''),
-      ) as _i9.Future<String>);
+        returnValue: _i8.Future<String>.value(''),
+      ) as _i8.Future<String>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
   @override
-  _i9.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+  _i8.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
         Invocation.method(
           #updateNode,
           [shouldRefresh],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
   void dispose() => super.noSuchMethod(
         Invocation.method(
@@ -749,7 +733,7 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i9.Future<Map<String, dynamic>> prepareSend({
+  _i8.Future<Map<String, dynamic>> prepareSend({
     required String? address,
     required _i6.Amount? amount,
     Map<String, dynamic>? args,
@@ -765,27 +749,27 @@ class MockManager extends _i1.Mock implements _i16.Manager {
           },
         ),
         returnValue:
-            _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i9.Future<Map<String, dynamic>>);
+            _i8.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i8.Future<Map<String, dynamic>>);
   @override
-  _i9.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+  _i8.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
       (super.noSuchMethod(
         Invocation.method(
           #confirmSend,
           [],
           {#txData: txData},
         ),
-        returnValue: _i9.Future<String>.value(''),
-      ) as _i9.Future<String>);
+        returnValue: _i8.Future<String>.value(''),
+      ) as _i8.Future<String>);
   @override
-  _i9.Future<void> refresh() => (super.noSuchMethod(
+  _i8.Future<void> refresh() => (super.noSuchMethod(
         Invocation.method(
           #refresh,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
   bool validateAddress(String? address) => (super.noSuchMethod(
         Invocation.method(
@@ -795,33 +779,33 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i9.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+  _i8.Future<bool> testNetworkConnection() => (super.noSuchMethod(
         Invocation.method(
           #testNetworkConnection,
           [],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<void> initializeNew() => (super.noSuchMethod(
+  _i8.Future<void> initializeNew() => (super.noSuchMethod(
         Invocation.method(
           #initializeNew,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> initializeExisting() => (super.noSuchMethod(
+  _i8.Future<void> initializeExisting() => (super.noSuchMethod(
         Invocation.method(
           #initializeExisting,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> recoverFromMnemonic({
+  _i8.Future<void> recoverFromMnemonic({
     required String? mnemonic,
     String? mnemonicPassphrase,
     required int? maxUnusedAddressGap,
@@ -840,20 +824,20 @@ class MockManager extends _i1.Mock implements _i16.Manager {
             #height: height,
           },
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> exitCurrentWallet() => (super.noSuchMethod(
+  _i8.Future<void> exitCurrentWallet() => (super.noSuchMethod(
         Invocation.method(
           #exitCurrentWallet,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> fullRescan(
+  _i8.Future<void> fullRescan(
     int? maxUnusedAddressGap,
     int? maxNumberOfIndexesToCheck,
   ) =>
@@ -865,11 +849,11 @@ class MockManager extends _i1.Mock implements _i16.Manager {
             maxNumberOfIndexesToCheck,
           ],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<_i6.Amount> estimateFeeFor(
+  _i8.Future<_i6.Amount> estimateFeeFor(
     _i6.Amount? amount,
     int? feeRate,
   ) =>
@@ -881,7 +865,7 @@ class MockManager extends _i1.Mock implements _i16.Manager {
             feeRate,
           ],
         ),
-        returnValue: _i9.Future<_i6.Amount>.value(_FakeAmount_4(
+        returnValue: _i8.Future<_i6.Amount>.value(_FakeAmount_4(
           this,
           Invocation.method(
             #estimateFeeFor,
@@ -891,26 +875,26 @@ class MockManager extends _i1.Mock implements _i16.Manager {
             ],
           ),
         )),
-      ) as _i9.Future<_i6.Amount>);
+      ) as _i8.Future<_i6.Amount>);
   @override
-  _i9.Future<bool> generateNewAddress() => (super.noSuchMethod(
+  _i8.Future<bool> generateNewAddress() => (super.noSuchMethod(
         Invocation.method(
           #generateNewAddress,
           [],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
+  _i8.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
         Invocation.method(
           #resetRescanOnOpen,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  void addListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i14.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -918,7 +902,7 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i14.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart b/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart
index 139ef28fd..f88574029 100644
--- a/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart
+++ b/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart
@@ -1,17 +1,17 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/services/coins/bitcoin/bitcoin_wallet_test.dart.
+// in stackwallet/test/services/coins/bitcoin/bitcoin_wallet_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
+import 'dart:async' as _i4;
 
 import 'package:decimal/decimal.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i6;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i4;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i8;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i7;
-import 'package:stackduo/utilities/prefs.dart' as _i3;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -34,8 +34,8 @@ class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
         );
 }
 
-class _FakePrefs_1 extends _i1.SmartFake implements _i3.Prefs {
-  _FakePrefs_1(
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -47,13 +47,13 @@ class _FakePrefs_1 extends _i1.SmartFake implements _i3.Prefs {
 /// A class which mocks [ElectrumX].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   MockElectrumX() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  set failovers(List<_i4.ElectrumXNode>? _failovers) => super.noSuchMethod(
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
         Invocation.setter(
           #failovers,
           _failovers,
@@ -89,7 +89,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
         returnValue: false,
       ) as bool);
   @override
-  _i5.Future<dynamic> request({
+  _i4.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
     Duration? connectionTimeout = const Duration(seconds: 60),
@@ -108,10 +108,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retries: retries,
           },
         ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
   @override
-  _i5.Future<List<Map<String, dynamic>>> batchRequest({
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
     Duration? connectionTimeout = const Duration(seconds: 60),
@@ -128,11 +128,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retries: retries,
           },
         ),
-        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i5.Future<List<Map<String, dynamic>>>);
+      ) as _i4.Future<List<Map<String, dynamic>>>);
   @override
-  _i5.Future<bool> ping({
+  _i4.Future<bool> ping({
     String? requestID,
     int? retryCount = 1,
   }) =>
@@ -145,10 +145,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retryCount: retryCount,
           },
         ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
   @override
-  _i5.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getBlockHeadTip,
@@ -156,10 +156,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getServerFeatures,
@@ -167,10 +167,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<String> broadcastTransaction({
+  _i4.Future<String> broadcastTransaction({
     required String? rawTx,
     String? requestID,
   }) =>
@@ -183,10 +183,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i5.Future<String>.value(''),
-      ) as _i5.Future<String>);
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
   @override
-  _i5.Future<Map<String, dynamic>> getBalance({
+  _i4.Future<Map<String, dynamic>> getBalance({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -200,10 +200,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<List<Map<String, dynamic>>> getHistory({
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -216,11 +216,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i5.Future<List<Map<String, dynamic>>>);
+      ) as _i4.Future<List<Map<String, dynamic>>>);
   @override
-  _i5.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
           {required Map<String, List<dynamic>>? args}) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -228,11 +228,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           [],
           {#args: args},
         ),
-        returnValue: _i5.Future<Map<String, List<Map<String, dynamic>>>>.value(
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
             <String, List<Map<String, dynamic>>>{}),
-      ) as _i5.Future<Map<String, List<Map<String, dynamic>>>>);
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
   @override
-  _i5.Future<List<Map<String, dynamic>>> getUTXOs({
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -245,11 +245,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i5.Future<List<Map<String, dynamic>>>);
+      ) as _i4.Future<List<Map<String, dynamic>>>);
   @override
-  _i5.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
           {required Map<String, List<dynamic>>? args}) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -257,11 +257,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           [],
           {#args: args},
         ),
-        returnValue: _i5.Future<Map<String, List<Map<String, dynamic>>>>.value(
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
             <String, List<Map<String, dynamic>>>{}),
-      ) as _i5.Future<Map<String, List<Map<String, dynamic>>>>);
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
   @override
-  _i5.Future<Map<String, dynamic>> getTransaction({
+  _i4.Future<Map<String, dynamic>> getTransaction({
     required String? txHash,
     bool? verbose = true,
     String? requestID,
@@ -277,10 +277,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<Map<String, dynamic>> getAnonymitySet({
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
     String? groupId = r'1',
     String? blockhash = r'',
     String? requestID,
@@ -296,10 +296,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<dynamic> getMintData({
+  _i4.Future<dynamic> getMintData({
     dynamic mints,
     String? requestID,
   }) =>
@@ -312,10 +312,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
   @override
-  _i5.Future<Map<String, dynamic>> getUsedCoinSerials({
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
     String? requestID,
     required int? startNumber,
   }) =>
@@ -329,19 +329,19 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
         Invocation.method(
           #getLatestCoinId,
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i5.Future<int>.value(0),
-      ) as _i5.Future<int>);
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
   @override
-  _i5.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getFeeRate,
@@ -349,10 +349,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<_i2.Decimal> estimateFee({
+  _i4.Future<_i2.Decimal> estimateFee({
     String? requestID,
     required int? blocks,
   }) =>
@@ -365,7 +365,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
           this,
           Invocation.method(
             #estimateFee,
@@ -376,15 +376,15 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             },
           ),
         )),
-      ) as _i5.Future<_i2.Decimal>);
+      ) as _i4.Future<_i2.Decimal>);
   @override
-  _i5.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
         Invocation.method(
           #relayFee,
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
           this,
           Invocation.method(
             #relayFee,
@@ -392,50 +392,30 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             {#requestID: requestID},
           ),
         )),
-      ) as _i5.Future<_i2.Decimal>);
+      ) as _i4.Future<_i2.Decimal>);
 }
 
 /// A class which mocks [CachedElectrumX].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
   MockCachedElectrumX() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  String get server => (super.noSuchMethod(
-        Invocation.getter(#server),
-        returnValue: '',
-      ) as String);
-  @override
-  int get port => (super.noSuchMethod(
-        Invocation.getter(#port),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get useSSL => (super.noSuchMethod(
-        Invocation.getter(#useSSL),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i3.Prefs get prefs => (super.noSuchMethod(
-        Invocation.getter(#prefs),
-        returnValue: _FakePrefs_1(
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
           this,
-          Invocation.getter(#prefs),
+          Invocation.getter(#electrumXClient),
         ),
-      ) as _i3.Prefs);
-  @override
-  List<_i4.ElectrumXNode> get failovers => (super.noSuchMethod(
-        Invocation.getter(#failovers),
-        returnValue: <_i4.ElectrumXNode>[],
-      ) as List<_i4.ElectrumXNode>);
+      ) as _i3.ElectrumX);
   @override
-  _i5.Future<Map<String, dynamic>> getAnonymitySet({
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
     required String? groupId,
     String? blockhash = r'',
-    required _i7.Coin? coin,
+    required _i6.Coin? coin,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -448,8 +428,8 @@ class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
   String base64ToHex(String? source) => (super.noSuchMethod(
         Invocation.method(
@@ -467,9 +447,9 @@ class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
         returnValue: '',
       ) as String);
   @override
-  _i5.Future<Map<String, dynamic>> getTransaction({
+  _i4.Future<Map<String, dynamic>> getTransaction({
     required String? txHash,
-    required _i7.Coin? coin,
+    required _i6.Coin? coin,
     bool? verbose = true,
   }) =>
       (super.noSuchMethod(
@@ -483,11 +463,11 @@ class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<List<dynamic>> getUsedCoinSerials({
-    required _i7.Coin? coin,
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
     int? startNumber = 0,
   }) =>
       (super.noSuchMethod(
@@ -499,26 +479,26 @@ class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
             #startNumber: startNumber,
           },
         ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
   @override
-  _i5.Future<void> clearSharedTransactionCache({required _i7.Coin? coin}) =>
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #clearSharedTransactionCache,
           [],
           {#coin: coin},
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
 
 /// A class which mocks [TransactionNotificationTracker].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockTransactionNotificationTracker extends _i1.Mock
-    implements _i8.TransactionNotificationTracker {
+    implements _i7.TransactionNotificationTracker {
   MockTransactionNotificationTracker() {
     _i1.throwOnMissingStub(this);
   }
@@ -547,14 +527,14 @@ class MockTransactionNotificationTracker extends _i1.Mock
         returnValue: false,
       ) as bool);
   @override
-  _i5.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
         Invocation.method(
           #addNotifiedPending,
           [txid],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
         Invocation.method(
@@ -564,21 +544,21 @@ class MockTransactionNotificationTracker extends _i1.Mock
         returnValue: false,
       ) as bool);
   @override
-  _i5.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
         Invocation.method(
           #addNotifiedConfirmed,
           [txid],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
-  _i5.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
         Invocation.method(
           #deleteTransaction,
           [txid],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
diff --git a/test/services/coins/bitcoincash/bitcoincash_wallet_test.mocks.dart b/test/services/coins/bitcoincash/bitcoincash_wallet_test.mocks.dart
new file mode 100644
index 000000000..2e39e6916
--- /dev/null
+++ b/test/services/coins/bitcoincash/bitcoincash_wallet_test.mocks.dart
@@ -0,0 +1,564 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+  @override
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i6.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i6.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
+  @override
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i7.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
diff --git a/test/services/coins/dogecoin/dogecoin_wallet_test.mocks.dart b/test/services/coins/dogecoin/dogecoin_wallet_test.mocks.dart
new file mode 100644
index 000000000..cd9adfe0f
--- /dev/null
+++ b/test/services/coins/dogecoin/dogecoin_wallet_test.mocks.dart
@@ -0,0 +1,564 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/dogecoin/dogecoin_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+  @override
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i6.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i6.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
+  @override
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i7.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
diff --git a/test/services/coins/firo/firo_wallet_test.mocks.dart b/test/services/coins/firo/firo_wallet_test.mocks.dart
new file mode 100644
index 000000000..56864bfdb
--- /dev/null
+++ b/test/services/coins/firo/firo_wallet_test.mocks.dart
@@ -0,0 +1,1152 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/firo/firo_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:isar/isar.dart' as _i4;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i9;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i6;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/models/isar/models/block_explorer.dart' as _i11;
+import 'package:stackwallet/models/isar/models/contact_entry.dart' as _i10;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i12;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i8;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i7;
+import 'package:tuple/tuple.dart' as _i13;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeIsar_2 extends _i1.SmartFake implements _i4.Isar {
+  _FakeIsar_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeQueryBuilder_3<OBJ, R, S> extends _i1.SmartFake
+    implements _i4.QueryBuilder<OBJ, R, S> {
+  _FakeQueryBuilder_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i5.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i5.Future<dynamic>.value(),
+      ) as _i5.Future<dynamic>);
+  @override
+  _i5.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i5.Future<List<Map<String, dynamic>>>);
+  @override
+  _i5.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i5.Future<String>.value(''),
+      ) as _i5.Future<String>);
+  @override
+  _i5.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i5.Future<List<Map<String, dynamic>>>);
+  @override
+  _i5.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i5.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i5.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i5.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i5.Future<List<Map<String, dynamic>>>);
+  @override
+  _i5.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i5.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i5.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i5.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i5.Future<dynamic>.value(),
+      ) as _i5.Future<dynamic>);
+  @override
+  _i5.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i5.Future<_i2.Decimal>);
+  @override
+  _i5.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i5.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i5.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i7.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i5.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i7.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<List<String>> getUsedCoinSerials({
+    required _i7.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i5.Future<List<String>>.value(<String>[]),
+      ) as _i5.Future<List<String>>);
+  @override
+  _i5.Future<void> clearSharedTransactionCache({required _i7.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i8.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i5.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i5.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+}
+
+/// A class which mocks [MainDB].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMainDB extends _i1.Mock implements _i9.MainDB {
+  MockMainDB() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Isar get isar => (super.noSuchMethod(
+        Invocation.getter(#isar),
+        returnValue: _FakeIsar_2(
+          this,
+          Invocation.getter(#isar),
+        ),
+      ) as _i4.Isar);
+  @override
+  _i5.Future<bool> initMainDB({_i4.Isar? mock}) => (super.noSuchMethod(
+        Invocation.method(
+          #initMainDB,
+          [],
+          {#mock: mock},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  List<_i10.ContactEntry> getContactEntries() => (super.noSuchMethod(
+        Invocation.method(
+          #getContactEntries,
+          [],
+        ),
+        returnValue: <_i10.ContactEntry>[],
+      ) as List<_i10.ContactEntry>);
+  @override
+  _i5.Future<bool> deleteContactEntry({required String? id}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteContactEntry,
+          [],
+          {#id: id},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<bool> isContactEntryExists({required String? id}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #isContactEntryExists,
+          [],
+          {#id: id},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i10.ContactEntry? getContactEntry({required String? id}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getContactEntry,
+        [],
+        {#id: id},
+      )) as _i10.ContactEntry?);
+  @override
+  _i5.Future<bool> putContactEntry(
+          {required _i10.ContactEntry? contactEntry}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putContactEntry,
+          [],
+          {#contactEntry: contactEntry},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i11.TransactionBlockExplorer? getTransactionBlockExplorer(
+          {required _i7.Coin? coin}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTransactionBlockExplorer,
+        [],
+        {#coin: coin},
+      )) as _i11.TransactionBlockExplorer?);
+  @override
+  _i5.Future<int> putTransactionBlockExplorer(
+          _i11.TransactionBlockExplorer? explorer) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransactionBlockExplorer,
+          [explorer],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i4.QueryBuilder<_i12.Address, _i12.Address, _i4.QAfterWhereClause>
+      getAddresses(String? walletId) => (super.noSuchMethod(
+            Invocation.method(
+              #getAddresses,
+              [walletId],
+            ),
+            returnValue: _FakeQueryBuilder_3<_i12.Address, _i12.Address,
+                _i4.QAfterWhereClause>(
+              this,
+              Invocation.method(
+                #getAddresses,
+                [walletId],
+              ),
+            ),
+          ) as _i4
+              .QueryBuilder<_i12.Address, _i12.Address, _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<int> putAddress(_i12.Address? address) => (super.noSuchMethod(
+        Invocation.method(
+          #putAddress,
+          [address],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<List<int>> putAddresses(List<_i12.Address>? addresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putAddresses,
+          [addresses],
+        ),
+        returnValue: _i5.Future<List<int>>.value(<int>[]),
+      ) as _i5.Future<List<int>>);
+  @override
+  _i5.Future<List<int>> updateOrPutAddresses(List<_i12.Address>? addresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateOrPutAddresses,
+          [addresses],
+        ),
+        returnValue: _i5.Future<List<int>>.value(<int>[]),
+      ) as _i5.Future<List<int>>);
+  @override
+  _i5.Future<_i12.Address?> getAddress(
+    String? walletId,
+    String? address,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAddress,
+          [
+            walletId,
+            address,
+          ],
+        ),
+        returnValue: _i5.Future<_i12.Address?>.value(),
+      ) as _i5.Future<_i12.Address?>);
+  @override
+  _i5.Future<int> updateAddress(
+    _i12.Address? oldAddress,
+    _i12.Address? newAddress,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateAddress,
+          [
+            oldAddress,
+            newAddress,
+          ],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i4.QueryBuilder<_i12.Transaction, _i12.Transaction, _i4.QAfterWhereClause>
+      getTransactions(String? walletId) => (super.noSuchMethod(
+            Invocation.method(
+              #getTransactions,
+              [walletId],
+            ),
+            returnValue: _FakeQueryBuilder_3<_i12.Transaction, _i12.Transaction,
+                _i4.QAfterWhereClause>(
+              this,
+              Invocation.method(
+                #getTransactions,
+                [walletId],
+              ),
+            ),
+          ) as _i4.QueryBuilder<_i12.Transaction, _i12.Transaction,
+              _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<int> putTransaction(_i12.Transaction? transaction) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransaction,
+          [transaction],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<List<int>> putTransactions(List<_i12.Transaction>? transactions) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransactions,
+          [transactions],
+        ),
+        returnValue: _i5.Future<List<int>>.value(<int>[]),
+      ) as _i5.Future<List<int>>);
+  @override
+  _i5.Future<_i12.Transaction?> getTransaction(
+    String? walletId,
+    String? txid,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [
+            walletId,
+            txid,
+          ],
+        ),
+        returnValue: _i5.Future<_i12.Transaction?>.value(),
+      ) as _i5.Future<_i12.Transaction?>);
+  @override
+  _i5.Stream<_i12.Transaction?> watchTransaction({
+    required int? id,
+    bool? fireImmediately = false,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #watchTransaction,
+          [],
+          {
+            #id: id,
+            #fireImmediately: fireImmediately,
+          },
+        ),
+        returnValue: _i5.Stream<_i12.Transaction?>.empty(),
+      ) as _i5.Stream<_i12.Transaction?>);
+  @override
+  _i4.QueryBuilder<_i12.UTXO, _i12.UTXO, _i4.QAfterWhereClause> getUTXOs(
+          String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [walletId],
+        ),
+        returnValue:
+            _FakeQueryBuilder_3<_i12.UTXO, _i12.UTXO, _i4.QAfterWhereClause>(
+          this,
+          Invocation.method(
+            #getUTXOs,
+            [walletId],
+          ),
+        ),
+      ) as _i4.QueryBuilder<_i12.UTXO, _i12.UTXO, _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<void> putUTXO(_i12.UTXO? utxo) => (super.noSuchMethod(
+        Invocation.method(
+          #putUTXO,
+          [utxo],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> putUTXOs(List<_i12.UTXO>? utxos) => (super.noSuchMethod(
+        Invocation.method(
+          #putUTXOs,
+          [utxos],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> updateUTXOs(
+    String? walletId,
+    List<_i12.UTXO>? utxos,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateUTXOs,
+          [
+            walletId,
+            utxos,
+          ],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Stream<_i12.UTXO?> watchUTXO({
+    required int? id,
+    bool? fireImmediately = false,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #watchUTXO,
+          [],
+          {
+            #id: id,
+            #fireImmediately: fireImmediately,
+          },
+        ),
+        returnValue: _i5.Stream<_i12.UTXO?>.empty(),
+      ) as _i5.Stream<_i12.UTXO?>);
+  @override
+  _i4.QueryBuilder<_i12.TransactionNote, _i12.TransactionNote,
+      _i4.QAfterWhereClause> getTransactionNotes(
+          String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransactionNotes,
+          [walletId],
+        ),
+        returnValue: _FakeQueryBuilder_3<_i12.TransactionNote,
+            _i12.TransactionNote, _i4.QAfterWhereClause>(
+          this,
+          Invocation.method(
+            #getTransactionNotes,
+            [walletId],
+          ),
+        ),
+      ) as _i4.QueryBuilder<_i12.TransactionNote, _i12.TransactionNote,
+          _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<void> putTransactionNote(_i12.TransactionNote? transactionNote) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransactionNote,
+          [transactionNote],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> putTransactionNotes(
+          List<_i12.TransactionNote>? transactionNotes) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransactionNotes,
+          [transactionNotes],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<_i12.TransactionNote?> getTransactionNote(
+    String? walletId,
+    String? txid,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransactionNote,
+          [
+            walletId,
+            txid,
+          ],
+        ),
+        returnValue: _i5.Future<_i12.TransactionNote?>.value(),
+      ) as _i5.Future<_i12.TransactionNote?>);
+  @override
+  _i5.Stream<_i12.TransactionNote?> watchTransactionNote({
+    required int? id,
+    bool? fireImmediately = false,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #watchTransactionNote,
+          [],
+          {
+            #id: id,
+            #fireImmediately: fireImmediately,
+          },
+        ),
+        returnValue: _i5.Stream<_i12.TransactionNote?>.empty(),
+      ) as _i5.Stream<_i12.TransactionNote?>);
+  @override
+  _i4.QueryBuilder<_i12.AddressLabel, _i12.AddressLabel, _i4.QAfterWhereClause>
+      getAddressLabels(String? walletId) => (super.noSuchMethod(
+            Invocation.method(
+              #getAddressLabels,
+              [walletId],
+            ),
+            returnValue: _FakeQueryBuilder_3<_i12.AddressLabel,
+                _i12.AddressLabel, _i4.QAfterWhereClause>(
+              this,
+              Invocation.method(
+                #getAddressLabels,
+                [walletId],
+              ),
+            ),
+          ) as _i4.QueryBuilder<_i12.AddressLabel, _i12.AddressLabel,
+              _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<int> putAddressLabel(_i12.AddressLabel? addressLabel) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putAddressLabel,
+          [addressLabel],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  int putAddressLabelSync(_i12.AddressLabel? addressLabel) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putAddressLabelSync,
+          [addressLabel],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  _i5.Future<void> putAddressLabels(List<_i12.AddressLabel>? addressLabels) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putAddressLabels,
+          [addressLabels],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<_i12.AddressLabel?> getAddressLabel(
+    String? walletId,
+    String? addressString,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAddressLabel,
+          [
+            walletId,
+            addressString,
+          ],
+        ),
+        returnValue: _i5.Future<_i12.AddressLabel?>.value(),
+      ) as _i5.Future<_i12.AddressLabel?>);
+  @override
+  _i12.AddressLabel? getAddressLabelSync(
+    String? walletId,
+    String? addressString,
+  ) =>
+      (super.noSuchMethod(Invocation.method(
+        #getAddressLabelSync,
+        [
+          walletId,
+          addressString,
+        ],
+      )) as _i12.AddressLabel?);
+  @override
+  _i5.Stream<_i12.AddressLabel?> watchAddressLabel({
+    required int? id,
+    bool? fireImmediately = false,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #watchAddressLabel,
+          [],
+          {
+            #id: id,
+            #fireImmediately: fireImmediately,
+          },
+        ),
+        returnValue: _i5.Stream<_i12.AddressLabel?>.empty(),
+      ) as _i5.Stream<_i12.AddressLabel?>);
+  @override
+  _i5.Future<int> updateAddressLabel(_i12.AddressLabel? addressLabel) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateAddressLabel,
+          [addressLabel],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<void> deleteWalletBlockchainData(String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteWalletBlockchainData,
+          [walletId],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> deleteAddressLabels(String? walletId) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteAddressLabels,
+          [walletId],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> deleteTransactionNotes(String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransactionNotes,
+          [walletId],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> addNewTransactionData(
+    List<_i13.Tuple2<_i12.Transaction, _i12.Address?>>? transactionsData,
+    String? walletId,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #addNewTransactionData,
+          [
+            transactionsData,
+            walletId,
+          ],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i4.QueryBuilder<_i12.EthContract, _i12.EthContract, _i4.QWhere>
+      getEthContracts() => (super.noSuchMethod(
+            Invocation.method(
+              #getEthContracts,
+              [],
+            ),
+            returnValue: _FakeQueryBuilder_3<_i12.EthContract, _i12.EthContract,
+                _i4.QWhere>(
+              this,
+              Invocation.method(
+                #getEthContracts,
+                [],
+              ),
+            ),
+          ) as _i4
+              .QueryBuilder<_i12.EthContract, _i12.EthContract, _i4.QWhere>);
+  @override
+  _i5.Future<_i12.EthContract?> getEthContract(String? contractAddress) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getEthContract,
+          [contractAddress],
+        ),
+        returnValue: _i5.Future<_i12.EthContract?>.value(),
+      ) as _i5.Future<_i12.EthContract?>);
+  @override
+  _i12.EthContract? getEthContractSync(String? contractAddress) =>
+      (super.noSuchMethod(Invocation.method(
+        #getEthContractSync,
+        [contractAddress],
+      )) as _i12.EthContract?);
+  @override
+  _i5.Future<int> putEthContract(_i12.EthContract? contract) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putEthContract,
+          [contract],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<void> putEthContracts(List<_i12.EthContract>? contracts) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putEthContracts,
+          [contracts],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+}
diff --git a/test/services/coins/manager_test.mocks.dart b/test/services/coins/manager_test.mocks.dart
index ad1c81f32..821da6efc 100644
--- a/test/services/coins/manager_test.mocks.dart
+++ b/test/services/coins/manager_test.mocks.dart
@@ -1,31 +1,25 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/services/coins/manager_test.dart.
+// in stackwallet/test/services/coins/manager_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i16;
-import 'dart:typed_data' as _i21;
+import 'dart:async' as _i11;
 
-import 'package:bip32/bip32.dart' as _i11;
-import 'package:bip47/bip47.dart' as _i13;
-import 'package:bitcoindart/bitcoindart.dart' as _i8;
-import 'package:decimal/decimal.dart' as _i14;
+import 'package:decimal/decimal.dart' as _i9;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i7;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i5;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i4;
-import 'package:stackduo/models/balance.dart' as _i6;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i12;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i3;
-import 'package:stackduo/models/signing_data.dart' as _i19;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i15;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i9;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i17;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i18;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
-    as _i20;
-import 'package:tuple/tuple.dart' as _i10;
+import 'package:stackwallet/db/isar/main_db.dart' as _i7;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i4;
+import 'package:stackwallet/models/balance.dart' as _i6;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i13;
+import 'package:stackwallet/models/lelantus_coin.dart' as _i15;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i3;
+import 'package:stackwallet/models/signing_data.dart' as _i14;
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart' as _i10;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i2;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i8;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i12;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -100,8 +94,8 @@ class _FakeMainDB_5 extends _i1.SmartFake implements _i7.MainDB {
         );
 }
 
-class _FakeNetworkType_6 extends _i1.SmartFake implements _i8.NetworkType {
-  _FakeNetworkType_6(
+class _FakeAmount_6 extends _i1.SmartFake implements _i8.Amount {
+  _FakeAmount_6(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -110,8 +104,8 @@ class _FakeNetworkType_6 extends _i1.SmartFake implements _i8.NetworkType {
         );
 }
 
-class _FakeElectrumXNode_7 extends _i1.SmartFake implements _i4.ElectrumXNode {
-  _FakeElectrumXNode_7(
+class _FakeDecimal_7 extends _i1.SmartFake implements _i9.Decimal {
+  _FakeDecimal_7(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -120,77 +114,16 @@ class _FakeElectrumXNode_7 extends _i1.SmartFake implements _i4.ElectrumXNode {
         );
 }
 
-class _FakeAmount_8 extends _i1.SmartFake implements _i9.Amount {
-  _FakeAmount_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeTuple2_9<T1, T2> extends _i1.SmartFake
-    implements _i10.Tuple2<T1, T2> {
-  _FakeTuple2_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeBIP32_10 extends _i1.SmartFake implements _i11.BIP32 {
-  _FakeBIP32_10(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeAddress_11 extends _i1.SmartFake implements _i12.Address {
-  _FakeAddress_11(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakePaymentCode_12 extends _i1.SmartFake implements _i13.PaymentCode {
-  _FakePaymentCode_12(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeDecimal_13 extends _i1.SmartFake implements _i14.Decimal {
-  _FakeDecimal_13(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [BitcoinWallet].
+/// A class which mocks [FiroWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
-  MockBitcoinWallet() {
+class MockFiroWallet extends _i1.Mock implements _i10.FiroWallet {
+  MockFiroWallet() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  set timer(_i16.Timer? _timer) => super.noSuchMethod(
+  set timer(_i11.Timer? _timer) => super.noSuchMethod(
         Invocation.setter(
           #timer,
           _timer,
@@ -215,28 +148,28 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  bool get longMutex => (super.noSuchMethod(
-        Invocation.getter(#longMutex),
+  bool get refreshMutex => (super.noSuchMethod(
+        Invocation.getter(#refreshMutex),
         returnValue: false,
       ) as bool);
   @override
-  set longMutex(bool? _longMutex) => super.noSuchMethod(
+  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
         Invocation.setter(
-          #longMutex,
-          _longMutex,
+          #refreshMutex,
+          _refreshMutex,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  bool get refreshMutex => (super.noSuchMethod(
-        Invocation.getter(#refreshMutex),
+  bool get longMutex => (super.noSuchMethod(
+        Invocation.getter(#longMutex),
         returnValue: false,
       ) as bool);
   @override
-  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
+  set longMutex(bool? _longMutex) => super.noSuchMethod(
         Invocation.setter(
-          #refreshMutex,
-          _refreshMutex,
+          #longMutex,
+          _longMutex,
         ),
         returnValueForMissingStub: null,
       );
@@ -254,6 +187,19 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
+  bool get shouldAutoSync => (super.noSuchMethod(
+        Invocation.getter(#shouldAutoSync),
+        returnValue: false,
+      ) as bool);
+  @override
+  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
+        Invocation.setter(
+          #shouldAutoSync,
+          shouldAutoSync,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
   set isFavorite(bool? markFavorite) => super.noSuchMethod(
         Invocation.setter(
           #isFavorite,
@@ -267,107 +213,48 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i17.Coin get coin => (super.noSuchMethod(
+  _i12.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i17.Coin.bitcoin,
-      ) as _i17.Coin);
-  @override
-  _i16.Future<List<_i12.UTXO>> get utxos => (super.noSuchMethod(
-        Invocation.getter(#utxos),
-        returnValue: _i16.Future<List<_i12.UTXO>>.value(<_i12.UTXO>[]),
-      ) as _i16.Future<List<_i12.UTXO>>);
+        returnValue: _i12.Coin.bitcoin,
+      ) as _i12.Coin);
   @override
-  _i16.Future<List<_i12.Transaction>> get transactions => (super.noSuchMethod(
-        Invocation.getter(#transactions),
-        returnValue:
-            _i16.Future<List<_i12.Transaction>>.value(<_i12.Transaction>[]),
-      ) as _i16.Future<List<_i12.Transaction>>);
-  @override
-  _i16.Future<String> get currentReceivingAddress => (super.noSuchMethod(
-        Invocation.getter(#currentReceivingAddress),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+  _i11.Future<List<String>> get mnemonic => (super.noSuchMethod(
+        Invocation.getter(#mnemonic),
+        returnValue: _i11.Future<List<String>>.value(<String>[]),
+      ) as _i11.Future<List<String>>);
   @override
-  _i16.Future<String> get currentChangeAddress => (super.noSuchMethod(
-        Invocation.getter(#currentChangeAddress),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+  _i11.Future<String?> get mnemonicString => (super.noSuchMethod(
+        Invocation.getter(#mnemonicString),
+        returnValue: _i11.Future<String?>.value(),
+      ) as _i11.Future<String?>);
   @override
-  _i16.Future<String> get currentChangeAddressP2PKH => (super.noSuchMethod(
-        Invocation.getter(#currentChangeAddressP2PKH),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+  _i11.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+        Invocation.getter(#mnemonicPassphrase),
+        returnValue: _i11.Future<String?>.value(),
+      ) as _i11.Future<String?>);
   @override
-  bool get hasCalledExit => (super.noSuchMethod(
-        Invocation.getter(#hasCalledExit),
-        returnValue: false,
-      ) as bool);
+  _i11.Future<int> get maxFee => (super.noSuchMethod(
+        Invocation.getter(#maxFee),
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
   @override
-  _i16.Future<_i3.FeeObject> get fees => (super.noSuchMethod(
+  _i11.Future<_i3.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i16.Future<_i3.FeeObject>.value(_FakeFeeObject_1(
+        returnValue: _i11.Future<_i3.FeeObject>.value(_FakeFeeObject_1(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i16.Future<_i3.FeeObject>);
-  @override
-  _i16.Future<int> get maxFee => (super.noSuchMethod(
-        Invocation.getter(#maxFee),
-        returnValue: _i16.Future<int>.value(0),
-      ) as _i16.Future<int>);
-  @override
-  _i16.Future<List<String>> get mnemonic => (super.noSuchMethod(
-        Invocation.getter(#mnemonic),
-        returnValue: _i16.Future<List<String>>.value(<String>[]),
-      ) as _i16.Future<List<String>>);
-  @override
-  _i16.Future<String?> get mnemonicString => (super.noSuchMethod(
-        Invocation.getter(#mnemonicString),
-        returnValue: _i16.Future<String?>.value(),
-      ) as _i16.Future<String?>);
-  @override
-  _i16.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
-        Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i16.Future<String?>.value(),
-      ) as _i16.Future<String?>);
-  @override
-  _i16.Future<int> get chainHeight => (super.noSuchMethod(
-        Invocation.getter(#chainHeight),
-        returnValue: _i16.Future<int>.value(0),
-      ) as _i16.Future<int>);
-  @override
-  int get storedChainHeight => (super.noSuchMethod(
-        Invocation.getter(#storedChainHeight),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get shouldAutoSync => (super.noSuchMethod(
-        Invocation.getter(#shouldAutoSync),
-        returnValue: false,
-      ) as bool);
+      ) as _i11.Future<_i3.FeeObject>);
   @override
-  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
-        Invocation.setter(
-          #shouldAutoSync,
-          shouldAutoSync,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isRefreshing => (super.noSuchMethod(
-        Invocation.getter(#isRefreshing),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get isConnected => (super.noSuchMethod(
-        Invocation.getter(#isConnected),
-        returnValue: false,
-      ) as bool);
+  _i11.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+        Invocation.getter(#currentReceivingAddress),
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
+  _i11.Future<String> get currentChangeAddress => (super.noSuchMethod(
+        Invocation.getter(#currentChangeAddress),
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
   String get walletName => (super.noSuchMethod(
         Invocation.getter(#walletName),
@@ -382,6 +269,16 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  bool get isConnected => (super.noSuchMethod(
+        Invocation.getter(#isConnected),
+        returnValue: false,
+      ) as bool);
+  @override
   _i4.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
         returnValue: _FakeElectrumX_2(
@@ -398,6 +295,26 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i5.CachedElectrumX);
   @override
+  bool get isRefreshing => (super.noSuchMethod(
+        Invocation.getter(#isRefreshing),
+        returnValue: false,
+      ) as bool);
+  @override
+  bool get hasCalledExit => (super.noSuchMethod(
+        Invocation.getter(#hasCalledExit),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i11.Future<int> get chainHeight => (super.noSuchMethod(
+        Invocation.getter(#chainHeight),
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
+  @override
+  int get storedChainHeight => (super.noSuchMethod(
+        Invocation.getter(#storedChainHeight),
+        returnValue: 0,
+      ) as int);
+  @override
   _i6.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
         returnValue: _FakeBalance_4(
@@ -406,10 +323,29 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i6.Balance);
   @override
-  _i16.Future<String> get xpub => (super.noSuchMethod(
+  _i6.Balance get balancePrivate => (super.noSuchMethod(
+        Invocation.getter(#balancePrivate),
+        returnValue: _FakeBalance_4(
+          this,
+          Invocation.getter(#balancePrivate),
+        ),
+      ) as _i6.Balance);
+  @override
+  _i11.Future<List<_i13.UTXO>> get utxos => (super.noSuchMethod(
+        Invocation.getter(#utxos),
+        returnValue: _i11.Future<List<_i13.UTXO>>.value(<_i13.UTXO>[]),
+      ) as _i11.Future<List<_i13.UTXO>>);
+  @override
+  _i11.Future<List<_i13.Transaction>> get transactions => (super.noSuchMethod(
+        Invocation.getter(#transactions),
+        returnValue:
+            _i11.Future<List<_i13.Transaction>>.value(<_i13.Transaction>[]),
+      ) as _i11.Future<List<_i13.Transaction>>);
+  @override
+  _i11.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
   set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
       super.noSuchMethod(
@@ -428,95 +364,80 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i7.MainDB);
   @override
-  _i8.NetworkType get networkType => (super.noSuchMethod(
-        Invocation.getter(#networkType),
-        returnValue: _FakeNetworkType_6(
-          this,
-          Invocation.getter(#networkType),
-        ),
-      ) as _i8.NetworkType);
-  @override
-  _i16.Future<void> exit() => (super.noSuchMethod(
+  bool validateAddress(String? address) => (super.noSuchMethod(
         Invocation.method(
-          #exit,
-          [],
+          #validateAddress,
+          [address],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: false,
+      ) as bool);
   @override
-  _i18.DerivePathType addressType({required String? address}) =>
+  _i11.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
       (super.noSuchMethod(
         Invocation.method(
-          #addressType,
-          [],
-          {#address: address},
+          #updateSentCachedTxData,
+          [txData],
         ),
-        returnValue: _i18.DerivePathType.bip44,
-      ) as _i18.DerivePathType);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> recoverFromMnemonic({
-    required String? mnemonic,
-    String? mnemonicPassphrase,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required int? height,
-  }) =>
-      (super.noSuchMethod(
+  _i11.Future<bool> testNetworkConnection() => (super.noSuchMethod(
         Invocation.method(
-          #recoverFromMnemonic,
+          #testNetworkConnection,
           [],
-          {
-            #mnemonic: mnemonic,
-            #mnemonicPassphrase: mnemonicPassphrase,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #height: height,
-          },
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<bool>.value(false),
+      ) as _i11.Future<bool>);
   @override
-  _i16.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
-      (super.noSuchMethod(
+  void startNetworkAlivePinging() => super.noSuchMethod(
         Invocation.method(
-          #getTransactionCacheEarly,
-          [allAddresses],
+          #startNetworkAlivePinging,
+          [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValueForMissingStub: null,
+      );
   @override
-  _i16.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
+  void stopNetworkAlivePinging() => super.noSuchMethod(
         Invocation.method(
-          #refreshIfThereIsNewData,
+          #stopNetworkAlivePinging,
           [],
         ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
+        returnValueForMissingStub: null,
+      );
   @override
-  _i16.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
+  _i11.Future<Map<String, dynamic>> prepareSendPublic({
+    required String? address,
+    required _i8.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #getAllTxsToWatch,
+          #prepareSendPublic,
           [],
+          {
+            #address: address,
+            #amount: amount,
+            #args: args,
+          },
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue:
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<void> refresh() => (super.noSuchMethod(
+  _i11.Future<String> confirmSendPublic({dynamic txData}) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #refresh,
+          #confirmSendPublic,
           [],
+          {#txData: txData},
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  _i16.Future<Map<String, dynamic>> prepareSend({
+  _i11.Future<Map<String, dynamic>> prepareSend({
     required String? address,
-    required _i9.Amount? amount,
+    required _i8.Amount? amount,
     Map<String, dynamic>? args,
   }) =>
       (super.noSuchMethod(
@@ -530,253 +451,373 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+  _i11.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
       (super.noSuchMethod(
         Invocation.method(
           #confirmSend,
           [],
           {#txData: txData},
         ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  _i16.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+  int estimateTxFee({
+    required int? vSize,
+    required int? feeRatePerKB,
+  }) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #testNetworkConnection,
+          #estimateTxFee,
           [],
+          {
+            #vSize: vSize,
+            #feeRatePerKB: feeRatePerKB,
+          },
         ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
+        returnValue: 0,
+      ) as int);
   @override
-  void startNetworkAlivePinging() => super.noSuchMethod(
+  dynamic coinSelection(
+    int? satoshiAmountToSend,
+    int? selectedTxFeeRate,
+    String? _recipientAddress,
+    bool? isSendAll, {
+    int? additionalOutputs = 0,
+    List<_i13.UTXO>? utxos,
+  }) =>
+      super.noSuchMethod(Invocation.method(
+        #coinSelection,
+        [
+          satoshiAmountToSend,
+          selectedTxFeeRate,
+          _recipientAddress,
+          isSendAll,
+        ],
+        {
+          #additionalOutputs: additionalOutputs,
+          #utxos: utxos,
+        },
+      ));
+  @override
+  _i11.Future<List<_i14.SigningData>> fetchBuildTxData(
+          List<_i13.UTXO>? utxosToUse) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #startNetworkAlivePinging,
-          [],
+          #fetchBuildTxData,
+          [utxosToUse],
         ),
-        returnValueForMissingStub: null,
-      );
+        returnValue:
+            _i11.Future<List<_i14.SigningData>>.value(<_i14.SigningData>[]),
+      ) as _i11.Future<List<_i14.SigningData>>);
   @override
-  void stopNetworkAlivePinging() => super.noSuchMethod(
+  _i11.Future<Map<String, dynamic>> buildTransaction({
+    required List<_i14.SigningData>? utxoSigningData,
+    required List<String>? recipients,
+    required List<int>? satoshiAmounts,
+  }) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #stopNetworkAlivePinging,
+          #buildTransaction,
           [],
+          {
+            #utxoSigningData: utxoSigningData,
+            #recipients: recipients,
+            #satoshiAmounts: satoshiAmounts,
+          },
         ),
-        returnValueForMissingStub: null,
-      );
+        returnValue:
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<void> initializeNew() => (super.noSuchMethod(
+  _i11.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+        Invocation.method(
+          #updateNode,
+          [shouldRefresh],
+        ),
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  _i11.Future<void> initializeNew() => (super.noSuchMethod(
         Invocation.method(
           #initializeNew,
           [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> initializeExisting() => (super.noSuchMethod(
+  _i11.Future<void> initializeExisting() => (super.noSuchMethod(
         Invocation.method(
           #initializeExisting,
           [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
-      (super.noSuchMethod(
+  _i11.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
         Invocation.method(
-          #updateSentCachedTxData,
-          [txData],
+          #refreshIfThereIsNewData,
+          [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<bool>.value(false),
+      ) as _i11.Future<bool>);
   @override
-  bool validateAddress(String? address) => (super.noSuchMethod(
+  _i11.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
         Invocation.method(
-          #validateAddress,
-          [address],
+          #getAllTxsToWatch,
+          [],
         ),
-        returnValue: false,
-      ) as bool);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+  _i11.Future<void> refresh() => (super.noSuchMethod(
         Invocation.method(
-          #updateNode,
-          [shouldRefresh],
+          #refresh,
+          [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<_i4.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+  List<Map<dynamic, _i15.LelantusCoin>> getLelantusCoinMap() =>
+      (super.noSuchMethod(
         Invocation.method(
-          #getCurrentNode,
+          #getLelantusCoinMap,
           [],
         ),
-        returnValue: _i16.Future<_i4.ElectrumXNode>.value(_FakeElectrumXNode_7(
-          this,
-          Invocation.method(
-            #getCurrentNode,
-            [],
-          ),
-        )),
-      ) as _i16.Future<_i4.ElectrumXNode>);
+        returnValue: <Map<dynamic, _i15.LelantusCoin>>[],
+      ) as List<Map<dynamic, _i15.LelantusCoin>>);
   @override
-  _i16.Future<List<Map<String, dynamic>>> fastFetch(
-          List<String>? allTxHashes) =>
+  _i11.Future<void> anonymizeAllPublicFunds() => (super.noSuchMethod(
+        Invocation.method(
+          #anonymizeAllPublicFunds,
+          [],
+        ),
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  _i11.Future<List<Map<String, dynamic>>> createMintsFromAmount(int? total) =>
       (super.noSuchMethod(
         Invocation.method(
-          #fastFetch,
-          [allTxHashes],
+          #createMintsFromAmount,
+          [total],
         ),
-        returnValue: _i16.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i16.Future<List<Map<String, dynamic>>>);
+      ) as _i11.Future<List<Map<String, dynamic>>>);
+  @override
+  _i11.Future<String> submitHexToNetwork(String? hex) => (super.noSuchMethod(
+        Invocation.method(
+          #submitHexToNetwork,
+          [hex],
+        ),
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  _i16.Future<int> getTxCount({required String? address}) =>
+  _i11.Future<Map<String, dynamic>> buildMintTransaction(
+    List<_i13.UTXO>? utxosToUse,
+    int? satoshisPerRecipient,
+    List<Map<String, dynamic>>? mintsMap,
+  ) =>
       (super.noSuchMethod(
         Invocation.method(
-          #getTxCount,
-          [],
-          {#address: address},
+          #buildMintTransaction,
+          [
+            utxosToUse,
+            satoshisPerRecipient,
+            mintsMap,
+          ],
         ),
-        returnValue: _i16.Future<int>.value(0),
-      ) as _i16.Future<int>);
+        returnValue:
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<void> checkCurrentReceivingAddressesForTransactions() =>
+  _i11.Future<void> checkReceivingAddressForTransactions() =>
       (super.noSuchMethod(
         Invocation.method(
-          #checkCurrentReceivingAddressesForTransactions,
+          #checkReceivingAddressForTransactions,
           [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> checkCurrentChangeAddressesForTransactions() =>
-      (super.noSuchMethod(
+  _i11.Future<void> checkChangeAddressForTransactions() => (super.noSuchMethod(
         Invocation.method(
-          #checkCurrentChangeAddressesForTransactions,
+          #checkChangeAddressForTransactions,
           [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  int estimateTxFee({
-    required int? vSize,
-    required int? feeRatePerKB,
+  _i11.Future<void> fullRescan(
+    int? maxUnusedAddressGap,
+    int? maxNumberOfIndexesToCheck,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fullRescan,
+          [
+            maxUnusedAddressGap,
+            maxNumberOfIndexesToCheck,
+          ],
+        ),
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  _i11.Future<void> recoverFromMnemonic({
+    required String? mnemonic,
+    String? mnemonicPassphrase,
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+    required int? height,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
-          #estimateTxFee,
+          #recoverFromMnemonic,
           [],
           {
-            #vSize: vSize,
-            #feeRatePerKB: feeRatePerKB,
+            #mnemonic: mnemonic,
+            #mnemonicPassphrase: mnemonicPassphrase,
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+            #height: height,
           },
         ),
-        returnValue: 0,
-      ) as int);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  dynamic coinSelection({
-    required int? satoshiAmountToSend,
-    required int? selectedTxFeeRate,
-    required String? recipientAddress,
-    required bool? coinControl,
-    required bool? isSendAll,
-    int? additionalOutputs = 0,
-    List<_i12.UTXO>? utxos,
-  }) =>
-      super.noSuchMethod(Invocation.method(
-        #coinSelection,
-        [],
-        {
-          #satoshiAmountToSend: satoshiAmountToSend,
-          #selectedTxFeeRate: selectedTxFeeRate,
-          #recipientAddress: recipientAddress,
-          #coinControl: coinControl,
-          #isSendAll: isSendAll,
-          #additionalOutputs: additionalOutputs,
-          #utxos: utxos,
-        },
-      ));
+  _i11.Future<Map<int, dynamic>> getSetDataMap(int? latestSetId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getSetDataMap,
+          [latestSetId],
+        ),
+        returnValue: _i11.Future<Map<int, dynamic>>.value(<int, dynamic>{}),
+      ) as _i11.Future<Map<int, dynamic>>);
   @override
-  _i16.Future<List<_i19.SigningData>> fetchBuildTxData(
-          List<_i12.UTXO>? utxosToUse) =>
+  _i11.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
       (super.noSuchMethod(
         Invocation.method(
-          #fetchBuildTxData,
-          [utxosToUse],
+          #getTransactionCacheEarly,
+          [allAddresses],
         ),
-        returnValue:
-            _i16.Future<List<_i19.SigningData>>.value(<_i19.SigningData>[]),
-      ) as _i16.Future<List<_i19.SigningData>>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i19.SigningData>? utxoSigningData,
-    required List<String>? recipients,
-    required List<int>? satoshiAmounts,
-  }) =>
+  _i11.Future<List<Map<String, dynamic>>> fetchAnonymitySets() =>
       (super.noSuchMethod(
         Invocation.method(
-          #buildTransaction,
+          #fetchAnonymitySets,
           [],
-          {
-            #utxoSigningData: utxoSigningData,
-            #recipients: recipients,
-            #satoshiAmounts: satoshiAmounts,
-          },
         ),
-        returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i11.Future<List<Map<String, dynamic>>>);
+  @override
+  _i11.Future<int> getLatestSetId() => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestSetId,
+          [],
+        ),
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
+  @override
+  _i11.Future<List<String>> getUsedCoinSerials() => (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+        ),
+        returnValue: _i11.Future<List<String>>.value(<String>[]),
+      ) as _i11.Future<List<String>>);
+  @override
+  _i11.Future<void> exit() => (super.noSuchMethod(
+        Invocation.method(
+          #exit,
+          [],
+        ),
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  _i11.Future<dynamic> getCoinsToJoinSplit(int? required) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getCoinsToJoinSplit,
+          [required],
+        ),
+        returnValue: _i11.Future<dynamic>.value(),
+      ) as _i11.Future<dynamic>);
+  @override
+  _i11.Future<int> estimateJoinSplitFee(int? spendAmount) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateJoinSplitFee,
+          [spendAmount],
+        ),
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
   @override
-  _i16.Future<void> fullRescan(
-    int? maxUnusedAddressGap,
-    int? maxNumberOfIndexesToCheck,
+  _i11.Future<_i8.Amount> estimateFeeFor(
+    _i8.Amount? amount,
+    int? feeRate,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
-          #fullRescan,
+          #estimateFeeFor,
           [
-            maxUnusedAddressGap,
-            maxNumberOfIndexesToCheck,
+            amount,
+            feeRate,
           ],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<_i8.Amount>.value(_FakeAmount_6(
+          this,
+          Invocation.method(
+            #estimateFeeFor,
+            [
+              amount,
+              feeRate,
+            ],
+          ),
+        )),
+      ) as _i11.Future<_i8.Amount>);
   @override
-  _i16.Future<_i9.Amount> estimateFeeFor(
-    _i9.Amount? amount,
+  _i11.Future<_i8.Amount> estimateFeeForPublic(
+    _i8.Amount? amount,
     int? feeRate,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
-          #estimateFeeFor,
+          #estimateFeeForPublic,
           [
             amount,
             feeRate,
           ],
         ),
-        returnValue: _i16.Future<_i9.Amount>.value(_FakeAmount_8(
+        returnValue: _i11.Future<_i8.Amount>.value(_FakeAmount_6(
           this,
           Invocation.method(
-            #estimateFeeFor,
+            #estimateFeeForPublic,
             [
               amount,
               feeRate,
             ],
           ),
         )),
-      ) as _i16.Future<_i9.Amount>);
+      ) as _i11.Future<_i8.Amount>);
   @override
-  _i9.Amount roughFeeEstimate(
+  _i8.Amount roughFeeEstimate(
     int? inputCount,
     int? outputCount,
     int? feeRatePerKB,
@@ -790,7 +831,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
             feeRatePerKB,
           ],
         ),
-        returnValue: _FakeAmount_8(
+        returnValue: _FakeAmount_6(
           this,
           Invocation.method(
             #roughFeeEstimate,
@@ -801,33 +842,90 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
             ],
           ),
         ),
-      ) as _i9.Amount);
+      ) as _i8.Amount);
   @override
-  _i16.Future<_i9.Amount> sweepAllEstimate(int? feeRate) => (super.noSuchMethod(
+  _i11.Future<_i8.Amount> sweepAllEstimate(int? feeRate) => (super.noSuchMethod(
         Invocation.method(
           #sweepAllEstimate,
           [feeRate],
         ),
-        returnValue: _i16.Future<_i9.Amount>.value(_FakeAmount_8(
+        returnValue: _i11.Future<_i8.Amount>.value(_FakeAmount_6(
           this,
           Invocation.method(
             #sweepAllEstimate,
             [feeRate],
           ),
         )),
-      ) as _i16.Future<_i9.Amount>);
+      ) as _i11.Future<_i8.Amount>);
+  @override
+  _i11.Future<List<Map<String, dynamic>>> fastFetch(
+          List<String>? allTxHashes) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fastFetch,
+          [allTxHashes],
+        ),
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i11.Future<List<Map<String, dynamic>>>);
+  @override
+  _i11.Future<Map<_i13.Address, _i13.Transaction>> getJMintTransactions(
+    _i5.CachedElectrumX? cachedClient,
+    List<String>? transactions,
+    _i12.Coin? coin,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getJMintTransactions,
+          [
+            cachedClient,
+            transactions,
+            coin,
+          ],
+        ),
+        returnValue: _i11.Future<Map<_i13.Address, _i13.Transaction>>.value(
+            <_i13.Address, _i13.Transaction>{}),
+      ) as _i11.Future<Map<_i13.Address, _i13.Transaction>>);
   @override
-  _i16.Future<bool> generateNewAddress() => (super.noSuchMethod(
+  _i11.Future<bool> generateNewAddress() => (super.noSuchMethod(
         Invocation.method(
           #generateNewAddress,
           [],
         ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
+        returnValue: _i11.Future<bool>.value(false),
+      ) as _i11.Future<bool>);
+  @override
+  _i8.Amount availablePrivateBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #availablePrivateBalance,
+          [],
+        ),
+        returnValue: _FakeAmount_6(
+          this,
+          Invocation.method(
+            #availablePrivateBalance,
+            [],
+          ),
+        ),
+      ) as _i8.Amount);
+  @override
+  _i8.Amount availablePublicBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #availablePublicBalance,
+          [],
+        ),
+        returnValue: _FakeAmount_6(
+          this,
+          Invocation.method(
+            #availablePublicBalance,
+            [],
+          ),
+        ),
+      ) as _i8.Amount);
   @override
   void initCache(
     String? walletId,
-    _i17.Coin? coin,
+    _i12.Coin? coin,
   ) =>
       super.noSuchMethod(
         Invocation.method(
@@ -840,14 +938,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i16.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
+  _i11.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
         Invocation.method(
           #updateCachedId,
           [id],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
   int getCachedChainHeight() => (super.noSuchMethod(
         Invocation.method(
@@ -857,14 +955,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValue: 0,
       ) as int);
   @override
-  _i16.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
+  _i11.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
         Invocation.method(
           #updateCachedChainHeight,
           [height],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
   bool getCachedIsFavorite() => (super.noSuchMethod(
         Invocation.method(
@@ -874,15 +972,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i16.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
+  _i11.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedIsFavorite,
           [isFavorite],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
   _i6.Balance getCachedBalance() => (super.noSuchMethod(
         Invocation.method(
@@ -898,15 +996,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i6.Balance);
   @override
-  _i16.Future<void> updateCachedBalance(_i6.Balance? balance) =>
+  _i11.Future<void> updateCachedBalance(_i6.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalance,
           [balance],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
   _i6.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
         Invocation.method(
@@ -922,510 +1020,88 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i6.Balance);
   @override
-  _i16.Future<void> updateCachedBalanceSecondary(_i6.Balance? balance) =>
+  _i11.Future<void> updateCachedBalanceSecondary(_i6.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalanceSecondary,
           [balance],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
         Invocation.method(
-          #initWalletDB,
+          #getWalletTokenContractAddresses,
           [],
-          {#mockableOverride: mockableOverride},
         ),
-        returnValueForMissingStub: null,
-      );
+        returnValue: <String>[],
+      ) as List<String>);
   @override
-  _i16.Future<_i10.Tuple2<_i12.Transaction, _i12.Address>> parseTransaction(
-    Map<String, dynamic>? txData,
-    dynamic electrumxClient,
-    List<_i12.Address>? myAddresses,
-    _i17.Coin? coin,
-    int? minConfirms,
-    String? walletId,
-  ) =>
+  _i11.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
       (super.noSuchMethod(
         Invocation.method(
-          #parseTransaction,
-          [
-            txData,
-            electrumxClient,
-            myAddresses,
-            coin,
-            minConfirms,
-            walletId,
-          ],
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
         ),
-        returnValue:
-            _i16.Future<_i10.Tuple2<_i12.Transaction, _i12.Address>>.value(
-                _FakeTuple2_9<_i12.Transaction, _i12.Address>(
-          this,
-          Invocation.method(
-            #parseTransaction,
-            [
-              txData,
-              electrumxClient,
-              myAddresses,
-              coin,
-              minConfirms,
-              walletId,
-            ],
-          ),
-        )),
-      ) as _i16.Future<_i10.Tuple2<_i12.Transaction, _i12.Address>>);
-  @override
-  void initPaynymWalletInterface({
-    required String? walletId,
-    required String? walletName,
-    required _i8.NetworkType? network,
-    required _i17.Coin? coin,
-    required _i7.MainDB? db,
-    required _i4.ElectrumX? electrumXClient,
-    required _i20.SecureStorageInterface? secureStorage,
-    required int? dustLimit,
-    required int? dustLimitP2PKH,
-    required int? minConfirms,
-    required _i16.Future<String?> Function()? getMnemonicString,
-    required _i16.Future<String?> Function()? getMnemonicPassphrase,
-    required _i16.Future<int> Function()? getChainHeight,
-    required _i16.Future<String> Function()? getCurrentChangeAddress,
-    required int Function({
-      required int feeRatePerKB,
-      required int vSize,
-    })?
-        estimateTxFee,
-    required _i16.Future<Map<String, dynamic>> Function({
-      required String address,
-      required _i9.Amount amount,
-      Map<String, dynamic>? args,
-    })?
-        prepareSend,
-    required _i16.Future<int> Function({required String address})? getTxCount,
-    required _i16.Future<List<_i19.SigningData>> Function(List<_i12.UTXO>)?
-        fetchBuildTxData,
-    required _i16.Future<void> Function()? refresh,
-    required _i16.Future<void> Function()? checkChangeAddressForTransactions,
-  }) =>
-      super.noSuchMethod(
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
-          #initPaynymWalletInterface,
+          #initWalletDB,
           [],
-          {
-            #walletId: walletId,
-            #walletName: walletName,
-            #network: network,
-            #coin: coin,
-            #db: db,
-            #electrumXClient: electrumXClient,
-            #secureStorage: secureStorage,
-            #dustLimit: dustLimit,
-            #dustLimitP2PKH: dustLimitP2PKH,
-            #minConfirms: minConfirms,
-            #getMnemonicString: getMnemonicString,
-            #getMnemonicPassphrase: getMnemonicPassphrase,
-            #getChainHeight: getChainHeight,
-            #getCurrentChangeAddress: getCurrentChangeAddress,
-            #estimateTxFee: estimateTxFee,
-            #prepareSend: prepareSend,
-            #getTxCount: getTxCount,
-            #fetchBuildTxData: fetchBuildTxData,
-            #refresh: refresh,
-            #checkChangeAddressForTransactions:
-                checkChangeAddressForTransactions,
-          },
+          {#mockableOverride: mockableOverride},
         ),
         returnValueForMissingStub: null,
       );
   @override
-  _i16.Future<_i11.BIP32> getBip47BaseNode() => (super.noSuchMethod(
-        Invocation.method(
-          #getBip47BaseNode,
-          [],
-        ),
-        returnValue: _i16.Future<_i11.BIP32>.value(_FakeBIP32_10(
-          this,
-          Invocation.method(
-            #getBip47BaseNode,
-            [],
-          ),
-        )),
-      ) as _i16.Future<_i11.BIP32>);
-  @override
-  _i16.Future<_i21.Uint8List> getPrivateKeyForPaynymReceivingAddress({
-    required String? paymentCodeString,
-    required int? index,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getPrivateKeyForPaynymReceivingAddress,
-          [],
-          {
-            #paymentCodeString: paymentCodeString,
-            #index: index,
-          },
-        ),
-        returnValue: _i16.Future<_i21.Uint8List>.value(_i21.Uint8List(0)),
-      ) as _i16.Future<_i21.Uint8List>);
-  @override
-  _i16.Future<_i12.Address> currentReceivingPaynymAddress({
-    required _i13.PaymentCode? sender,
-    required bool? isSegwit,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #currentReceivingPaynymAddress,
-          [],
-          {
-            #sender: sender,
-            #isSegwit: isSegwit,
-          },
-        ),
-        returnValue: _i16.Future<_i12.Address>.value(_FakeAddress_11(
-          this,
-          Invocation.method(
-            #currentReceivingPaynymAddress,
-            [],
-            {
-              #sender: sender,
-              #isSegwit: isSegwit,
-            },
-          ),
-        )),
-      ) as _i16.Future<_i12.Address>);
-  @override
-  _i16.Future<void> checkCurrentPaynymReceivingAddressForTransactions({
-    required _i13.PaymentCode? sender,
-    required bool? isSegwit,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkCurrentPaynymReceivingAddressForTransactions,
-          [],
-          {
-            #sender: sender,
-            #isSegwit: isSegwit,
-          },
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<void> checkAllCurrentReceivingPaynymAddressesForTransactions() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkAllCurrentReceivingPaynymAddressesForTransactions,
-          [],
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<_i11.BIP32> deriveNotificationBip32Node() => (super.noSuchMethod(
-        Invocation.method(
-          #deriveNotificationBip32Node,
-          [],
-        ),
-        returnValue: _i16.Future<_i11.BIP32>.value(_FakeBIP32_10(
-          this,
-          Invocation.method(
-            #deriveNotificationBip32Node,
-            [],
-          ),
-        )),
-      ) as _i16.Future<_i11.BIP32>);
-  @override
-  _i16.Future<_i13.PaymentCode> getPaymentCode({required bool? isSegwit}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getPaymentCode,
-          [],
-          {#isSegwit: isSegwit},
-        ),
-        returnValue: _i16.Future<_i13.PaymentCode>.value(_FakePaymentCode_12(
-          this,
-          Invocation.method(
-            #getPaymentCode,
-            [],
-            {#isSegwit: isSegwit},
-          ),
-        )),
-      ) as _i16.Future<_i13.PaymentCode>);
-  @override
-  _i16.Future<_i21.Uint8List> signWithNotificationKey(_i21.Uint8List? data) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #signWithNotificationKey,
-          [data],
-        ),
-        returnValue: _i16.Future<_i21.Uint8List>.value(_i21.Uint8List(0)),
-      ) as _i16.Future<_i21.Uint8List>);
-  @override
-  _i16.Future<String> signStringWithNotificationKey(String? data) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #signStringWithNotificationKey,
-          [data],
-        ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
-  @override
-  _i16.Future<Map<String, dynamic>> preparePaymentCodeSend({
-    required _i13.PaymentCode? paymentCode,
-    required bool? isSegwit,
-    required _i9.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #preparePaymentCodeSend,
-          [],
-          {
-            #paymentCode: paymentCode,
-            #isSegwit: isSegwit,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
-  @override
-  _i16.Future<_i12.Address> nextUnusedSendAddressFrom({
-    required _i13.PaymentCode? pCode,
-    required bool? isSegwit,
-    required _i11.BIP32? privateKeyNode,
-    int? startIndex = 0,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #nextUnusedSendAddressFrom,
-          [],
-          {
-            #pCode: pCode,
-            #isSegwit: isSegwit,
-            #privateKeyNode: privateKeyNode,
-            #startIndex: startIndex,
-          },
-        ),
-        returnValue: _i16.Future<_i12.Address>.value(_FakeAddress_11(
-          this,
-          Invocation.method(
-            #nextUnusedSendAddressFrom,
-            [],
-            {
-              #pCode: pCode,
-              #isSegwit: isSegwit,
-              #privateKeyNode: privateKeyNode,
-              #startIndex: startIndex,
-            },
-          ),
-        )),
-      ) as _i16.Future<_i12.Address>);
-  @override
-  _i16.Future<Map<String, dynamic>> prepareNotificationTx({
-    required int? selectedTxFeeRate,
-    required String? targetPaymentCodeString,
-    int? additionalOutputs = 0,
-    List<_i12.UTXO>? utxos,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareNotificationTx,
-          [],
-          {
-            #selectedTxFeeRate: selectedTxFeeRate,
-            #targetPaymentCodeString: targetPaymentCodeString,
-            #additionalOutputs: additionalOutputs,
-            #utxos: utxos,
-          },
-        ),
-        returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
-  @override
-  _i16.Future<String> broadcastNotificationTx(
-          {required Map<String, dynamic>? preparedTx}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #broadcastNotificationTx,
-          [],
-          {#preparedTx: preparedTx},
-        ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
-  @override
-  _i16.Future<bool> hasConnected(String? paymentCodeString) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #hasConnected,
-          [paymentCodeString],
-        ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
-  @override
-  _i16.Future<_i13.PaymentCode?> unBlindedPaymentCodeFromTransaction(
-          {required _i12.Transaction? transaction}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #unBlindedPaymentCodeFromTransaction,
-          [],
-          {#transaction: transaction},
-        ),
-        returnValue: _i16.Future<_i13.PaymentCode?>.value(),
-      ) as _i16.Future<_i13.PaymentCode?>);
-  @override
-  _i16.Future<_i13.PaymentCode?> unBlindedPaymentCodeFromTransactionBad(
-          {required _i12.Transaction? transaction}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #unBlindedPaymentCodeFromTransactionBad,
-          [],
-          {#transaction: transaction},
-        ),
-        returnValue: _i16.Future<_i13.PaymentCode?>.value(),
-      ) as _i16.Future<_i13.PaymentCode?>);
-  @override
-  _i16.Future<List<_i13.PaymentCode>>
-      getAllPaymentCodesFromNotificationTransactions() => (super.noSuchMethod(
-            Invocation.method(
-              #getAllPaymentCodesFromNotificationTransactions,
-              [],
-            ),
-            returnValue:
-                _i16.Future<List<_i13.PaymentCode>>.value(<_i13.PaymentCode>[]),
-          ) as _i16.Future<List<_i13.PaymentCode>>);
-  @override
-  _i16.Future<void> checkForNotificationTransactionsTo(
-          Set<String>? otherCodeStrings) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkForNotificationTransactionsTo,
-          [otherCodeStrings],
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<void> restoreAllHistory({
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required Set<String>? paymentCodeStrings,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #restoreAllHistory,
-          [],
-          {
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #paymentCodeStrings: paymentCodeStrings,
-          },
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<void> restoreHistoryWith({
-    required _i13.PaymentCode? other,
-    required bool? checkSegwitAsWell,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #restoreHistoryWith,
-          [],
-          {
-            #other: other,
-            #checkSegwitAsWell: checkSegwitAsWell,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-          },
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<_i12.Address> getMyNotificationAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #getMyNotificationAddress,
-          [],
-        ),
-        returnValue: _i16.Future<_i12.Address>.value(_FakeAddress_11(
-          this,
-          Invocation.method(
-            #getMyNotificationAddress,
-            [],
-          ),
-        )),
-      ) as _i16.Future<_i12.Address>);
-  @override
-  _i16.Future<List<String>> lookupKey(String? paymentCodeString) =>
-      (super.noSuchMethod(
+  void initFiroHive(String? walletId) => super.noSuchMethod(
         Invocation.method(
-          #lookupKey,
-          [paymentCodeString],
+          #initFiroHive,
+          [walletId],
         ),
-        returnValue: _i16.Future<List<String>>.value(<String>[]),
-      ) as _i16.Future<List<String>>);
+        returnValueForMissingStub: null,
+      );
   @override
-  _i16.Future<String?> paymentCodeStringByKey(String? key) =>
+  _i11.Future<void> firoUpdateJIndex(List<dynamic>? jIndex) =>
       (super.noSuchMethod(
         Invocation.method(
-          #paymentCodeStringByKey,
-          [key],
+          #firoUpdateJIndex,
+          [jIndex],
         ),
-        returnValue: _i16.Future<String?>.value(),
-      ) as _i16.Future<String?>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<String> storeCode(String? paymentCodeString) =>
+  _i11.Future<void> firoUpdateLelantusCoins(List<dynamic>? lelantusCoins) =>
       (super.noSuchMethod(
         Invocation.method(
-          #storeCode,
-          [paymentCodeString],
+          #firoUpdateLelantusCoins,
+          [lelantusCoins],
         ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  void initCoinControlInterface({
-    required String? walletId,
-    required String? walletName,
-    required _i17.Coin? coin,
-    required _i7.MainDB? db,
-    required _i16.Future<int> Function()? getChainHeight,
-    required _i16.Future<void> Function(_i6.Balance)? refreshedBalanceCallback,
-  }) =>
-      super.noSuchMethod(
+  int firoGetMintIndex() => (super.noSuchMethod(
         Invocation.method(
-          #initCoinControlInterface,
+          #firoGetMintIndex,
           [],
-          {
-            #walletId: walletId,
-            #walletName: walletName,
-            #coin: coin,
-            #db: db,
-            #getChainHeight: getChainHeight,
-            #refreshedBalanceCallback: refreshedBalanceCallback,
-          },
         ),
-        returnValueForMissingStub: null,
-      );
+        returnValue: 0,
+      ) as int);
   @override
-  _i16.Future<void> refreshBalance({bool? notify = false}) =>
-      (super.noSuchMethod(
+  _i11.Future<void> firoUpdateMintIndex(int? mintIndex) => (super.noSuchMethod(
         Invocation.method(
-          #refreshBalance,
-          [],
-          {#notify: notify},
+          #firoUpdateMintIndex,
+          [mintIndex],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
 }
 
 /// A class which mocks [ElectrumX].
@@ -1473,7 +1149,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
         returnValue: false,
       ) as bool);
   @override
-  _i16.Future<dynamic> request({
+  _i11.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
     Duration? connectionTimeout = const Duration(seconds: 60),
@@ -1492,10 +1168,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retries: retries,
           },
         ),
-        returnValue: _i16.Future<dynamic>.value(),
-      ) as _i16.Future<dynamic>);
+        returnValue: _i11.Future<dynamic>.value(),
+      ) as _i11.Future<dynamic>);
   @override
-  _i16.Future<List<Map<String, dynamic>>> batchRequest({
+  _i11.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
     Duration? connectionTimeout = const Duration(seconds: 60),
@@ -1512,11 +1188,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retries: retries,
           },
         ),
-        returnValue: _i16.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i16.Future<List<Map<String, dynamic>>>);
+      ) as _i11.Future<List<Map<String, dynamic>>>);
   @override
-  _i16.Future<bool> ping({
+  _i11.Future<bool> ping({
     String? requestID,
     int? retryCount = 1,
   }) =>
@@ -1529,10 +1205,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retryCount: retryCount,
           },
         ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
+        returnValue: _i11.Future<bool>.value(false),
+      ) as _i11.Future<bool>);
   @override
-  _i16.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+  _i11.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getBlockHeadTip,
@@ -1540,10 +1216,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+  _i11.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getServerFeatures,
@@ -1551,10 +1227,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<String> broadcastTransaction({
+  _i11.Future<String> broadcastTransaction({
     required String? rawTx,
     String? requestID,
   }) =>
@@ -1567,10 +1243,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  _i16.Future<Map<String, dynamic>> getBalance({
+  _i11.Future<Map<String, dynamic>> getBalance({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -1584,10 +1260,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<List<Map<String, dynamic>>> getHistory({
+  _i11.Future<List<Map<String, dynamic>>> getHistory({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -1600,11 +1276,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i16.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i16.Future<List<Map<String, dynamic>>>);
+      ) as _i11.Future<List<Map<String, dynamic>>>);
   @override
-  _i16.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+  _i11.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
           {required Map<String, List<dynamic>>? args}) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1612,11 +1288,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           [],
           {#args: args},
         ),
-        returnValue: _i16.Future<Map<String, List<Map<String, dynamic>>>>.value(
+        returnValue: _i11.Future<Map<String, List<Map<String, dynamic>>>>.value(
             <String, List<Map<String, dynamic>>>{}),
-      ) as _i16.Future<Map<String, List<Map<String, dynamic>>>>);
+      ) as _i11.Future<Map<String, List<Map<String, dynamic>>>>);
   @override
-  _i16.Future<List<Map<String, dynamic>>> getUTXOs({
+  _i11.Future<List<Map<String, dynamic>>> getUTXOs({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -1629,11 +1305,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i16.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i16.Future<List<Map<String, dynamic>>>);
+      ) as _i11.Future<List<Map<String, dynamic>>>);
   @override
-  _i16.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+  _i11.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
           {required Map<String, List<dynamic>>? args}) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1641,11 +1317,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           [],
           {#args: args},
         ),
-        returnValue: _i16.Future<Map<String, List<Map<String, dynamic>>>>.value(
+        returnValue: _i11.Future<Map<String, List<Map<String, dynamic>>>>.value(
             <String, List<Map<String, dynamic>>>{}),
-      ) as _i16.Future<Map<String, List<Map<String, dynamic>>>>);
+      ) as _i11.Future<Map<String, List<Map<String, dynamic>>>>);
   @override
-  _i16.Future<Map<String, dynamic>> getTransaction({
+  _i11.Future<Map<String, dynamic>> getTransaction({
     required String? txHash,
     bool? verbose = true,
     String? requestID,
@@ -1661,10 +1337,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<Map<String, dynamic>> getAnonymitySet({
+  _i11.Future<Map<String, dynamic>> getAnonymitySet({
     String? groupId = r'1',
     String? blockhash = r'',
     String? requestID,
@@ -1680,10 +1356,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<dynamic> getMintData({
+  _i11.Future<dynamic> getMintData({
     dynamic mints,
     String? requestID,
   }) =>
@@ -1696,10 +1372,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i16.Future<dynamic>.value(),
-      ) as _i16.Future<dynamic>);
+        returnValue: _i11.Future<dynamic>.value(),
+      ) as _i11.Future<dynamic>);
   @override
-  _i16.Future<Map<String, dynamic>> getUsedCoinSerials({
+  _i11.Future<Map<String, dynamic>> getUsedCoinSerials({
     String? requestID,
     required int? startNumber,
   }) =>
@@ -1713,19 +1389,19 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+  _i11.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
         Invocation.method(
           #getLatestCoinId,
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i16.Future<int>.value(0),
-      ) as _i16.Future<int>);
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
   @override
-  _i16.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+  _i11.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getFeeRate,
@@ -1733,10 +1409,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<_i14.Decimal> estimateFee({
+  _i11.Future<_i9.Decimal> estimateFee({
     String? requestID,
     required int? blocks,
   }) =>
@@ -1749,7 +1425,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i16.Future<_i14.Decimal>.value(_FakeDecimal_13(
+        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_7(
           this,
           Invocation.method(
             #estimateFee,
@@ -1760,16 +1436,15 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             },
           ),
         )),
-      ) as _i16.Future<_i14.Decimal>);
+      ) as _i11.Future<_i9.Decimal>);
   @override
-  _i16.Future<_i14.Decimal> relayFee({String? requestID}) =>
-      (super.noSuchMethod(
+  _i11.Future<_i9.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
         Invocation.method(
           #relayFee,
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i16.Future<_i14.Decimal>.value(_FakeDecimal_13(
+        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_7(
           this,
           Invocation.method(
             #relayFee,
@@ -1777,5 +1452,5 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             {#requestID: requestID},
           ),
         )),
-      ) as _i16.Future<_i14.Decimal>);
+      ) as _i11.Future<_i9.Decimal>);
 }
diff --git a/test/services/coins/namecoin/namecoin_wallet_test.mocks.dart b/test/services/coins/namecoin/namecoin_wallet_test.mocks.dart
new file mode 100644
index 000000000..ec242c79c
--- /dev/null
+++ b/test/services/coins/namecoin/namecoin_wallet_test.mocks.dart
@@ -0,0 +1,564 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/namecoin/namecoin_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+  @override
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i6.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i6.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
+  @override
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i7.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
diff --git a/test/services/coins/particl/particl_wallet_test.mocks.dart b/test/services/coins/particl/particl_wallet_test.mocks.dart
new file mode 100644
index 000000000..e4677cc8e
--- /dev/null
+++ b/test/services/coins/particl/particl_wallet_test.mocks.dart
@@ -0,0 +1,564 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/particl/particl_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+  @override
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i6.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i6.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
+  @override
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i7.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
diff --git a/test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart b/test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart
new file mode 100644
index 000000000..59e02607b
--- /dev/null
+++ b/test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/custom_buttons/favorite_toggle_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/widget_tests/custom_loading_overlay_test.mocks.dart b/test/widget_tests/custom_loading_overlay_test.mocks.dart
new file mode 100644
index 000000000..f192714d8
--- /dev/null
+++ b/test/widget_tests/custom_loading_overlay_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/custom_loading_overlay_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/widget_tests/desktop/desktop_scaffold_test.mocks.dart b/test/widget_tests/desktop/desktop_scaffold_test.mocks.dart
new file mode 100644
index 000000000..5972c21c2
--- /dev/null
+++ b/test/widget_tests/desktop/desktop_scaffold_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/desktop/desktop_scaffold_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/widget_tests/managed_favorite_test.mocks.dart b/test/widget_tests/managed_favorite_test.mocks.dart
index 7b5cab81e..5bd694533 100644
--- a/test/widget_tests/managed_favorite_test.mocks.dart
+++ b/test/widget_tests/managed_favorite_test.mocks.dart
@@ -1,5 +1,5 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/widget_tests/managed_favorite_test.dart.
+// in stackwallet/test/widget_tests/managed_favorite_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
@@ -13,28 +13,31 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i12;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
-import 'package:stackduo/models/balance.dart' as _i11;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/node_model.dart' as _i31;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
-import 'package:stackduo/models/signing_data.dart' as _i28;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i26;
-import 'package:stackduo/services/coins/coin_service.dart' as _i20;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/locale_service.dart' as _i30;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
-import 'package:stackduo/services/wallets.dart' as _i21;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i14;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i27;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
+import 'package:stackwallet/db/isar/main_db.dart' as _i12;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i10;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i9;
+import 'package:stackwallet/models/balance.dart' as _i11;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i31;
+import 'package:stackwallet/models/node_model.dart' as _i33;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i8;
+import 'package:stackwallet/models/signing_data.dart' as _i28;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i26;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i20;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/locale_service.dart' as _i32;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/services/wallets.dart' as _i21;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i30;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i22;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i27;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
     as _i19;
-import 'package:stackduo/utilities/prefs.dart' as _i24;
+import 'package:stackwallet/utilities/prefs.dart' as _i24;
 import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
@@ -1439,6 +1442,25 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i23.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
   void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
@@ -1935,10 +1957,109 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
       ) as _i23.Future<void>);
 }
 
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i30.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i12.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_9(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i12.MainDB);
+  @override
+  List<_i31.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i31.StackTheme>[],
+      ) as List<_i31.StackTheme>);
+  @override
+  void init(_i12.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i23.Future<void> install({required _i29.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<bool>.value(false),
+      ) as _i23.Future<bool>);
+  @override
+  _i23.Future<List<_i30.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i23.Future<List<_i30.StackThemeMetaData>>.value(
+            <_i30.StackThemeMetaData>[]),
+      ) as _i23.Future<List<_i30.StackThemeMetaData>>);
+  @override
+  _i23.Future<_i29.Uint8List> fetchTheme(
+          {required _i30.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
+      ) as _i23.Future<_i29.Uint8List>);
+  @override
+  _i31.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i31.StackTheme?);
+}
+
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i30.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i32.LocaleService {
   MockLocaleService() {
     _i1.throwOnMissingStub(this);
   }
@@ -2010,15 +2131,15 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         ),
       ) as _i19.SecureStorageInterface);
   @override
-  List<_i31.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i33.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i31.NodeModel>[],
-      ) as List<_i31.NodeModel>);
+        returnValue: <_i33.NodeModel>[],
+      ) as List<_i33.NodeModel>);
   @override
-  List<_i31.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i33.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i31.NodeModel>[],
-      ) as List<_i31.NodeModel>);
+        returnValue: <_i33.NodeModel>[],
+      ) as List<_i33.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -2036,7 +2157,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
   @override
   _i23.Future<void> setPrimaryNodeFor({
     required _i22.Coin? coin,
-    required _i31.NodeModel? node,
+    required _i33.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -2053,40 +2174,40 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i31.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
+  _i33.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i31.NodeModel?);
+      )) as _i33.NodeModel?);
   @override
-  List<_i31.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
+  List<_i33.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i31.NodeModel>[],
-      ) as List<_i31.NodeModel>);
+        returnValue: <_i33.NodeModel>[],
+      ) as List<_i33.NodeModel>);
   @override
-  _i31.NodeModel? getNodeById({required String? id}) =>
+  _i33.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i31.NodeModel?);
+      )) as _i33.NodeModel?);
   @override
-  List<_i31.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
+  List<_i33.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i31.NodeModel>[],
-      ) as List<_i31.NodeModel>);
+        returnValue: <_i33.NodeModel>[],
+      ) as List<_i33.NodeModel>);
   @override
   _i23.Future<void> add(
-    _i31.NodeModel? node,
+    _i33.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2138,7 +2259,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
       ) as _i23.Future<void>);
   @override
   _i23.Future<void> edit(
-    _i31.NodeModel? editedNode,
+    _i33.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2349,6 +2470,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
diff --git a/test/widget_tests/table_view/table_view_row_test.mocks.dart b/test/widget_tests/table_view/table_view_row_test.mocks.dart
index 66646e6bc..d86e3d82d 100644
--- a/test/widget_tests/table_view/table_view_row_test.mocks.dart
+++ b/test/widget_tests/table_view/table_view_row_test.mocks.dart
@@ -1,10 +1,10 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/widget_tests/table_view/table_view_row_test.dart.
+// in stackwallet/test/widget_tests/table_view/table_view_row_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i22;
-import 'dart:typed_data' as _i29;
+import 'dart:typed_data' as _i27;
 import 'dart:ui' as _i24;
 
 import 'package:bip32/bip32.dart' as _i16;
@@ -13,26 +13,29 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i12;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
-import 'package:stackduo/models/balance.dart' as _i11;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
-import 'package:stackduo/models/signing_data.dart' as _i27;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i25;
-import 'package:stackduo/services/coins/coin_service.dart' as _i19;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
-import 'package:stackduo/services/wallets.dart' as _i20;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i14;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i21;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i26;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
-    as _i28;
-import 'package:stackduo/utilities/prefs.dart' as _i23;
+import 'package:stackwallet/db/isar/main_db.dart' as _i7;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i11;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i10;
+import 'package:stackwallet/models/balance.dart' as _i12;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i26;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i9;
+import 'package:stackwallet/models/signing_data.dart' as _i30;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i28;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i19;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i8;
+import 'package:stackwallet/services/wallets.dart' as _i20;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i25;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i21;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i29;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
+    as _i31;
+import 'package:stackwallet/utilities/prefs.dart' as _i23;
 import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
@@ -88,9 +91,8 @@ class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
         );
 }
 
-class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
-    implements _i7.TransactionNotificationTracker {
-  _FakeTransactionNotificationTracker_4(
+class _FakeMainDB_4 extends _i1.SmartFake implements _i7.MainDB {
+  _FakeMainDB_4(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -99,8 +101,9 @@ class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
         );
 }
 
-class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
-  _FakeFeeObject_5(
+class _FakeTransactionNotificationTracker_5 extends _i1.SmartFake
+    implements _i8.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_5(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -109,8 +112,8 @@ class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
         );
 }
 
-class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
-  _FakeElectrumX_6(
+class _FakeFeeObject_6 extends _i1.SmartFake implements _i9.FeeObject {
+  _FakeFeeObject_6(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -119,9 +122,8 @@ class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
         );
 }
 
-class _FakeCachedElectrumX_7 extends _i1.SmartFake
-    implements _i10.CachedElectrumX {
-  _FakeCachedElectrumX_7(
+class _FakeElectrumX_7 extends _i1.SmartFake implements _i10.ElectrumX {
+  _FakeElectrumX_7(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -130,8 +132,9 @@ class _FakeCachedElectrumX_7 extends _i1.SmartFake
         );
 }
 
-class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
-  _FakeBalance_8(
+class _FakeCachedElectrumX_8 extends _i1.SmartFake
+    implements _i11.CachedElectrumX {
+  _FakeCachedElectrumX_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -140,8 +143,8 @@ class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
         );
 }
 
-class _FakeMainDB_9 extends _i1.SmartFake implements _i12.MainDB {
-  _FakeMainDB_9(
+class _FakeBalance_9 extends _i1.SmartFake implements _i12.Balance {
+  _FakeBalance_9(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -160,7 +163,8 @@ class _FakeNetworkType_10 extends _i1.SmartFake implements _i13.NetworkType {
         );
 }
 
-class _FakeElectrumXNode_11 extends _i1.SmartFake implements _i9.ElectrumXNode {
+class _FakeElectrumXNode_11 extends _i1.SmartFake
+    implements _i10.ElectrumXNode {
   _FakeElectrumXNode_11(
     Object parent,
     Invocation parentInvocation,
@@ -674,10 +678,109 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
       );
 }
 
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i25.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i7.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_4(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i7.MainDB);
+  @override
+  List<_i26.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i26.StackTheme>[],
+      ) as List<_i26.StackTheme>);
+  @override
+  void init(_i7.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i22.Future<void> install({required _i27.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i22.Future<void>.value(),
+        returnValueForMissingStub: _i22.Future<void>.value(),
+      ) as _i22.Future<void>);
+  @override
+  _i22.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i22.Future<void>.value(),
+        returnValueForMissingStub: _i22.Future<void>.value(),
+      ) as _i22.Future<void>);
+  @override
+  _i22.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i22.Future<void>.value(),
+        returnValueForMissingStub: _i22.Future<void>.value(),
+      ) as _i22.Future<void>);
+  @override
+  _i22.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i22.Future<bool>.value(false),
+      ) as _i22.Future<bool>);
+  @override
+  _i22.Future<List<_i25.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i22.Future<List<_i25.StackThemeMetaData>>.value(
+            <_i25.StackThemeMetaData>[]),
+      ) as _i22.Future<List<_i25.StackThemeMetaData>>);
+  @override
+  _i22.Future<_i27.Uint8List> fetchTheme(
+          {required _i25.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i22.Future<_i27.Uint8List>.value(_i27.Uint8List(0)),
+      ) as _i22.Future<_i27.Uint8List>);
+  @override
+  _i26.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i26.StackTheme?);
+}
+
 /// A class which mocks [BitcoinWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
+class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
   MockBitcoinWallet() {
     _i1.throwOnMissingStub(this);
   }
@@ -691,15 +794,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i7.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+  _i8.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
         Invocation.getter(#txTracker),
-        returnValue: _FakeTransactionNotificationTracker_4(
+        returnValue: _FakeTransactionNotificationTracker_5(
           this,
           Invocation.getter(#txTracker),
         ),
-      ) as _i7.TransactionNotificationTracker);
+      ) as _i8.TransactionNotificationTracker);
   @override
-  set txTracker(_i7.TransactionNotificationTracker? _txTracker) =>
+  set txTracker(_i8.TransactionNotificationTracker? _txTracker) =>
       super.noSuchMethod(
         Invocation.setter(
           #txTracker,
@@ -796,13 +899,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i22.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i22.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i22.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i22.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i22.Future<_i8.FeeObject>);
+      ) as _i22.Future<_i9.FeeObject>);
   @override
   _i22.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -875,29 +978,29 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i9.ElectrumX get electrumXClient => (super.noSuchMethod(
+  _i10.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_6(
+        returnValue: _FakeElectrumX_7(
           this,
           Invocation.getter(#electrumXClient),
         ),
-      ) as _i9.ElectrumX);
+      ) as _i10.ElectrumX);
   @override
-  _i10.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+  _i11.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
         Invocation.getter(#cachedElectrumXClient),
-        returnValue: _FakeCachedElectrumX_7(
+        returnValue: _FakeCachedElectrumX_8(
           this,
           Invocation.getter(#cachedElectrumXClient),
         ),
-      ) as _i10.CachedElectrumX);
+      ) as _i11.CachedElectrumX);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i22.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
@@ -913,13 +1016,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i12.MainDB get db => (super.noSuchMethod(
+  _i7.MainDB get db => (super.noSuchMethod(
         Invocation.getter(#db),
-        returnValue: _FakeMainDB_9(
+        returnValue: _FakeMainDB_4(
           this,
           Invocation.getter(#db),
         ),
-      ) as _i12.MainDB);
+      ) as _i7.MainDB);
   @override
   _i13.NetworkType get networkType => (super.noSuchMethod(
         Invocation.getter(#networkType),
@@ -938,15 +1041,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i26.DerivePathType addressType({required String? address}) =>
+  _i29.DerivePathType addressType({required String? address}) =>
       (super.noSuchMethod(
         Invocation.method(
           #addressType,
           [],
           {#address: address},
         ),
-        returnValue: _i26.DerivePathType.bip44,
-      ) as _i26.DerivePathType);
+        returnValue: _i29.DerivePathType.bip44,
+      ) as _i29.DerivePathType);
   @override
   _i22.Future<void> recoverFromMnemonic({
     required String? mnemonic,
@@ -1105,19 +1208,20 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i22.Future<_i9.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+  _i22.Future<_i10.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
         Invocation.method(
           #getCurrentNode,
           [],
         ),
-        returnValue: _i22.Future<_i9.ElectrumXNode>.value(_FakeElectrumXNode_11(
+        returnValue:
+            _i22.Future<_i10.ElectrumXNode>.value(_FakeElectrumXNode_11(
           this,
           Invocation.method(
             #getCurrentNode,
             [],
           ),
         )),
-      ) as _i22.Future<_i9.ElectrumXNode>);
+      ) as _i22.Future<_i10.ElectrumXNode>);
   @override
   _i22.Future<List<Map<String, dynamic>>> fastFetch(
           List<String>? allTxHashes) =>
@@ -1199,7 +1303,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         },
       ));
   @override
-  _i22.Future<List<_i27.SigningData>> fetchBuildTxData(
+  _i22.Future<List<_i30.SigningData>> fetchBuildTxData(
           List<_i17.UTXO>? utxosToUse) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1207,11 +1311,11 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
           [utxosToUse],
         ),
         returnValue:
-            _i22.Future<List<_i27.SigningData>>.value(<_i27.SigningData>[]),
-      ) as _i22.Future<List<_i27.SigningData>>);
+            _i22.Future<List<_i30.SigningData>>.value(<_i30.SigningData>[]),
+      ) as _i22.Future<List<_i30.SigningData>>);
   @override
   _i22.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i27.SigningData>? utxoSigningData,
+    required List<_i30.SigningData>? utxoSigningData,
     required List<String>? recipients,
     required List<int>? satoshiAmounts,
   }) =>
@@ -1378,21 +1482,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i11.Balance getCachedBalance() => (super.noSuchMethod(
+  _i12.Balance getCachedBalance() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalance,
           [],
         ),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.method(
             #getCachedBalance,
             [],
           ),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
-  _i22.Future<void> updateCachedBalance(_i11.Balance? balance) =>
+  _i22.Future<void> updateCachedBalance(_i12.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalance,
@@ -1402,21 +1506,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i11.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+  _i12.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalanceSecondary,
           [],
         ),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.method(
             #getCachedBalanceSecondary,
             [],
           ),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
-  _i22.Future<void> updateCachedBalanceSecondary(_i11.Balance? balance) =>
+  _i22.Future<void> updateCachedBalanceSecondary(_i12.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalanceSecondary,
@@ -1426,7 +1530,26 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i22.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i22.Future<void>.value(),
+        returnValueForMissingStub: _i22.Future<void>.value(),
+      ) as _i22.Future<void>);
+  @override
+  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
           [],
@@ -1478,9 +1601,9 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
     required String? walletName,
     required _i13.NetworkType? network,
     required _i21.Coin? coin,
-    required _i12.MainDB? db,
-    required _i9.ElectrumX? electrumXClient,
-    required _i28.SecureStorageInterface? secureStorage,
+    required _i7.MainDB? db,
+    required _i10.ElectrumX? electrumXClient,
+    required _i31.SecureStorageInterface? secureStorage,
     required int? dustLimit,
     required int? dustLimitP2PKH,
     required int? minConfirms,
@@ -1500,7 +1623,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
     })?
         prepareSend,
     required _i22.Future<int> Function({required String address})? getTxCount,
-    required _i22.Future<List<_i27.SigningData>> Function(List<_i17.UTXO>)?
+    required _i22.Future<List<_i30.SigningData>> Function(List<_i17.UTXO>)?
         fetchBuildTxData,
     required _i22.Future<void> Function()? refresh,
     required _i22.Future<void> Function()? checkChangeAddressForTransactions,
@@ -1550,7 +1673,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         )),
       ) as _i22.Future<_i16.BIP32>);
   @override
-  _i22.Future<_i29.Uint8List> getPrivateKeyForPaynymReceivingAddress({
+  _i22.Future<_i27.Uint8List> getPrivateKeyForPaynymReceivingAddress({
     required String? paymentCodeString,
     required int? index,
   }) =>
@@ -1563,8 +1686,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
             #index: index,
           },
         ),
-        returnValue: _i22.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i22.Future<_i29.Uint8List>);
+        returnValue: _i22.Future<_i27.Uint8List>.value(_i27.Uint8List(0)),
+      ) as _i22.Future<_i27.Uint8List>);
   @override
   _i22.Future<_i17.Address> currentReceivingPaynymAddress({
     required _i18.PaymentCode? sender,
@@ -1650,14 +1773,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         )),
       ) as _i22.Future<_i18.PaymentCode>);
   @override
-  _i22.Future<_i29.Uint8List> signWithNotificationKey(_i29.Uint8List? data) =>
+  _i22.Future<_i27.Uint8List> signWithNotificationKey(_i27.Uint8List? data) =>
       (super.noSuchMethod(
         Invocation.method(
           #signWithNotificationKey,
           [data],
         ),
-        returnValue: _i22.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i22.Future<_i29.Uint8List>);
+        returnValue: _i22.Future<_i27.Uint8List>.value(_i27.Uint8List(0)),
+      ) as _i22.Future<_i27.Uint8List>);
   @override
   _i22.Future<String> signStringWithNotificationKey(String? data) =>
       (super.noSuchMethod(
@@ -1890,9 +2013,9 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
     required String? walletId,
     required String? walletName,
     required _i21.Coin? coin,
-    required _i12.MainDB? db,
+    required _i7.MainDB? db,
     required _i22.Future<int> Function()? getChainHeight,
-    required _i22.Future<void> Function(_i11.Balance)? refreshedBalanceCallback,
+    required _i22.Future<void> Function(_i12.Balance)? refreshedBalanceCallback,
   }) =>
       super.noSuchMethod(
         Invocation.method(
@@ -1989,13 +2112,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i22.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i22.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i22.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i22.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i22.Future<_i8.FeeObject>);
+      ) as _i22.Future<_i9.FeeObject>);
   @override
   _i22.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2007,13 +2130,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: _i22.Future<String>.value(''),
       ) as _i22.Future<String>);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i22.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
@@ -2074,6 +2197,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -2352,13 +2480,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i19.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i22.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i22.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i22.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i22.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i22.Future<_i8.FeeObject>);
+      ) as _i22.Future<_i9.FeeObject>);
   @override
   _i22.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2370,13 +2498,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i19.CoinServiceAPI {
         returnValue: _i22.Future<String>.value(''),
       ) as _i22.Future<String>);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i22.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
diff --git a/test/widget_tests/trade_card_test.mocks.dart b/test/widget_tests/trade_card_test.mocks.dart
new file mode 100644
index 000000000..55895389f
--- /dev/null
+++ b/test/widget_tests/trade_card_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/trade_card_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/widget_tests/transaction_card_test.mocks.dart b/test/widget_tests/transaction_card_test.mocks.dart
index 5e7fa925d..93cc0c9a7 100644
--- a/test/widget_tests/transaction_card_test.mocks.dart
+++ b/test/widget_tests/transaction_card_test.mocks.dart
@@ -1,32 +1,42 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/widget_tests/transaction_card_test.dart.
+// in stackwallet/test/widget_tests/transaction_card_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i14;
-import 'dart:ui' as _i16;
+import 'dart:async' as _i18;
+import 'dart:typed_data' as _i32;
+import 'dart:ui' as _i20;
 
-import 'package:decimal/decimal.dart' as _i22;
+import 'package:decimal/decimal.dart' as _i28;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/models/balance.dart' as _i9;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/models.dart' as _i8;
-import 'package:stackduo/services/coins/coin_service.dart' as _i7;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/locale_service.dart' as _i18;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/notes_service.dart' as _i23;
-import 'package:stackduo/services/price_service.dart' as _i21;
-import 'package:stackduo/services/wallets.dart' as _i12;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i10;
-import 'package:stackduo/utilities/enums/backup_frequency_type.dart' as _i20;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i13;
-import 'package:stackduo/utilities/enums/sync_type_enum.dart' as _i19;
-import 'package:stackduo/utilities/prefs.dart' as _i15;
-import 'package:tuple/tuple.dart' as _i11;
+import 'package:stackwallet/db/isar/main_db.dart' as _i14;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i13;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i12;
+import 'package:stackwallet/models/balance.dart' as _i9;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i21;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i31;
+import 'package:stackwallet/models/models.dart' as _i8;
+import 'package:stackwallet/models/signing_data.dart' as _i23;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i7;
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart' as _i22;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/locale_service.dart' as _i24;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/notes_service.dart' as _i29;
+import 'package:stackwallet/services/price_service.dart' as _i27;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i11;
+import 'package:stackwallet/services/wallets.dart' as _i16;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i30;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i10;
+import 'package:stackwallet/utilities/enums/backup_frequency_type.dart' as _i26;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i17;
+import 'package:stackwallet/utilities/enums/sync_type_enum.dart' as _i25;
+import 'package:stackwallet/utilities/prefs.dart' as _i19;
+import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -122,8 +132,9 @@ class _FakeAmount_7 extends _i1.SmartFake implements _i10.Amount {
         );
 }
 
-class _FakeDuration_8 extends _i1.SmartFake implements Duration {
-  _FakeDuration_8(
+class _FakeTransactionNotificationTracker_8 extends _i1.SmartFake
+    implements _i11.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -132,9 +143,50 @@ class _FakeDuration_8 extends _i1.SmartFake implements Duration {
         );
 }
 
-class _FakeTuple2_9<T1, T2> extends _i1.SmartFake
-    implements _i11.Tuple2<T1, T2> {
-  _FakeTuple2_9(
+class _FakeElectrumX_9 extends _i1.SmartFake implements _i12.ElectrumX {
+  _FakeElectrumX_9(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeCachedElectrumX_10 extends _i1.SmartFake
+    implements _i13.CachedElectrumX {
+  _FakeCachedElectrumX_10(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeMainDB_11 extends _i1.SmartFake implements _i14.MainDB {
+  _FakeMainDB_11(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeDuration_12 extends _i1.SmartFake implements Duration {
+  _FakeDuration_12(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeTuple2_13<T1, T2> extends _i1.SmartFake
+    implements _i15.Tuple2<T1, T2> {
+  _FakeTuple2_13(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -146,7 +198,7 @@ class _FakeTuple2_9<T1, T2> extends _i1.SmartFake
 /// A class which mocks [Wallets].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWallets extends _i1.Mock implements _i12.Wallets {
+class MockWallets extends _i1.Mock implements _i16.Wallets {
   MockWallets() {
     _i1.throwOnMissingStub(this);
   }
@@ -213,7 +265,7 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  List<String> getWalletIdsFor({required _i13.Coin? coin}) =>
+  List<String> getWalletIdsFor({required _i17.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getWalletIdsFor,
@@ -223,21 +275,21 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
         returnValue: <String>[],
       ) as List<String>);
   @override
-  List<_i11.Tuple2<_i13.Coin, List<_i5.ChangeNotifierProvider<_i6.Manager>>>>
+  List<_i15.Tuple2<_i17.Coin, List<_i5.ChangeNotifierProvider<_i6.Manager>>>>
       getManagerProvidersByCoin() => (super.noSuchMethod(
             Invocation.method(
               #getManagerProvidersByCoin,
               [],
             ),
             returnValue: <
-                _i11.Tuple2<_i13.Coin,
+                _i15.Tuple2<_i17.Coin,
                     List<_i5.ChangeNotifierProvider<_i6.Manager>>>>[],
           ) as List<
-              _i11.Tuple2<_i13.Coin,
+              _i15.Tuple2<_i17.Coin,
                   List<_i5.ChangeNotifierProvider<_i6.Manager>>>>);
   @override
   List<_i5.ChangeNotifierProvider<_i6.Manager>> getManagerProvidersForCoin(
-          _i13.Coin? coin) =>
+          _i17.Coin? coin) =>
       (super.noSuchMethod(
         Invocation.method(
           #getManagerProvidersForCoin,
@@ -301,17 +353,17 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  _i14.Future<void> load(_i15.Prefs? prefs) => (super.noSuchMethod(
+  _i18.Future<void> load(_i19.Prefs? prefs) => (super.noSuchMethod(
         Invocation.method(
           #load,
           [prefs],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> loadAfterStackRestore(
-    _i15.Prefs? prefs,
+  _i18.Future<void> loadAfterStackRestore(
+    _i19.Prefs? prefs,
     List<_i6.Manager>? managers,
   ) =>
       (super.noSuchMethod(
@@ -322,11 +374,11 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
             managers,
           ],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -334,7 +386,7 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -386,10 +438,10 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i13.Coin get coin => (super.noSuchMethod(
+  _i17.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i13.Coin.bitcoin,
-      ) as _i13.Coin);
+        returnValue: _i17.Coin.bitcoin,
+      ) as _i17.Coin);
   @override
   bool get isRefreshing => (super.noSuchMethod(
         Invocation.getter(#isRefreshing),
@@ -422,23 +474,23 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i14.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i18.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i14.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i18.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i14.Future<_i8.FeeObject>);
+      ) as _i18.Future<_i8.FeeObject>);
   @override
-  _i14.Future<int> get maxFee => (super.noSuchMethod(
+  _i18.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
-        returnValue: _i14.Future<int>.value(0),
-      ) as _i14.Future<int>);
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
   @override
-  _i14.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+  _i18.Future<String> get currentReceivingAddress => (super.noSuchMethod(
         Invocation.getter(#currentReceivingAddress),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
   _i9.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
@@ -448,16 +500,16 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         ),
       ) as _i9.Balance);
   @override
-  _i14.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
+  _i18.Future<List<_i21.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i14.Future<List<_i17.Transaction>>.value(<_i17.Transaction>[]),
-      ) as _i14.Future<List<_i17.Transaction>>);
+            _i18.Future<List<_i21.Transaction>>.value(<_i21.Transaction>[]),
+      ) as _i18.Future<List<_i21.Transaction>>);
   @override
-  _i14.Future<List<_i17.UTXO>> get utxos => (super.noSuchMethod(
+  _i18.Future<List<_i21.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i14.Future<List<_i17.UTXO>>.value(<_i17.UTXO>[]),
-      ) as _i14.Future<List<_i17.UTXO>>);
+        returnValue: _i18.Future<List<_i21.UTXO>>.value(<_i21.UTXO>[]),
+      ) as _i18.Future<List<_i21.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -477,15 +529,15 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: '',
       ) as String);
   @override
-  _i14.Future<List<String>> get mnemonic => (super.noSuchMethod(
+  _i18.Future<List<String>> get mnemonic => (super.noSuchMethod(
         Invocation.getter(#mnemonic),
-        returnValue: _i14.Future<List<String>>.value(<String>[]),
-      ) as _i14.Future<List<String>>);
+        returnValue: _i18.Future<List<String>>.value(<String>[]),
+      ) as _i18.Future<List<String>>);
   @override
-  _i14.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+  _i18.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
         Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i14.Future<String?>.value(),
-      ) as _i14.Future<String?>);
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
   @override
   bool get isConnected => (super.noSuchMethod(
         Invocation.getter(#isConnected),
@@ -507,6 +559,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -522,24 +579,24 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<String> get xpub => (super.noSuchMethod(
+  _i18.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+  _i18.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
         Invocation.method(
           #updateNode,
           [shouldRefresh],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
   void dispose() => super.noSuchMethod(
         Invocation.method(
@@ -549,7 +606,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i14.Future<Map<String, dynamic>> prepareSend({
+  _i18.Future<Map<String, dynamic>> prepareSend({
     required String? address,
     required _i10.Amount? amount,
     Map<String, dynamic>? args,
@@ -565,27 +622,27 @@ class MockManager extends _i1.Mock implements _i6.Manager {
           },
         ),
         returnValue:
-            _i14.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i14.Future<Map<String, dynamic>>);
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
   @override
-  _i14.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+  _i18.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
       (super.noSuchMethod(
         Invocation.method(
           #confirmSend,
           [],
           {#txData: txData},
         ),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
-  _i14.Future<void> refresh() => (super.noSuchMethod(
+  _i18.Future<void> refresh() => (super.noSuchMethod(
         Invocation.method(
           #refresh,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
   bool validateAddress(String? address) => (super.noSuchMethod(
         Invocation.method(
@@ -595,33 +652,33 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+  _i18.Future<bool> testNetworkConnection() => (super.noSuchMethod(
         Invocation.method(
           #testNetworkConnection,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> initializeNew() => (super.noSuchMethod(
+  _i18.Future<void> initializeNew() => (super.noSuchMethod(
         Invocation.method(
           #initializeNew,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> initializeExisting() => (super.noSuchMethod(
+  _i18.Future<void> initializeExisting() => (super.noSuchMethod(
         Invocation.method(
           #initializeExisting,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> recoverFromMnemonic({
+  _i18.Future<void> recoverFromMnemonic({
     required String? mnemonic,
     String? mnemonicPassphrase,
     required int? maxUnusedAddressGap,
@@ -640,20 +697,20 @@ class MockManager extends _i1.Mock implements _i6.Manager {
             #height: height,
           },
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> exitCurrentWallet() => (super.noSuchMethod(
+  _i18.Future<void> exitCurrentWallet() => (super.noSuchMethod(
         Invocation.method(
           #exitCurrentWallet,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> fullRescan(
+  _i18.Future<void> fullRescan(
     int? maxUnusedAddressGap,
     int? maxNumberOfIndexesToCheck,
   ) =>
@@ -665,11 +722,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
             maxNumberOfIndexesToCheck,
           ],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<_i10.Amount> estimateFeeFor(
+  _i18.Future<_i10.Amount> estimateFeeFor(
     _i10.Amount? amount,
     int? feeRate,
   ) =>
@@ -681,7 +738,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
             feeRate,
           ],
         ),
-        returnValue: _i14.Future<_i10.Amount>.value(_FakeAmount_7(
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
           this,
           Invocation.method(
             #estimateFeeFor,
@@ -691,26 +748,26 @@ class MockManager extends _i1.Mock implements _i6.Manager {
             ],
           ),
         )),
-      ) as _i14.Future<_i10.Amount>);
+      ) as _i18.Future<_i10.Amount>);
   @override
-  _i14.Future<bool> generateNewAddress() => (super.noSuchMethod(
+  _i18.Future<bool> generateNewAddress() => (super.noSuchMethod(
         Invocation.method(
           #generateNewAddress,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
+  _i18.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
         Invocation.method(
           #resetRescanOnOpen,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -718,7 +775,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -753,10 +810,10 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i13.Coin get coin => (super.noSuchMethod(
+  _i17.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i13.Coin.bitcoin,
-      ) as _i13.Coin);
+        returnValue: _i17.Coin.bitcoin,
+      ) as _i17.Coin);
   @override
   bool get isRefreshing => (super.noSuchMethod(
         Invocation.getter(#isRefreshing),
@@ -789,23 +846,23 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i14.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i18.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i14.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i18.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i14.Future<_i8.FeeObject>);
+      ) as _i18.Future<_i8.FeeObject>);
   @override
-  _i14.Future<int> get maxFee => (super.noSuchMethod(
+  _i18.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
-        returnValue: _i14.Future<int>.value(0),
-      ) as _i14.Future<int>);
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
   @override
-  _i14.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+  _i18.Future<String> get currentReceivingAddress => (super.noSuchMethod(
         Invocation.getter(#currentReceivingAddress),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
   _i9.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
@@ -815,16 +872,16 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         ),
       ) as _i9.Balance);
   @override
-  _i14.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
+  _i18.Future<List<_i21.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i14.Future<List<_i17.Transaction>>.value(<_i17.Transaction>[]),
-      ) as _i14.Future<List<_i17.Transaction>>);
+            _i18.Future<List<_i21.Transaction>>.value(<_i21.Transaction>[]),
+      ) as _i18.Future<List<_i21.Transaction>>);
   @override
-  _i14.Future<List<_i17.UTXO>> get utxos => (super.noSuchMethod(
+  _i18.Future<List<_i21.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i14.Future<List<_i17.UTXO>>.value(<_i17.UTXO>[]),
-      ) as _i14.Future<List<_i17.UTXO>>);
+        returnValue: _i18.Future<List<_i21.UTXO>>.value(<_i21.UTXO>[]),
+      ) as _i18.Future<List<_i21.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -844,20 +901,20 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValue: '',
       ) as String);
   @override
-  _i14.Future<List<String>> get mnemonic => (super.noSuchMethod(
+  _i18.Future<List<String>> get mnemonic => (super.noSuchMethod(
         Invocation.getter(#mnemonic),
-        returnValue: _i14.Future<List<String>>.value(<String>[]),
-      ) as _i14.Future<List<String>>);
+        returnValue: _i18.Future<List<String>>.value(<String>[]),
+      ) as _i18.Future<List<String>>);
   @override
-  _i14.Future<String?> get mnemonicString => (super.noSuchMethod(
+  _i18.Future<String?> get mnemonicString => (super.noSuchMethod(
         Invocation.getter(#mnemonicString),
-        returnValue: _i14.Future<String?>.value(),
-      ) as _i14.Future<String?>);
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
   @override
-  _i14.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+  _i18.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
         Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i14.Future<String?>.value(),
-      ) as _i14.Future<String?>);
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
   @override
   bool get hasCalledExit => (super.noSuchMethod(
         Invocation.getter(#hasCalledExit),
@@ -874,7 +931,7 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValue: 0,
       ) as int);
   @override
-  _i14.Future<Map<String, dynamic>> prepareSend({
+  _i18.Future<Map<String, dynamic>> prepareSend({
     required String? address,
     required _i10.Amount? amount,
     Map<String, dynamic>? args,
@@ -890,36 +947,36 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
           },
         ),
         returnValue:
-            _i14.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i14.Future<Map<String, dynamic>>);
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
   @override
-  _i14.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+  _i18.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
       (super.noSuchMethod(
         Invocation.method(
           #confirmSend,
           [],
           {#txData: txData},
         ),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
-  _i14.Future<void> refresh() => (super.noSuchMethod(
+  _i18.Future<void> refresh() => (super.noSuchMethod(
         Invocation.method(
           #refresh,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+  _i18.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
         Invocation.method(
           #updateNode,
           [shouldRefresh],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
   bool validateAddress(String? address) => (super.noSuchMethod(
         Invocation.method(
@@ -929,15 +986,15 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+  _i18.Future<bool> testNetworkConnection() => (super.noSuchMethod(
         Invocation.method(
           #testNetworkConnection,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> recoverFromMnemonic({
+  _i18.Future<void> recoverFromMnemonic({
     required String? mnemonic,
     String? mnemonicPassphrase,
     required int? maxUnusedAddressGap,
@@ -956,38 +1013,38 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
             #height: height,
           },
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> initializeNew() => (super.noSuchMethod(
+  _i18.Future<void> initializeNew() => (super.noSuchMethod(
         Invocation.method(
           #initializeNew,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> initializeExisting() => (super.noSuchMethod(
+  _i18.Future<void> initializeExisting() => (super.noSuchMethod(
         Invocation.method(
           #initializeExisting,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> exit() => (super.noSuchMethod(
+  _i18.Future<void> exit() => (super.noSuchMethod(
         Invocation.method(
           #exit,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> fullRescan(
+  _i18.Future<void> fullRescan(
     int? maxUnusedAddressGap,
     int? maxNumberOfIndexesToCheck,
   ) =>
@@ -999,11 +1056,11 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
             maxNumberOfIndexesToCheck,
           ],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<_i10.Amount> estimateFeeFor(
+  _i18.Future<_i10.Amount> estimateFeeFor(
     _i10.Amount? amount,
     int? feeRate,
   ) =>
@@ -1015,7 +1072,7 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
             feeRate,
           ],
         ),
-        returnValue: _i14.Future<_i10.Amount>.value(_FakeAmount_7(
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
           this,
           Invocation.method(
             #estimateFeeFor,
@@ -1025,276 +1082,1267 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
             ],
           ),
         )),
-      ) as _i14.Future<_i10.Amount>);
+      ) as _i18.Future<_i10.Amount>);
   @override
-  _i14.Future<bool> generateNewAddress() => (super.noSuchMethod(
+  _i18.Future<bool> generateNewAddress() => (super.noSuchMethod(
         Invocation.method(
           #generateNewAddress,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
+  _i18.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateSentCachedTxData,
           [txData],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
-/// A class which mocks [LocaleService].
+/// A class which mocks [FiroWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i18.LocaleService {
-  MockLocaleService() {
+class MockFiroWallet extends _i1.Mock implements _i22.FiroWallet {
+  MockFiroWallet() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  String get locale => (super.noSuchMethod(
-        Invocation.getter(#locale),
-        returnValue: '',
-      ) as String);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i14.Future<void> loadLocale({bool? notify = true}) => (super.noSuchMethod(
-        Invocation.method(
-          #loadLocale,
-          [],
-          {#notify: notify},
-        ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
-  @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
+  set timer(_i18.Timer? _timer) => super.noSuchMethod(
+        Invocation.setter(
+          #timer,
+          _timer,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
+  _i11.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+        Invocation.getter(#txTracker),
+        returnValue: _FakeTransactionNotificationTracker_8(
+          this,
+          Invocation.getter(#txTracker),
         ),
-        returnValueForMissingStub: null,
-      );
+      ) as _i11.TransactionNotificationTracker);
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
+  set txTracker(_i11.TransactionNotificationTracker? _txTracker) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #txTracker,
+          _txTracker,
         ),
         returnValueForMissingStub: null,
       );
-}
-
-/// A class which mocks [Prefs].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockPrefs extends _i1.Mock implements _i15.Prefs {
-  MockPrefs() {
-    _i1.throwOnMissingStub(this);
-  }
-
   @override
-  bool get isInitialized => (super.noSuchMethod(
-        Invocation.getter(#isInitialized),
+  bool get refreshMutex => (super.noSuchMethod(
+        Invocation.getter(#refreshMutex),
         returnValue: false,
       ) as bool);
   @override
-  int get lastUnlockedTimeout => (super.noSuchMethod(
-        Invocation.getter(#lastUnlockedTimeout),
-        returnValue: 0,
-      ) as int);
-  @override
-  set lastUnlockedTimeout(int? lastUnlockedTimeout) => super.noSuchMethod(
+  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
         Invocation.setter(
-          #lastUnlockedTimeout,
-          lastUnlockedTimeout,
+          #refreshMutex,
+          _refreshMutex,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  int get lastUnlocked => (super.noSuchMethod(
-        Invocation.getter(#lastUnlocked),
-        returnValue: 0,
-      ) as int);
+  bool get longMutex => (super.noSuchMethod(
+        Invocation.getter(#longMutex),
+        returnValue: false,
+      ) as bool);
   @override
-  set lastUnlocked(int? lastUnlocked) => super.noSuchMethod(
+  set longMutex(bool? _longMutex) => super.noSuchMethod(
         Invocation.setter(
-          #lastUnlocked,
-          lastUnlocked,
+          #longMutex,
+          _longMutex,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  int get currentNotificationId => (super.noSuchMethod(
-        Invocation.getter(#currentNotificationId),
-        returnValue: 0,
-      ) as int);
-  @override
-  List<String> get walletIdsSyncOnStartup => (super.noSuchMethod(
-        Invocation.getter(#walletIdsSyncOnStartup),
-        returnValue: <String>[],
-      ) as List<String>);
+  bool get isActive => (super.noSuchMethod(
+        Invocation.getter(#isActive),
+        returnValue: false,
+      ) as bool);
   @override
-  set walletIdsSyncOnStartup(List<String>? walletIdsSyncOnStartup) =>
-      super.noSuchMethod(
+  set isActive(bool? _isActive) => super.noSuchMethod(
         Invocation.setter(
-          #walletIdsSyncOnStartup,
-          walletIdsSyncOnStartup,
+          #isActive,
+          _isActive,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  _i19.SyncingType get syncType => (super.noSuchMethod(
-        Invocation.getter(#syncType),
-        returnValue: _i19.SyncingType.currentWalletOnly,
-      ) as _i19.SyncingType);
+  bool get shouldAutoSync => (super.noSuchMethod(
+        Invocation.getter(#shouldAutoSync),
+        returnValue: false,
+      ) as bool);
   @override
-  set syncType(_i19.SyncingType? syncType) => super.noSuchMethod(
+  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
         Invocation.setter(
-          #syncType,
-          syncType,
+          #shouldAutoSync,
+          shouldAutoSync,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  bool get wifiOnly => (super.noSuchMethod(
-        Invocation.getter(#wifiOnly),
-        returnValue: false,
-      ) as bool);
-  @override
-  set wifiOnly(bool? wifiOnly) => super.noSuchMethod(
+  set isFavorite(bool? markFavorite) => super.noSuchMethod(
         Invocation.setter(
-          #wifiOnly,
-          wifiOnly,
+          #isFavorite,
+          markFavorite,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  bool get showFavoriteWallets => (super.noSuchMethod(
-        Invocation.getter(#showFavoriteWallets),
+  bool get isFavorite => (super.noSuchMethod(
+        Invocation.getter(#isFavorite),
         returnValue: false,
       ) as bool);
   @override
-  set showFavoriteWallets(bool? showFavoriteWallets) => super.noSuchMethod(
-        Invocation.setter(
-          #showFavoriteWallets,
-          showFavoriteWallets,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i17.Coin get coin => (super.noSuchMethod(
+        Invocation.getter(#coin),
+        returnValue: _i17.Coin.bitcoin,
+      ) as _i17.Coin);
   @override
-  String get language => (super.noSuchMethod(
-        Invocation.getter(#language),
+  _i18.Future<List<String>> get mnemonic => (super.noSuchMethod(
+        Invocation.getter(#mnemonic),
+        returnValue: _i18.Future<List<String>>.value(<String>[]),
+      ) as _i18.Future<List<String>>);
+  @override
+  _i18.Future<String?> get mnemonicString => (super.noSuchMethod(
+        Invocation.getter(#mnemonicString),
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
+  @override
+  _i18.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+        Invocation.getter(#mnemonicPassphrase),
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
+  @override
+  _i18.Future<int> get maxFee => (super.noSuchMethod(
+        Invocation.getter(#maxFee),
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
+  @override
+  _i18.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+        Invocation.getter(#fees),
+        returnValue: _i18.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+          this,
+          Invocation.getter(#fees),
+        )),
+      ) as _i18.Future<_i8.FeeObject>);
+  @override
+  _i18.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+        Invocation.getter(#currentReceivingAddress),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  _i18.Future<String> get currentChangeAddress => (super.noSuchMethod(
+        Invocation.getter(#currentChangeAddress),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  String get walletName => (super.noSuchMethod(
+        Invocation.getter(#walletName),
         returnValue: '',
       ) as String);
   @override
-  set language(String? newLanguage) => super.noSuchMethod(
+  set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
-          #language,
-          newLanguage,
+          #walletName,
+          newName,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  String get currency => (super.noSuchMethod(
-        Invocation.getter(#currency),
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
         returnValue: '',
       ) as String);
   @override
-  set currency(String? newCurrency) => super.noSuchMethod(
-        Invocation.setter(
-          #currency,
-          newCurrency,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get randomizePIN => (super.noSuchMethod(
-        Invocation.getter(#randomizePIN),
+  bool get isConnected => (super.noSuchMethod(
+        Invocation.getter(#isConnected),
         returnValue: false,
       ) as bool);
   @override
-  set randomizePIN(bool? randomizePIN) => super.noSuchMethod(
-        Invocation.setter(
-          #randomizePIN,
-          randomizePIN,
+  _i12.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_9(
+          this,
+          Invocation.getter(#electrumXClient),
         ),
-        returnValueForMissingStub: null,
-      );
+      ) as _i12.ElectrumX);
   @override
-  bool get useBiometrics => (super.noSuchMethod(
-        Invocation.getter(#useBiometrics),
+  _i13.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+        Invocation.getter(#cachedElectrumXClient),
+        returnValue: _FakeCachedElectrumX_10(
+          this,
+          Invocation.getter(#cachedElectrumXClient),
+        ),
+      ) as _i13.CachedElectrumX);
+  @override
+  bool get isRefreshing => (super.noSuchMethod(
+        Invocation.getter(#isRefreshing),
         returnValue: false,
       ) as bool);
   @override
-  set useBiometrics(bool? useBiometrics) => super.noSuchMethod(
-        Invocation.setter(
-          #useBiometrics,
-          useBiometrics,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasPin => (super.noSuchMethod(
-        Invocation.getter(#hasPin),
+  bool get hasCalledExit => (super.noSuchMethod(
+        Invocation.getter(#hasCalledExit),
         returnValue: false,
       ) as bool);
   @override
-  set hasPin(bool? hasPin) => super.noSuchMethod(
-        Invocation.setter(
-          #hasPin,
-          hasPin,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i18.Future<int> get chainHeight => (super.noSuchMethod(
+        Invocation.getter(#chainHeight),
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
   @override
-  int get familiarity => (super.noSuchMethod(
-        Invocation.getter(#familiarity),
+  int get storedChainHeight => (super.noSuchMethod(
+        Invocation.getter(#storedChainHeight),
         returnValue: 0,
       ) as int);
   @override
-  set familiarity(int? familiarity) => super.noSuchMethod(
-        Invocation.setter(
-          #familiarity,
-          familiarity,
+  _i9.Balance get balance => (super.noSuchMethod(
+        Invocation.getter(#balance),
+        returnValue: _FakeBalance_6(
+          this,
+          Invocation.getter(#balance),
         ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get showTestNetCoins => (super.noSuchMethod(
-        Invocation.getter(#showTestNetCoins),
-        returnValue: false,
-      ) as bool);
+      ) as _i9.Balance);
   @override
-  set showTestNetCoins(bool? showTestNetCoins) => super.noSuchMethod(
-        Invocation.setter(
-          #showTestNetCoins,
-          showTestNetCoins,
+  _i9.Balance get balancePrivate => (super.noSuchMethod(
+        Invocation.getter(#balancePrivate),
+        returnValue: _FakeBalance_6(
+          this,
+          Invocation.getter(#balancePrivate),
         ),
-        returnValueForMissingStub: null,
+      ) as _i9.Balance);
+  @override
+  _i18.Future<List<_i21.UTXO>> get utxos => (super.noSuchMethod(
+        Invocation.getter(#utxos),
+        returnValue: _i18.Future<List<_i21.UTXO>>.value(<_i21.UTXO>[]),
+      ) as _i18.Future<List<_i21.UTXO>>);
+  @override
+  _i18.Future<List<_i21.Transaction>> get transactions => (super.noSuchMethod(
+        Invocation.getter(#transactions),
+        returnValue:
+            _i18.Future<List<_i21.Transaction>>.value(<_i21.Transaction>[]),
+      ) as _i18.Future<List<_i21.Transaction>>);
+  @override
+  _i18.Future<String> get xpub => (super.noSuchMethod(
+        Invocation.getter(#xpub),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #onIsActiveWalletChanged,
+          _onIsActiveWalletChanged,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i14.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_11(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i14.MainDB);
+  @override
+  bool validateAddress(String? address) => (super.noSuchMethod(
+        Invocation.method(
+          #validateAddress,
+          [address],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i18.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateSentCachedTxData,
+          [txData],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+        Invocation.method(
+          #testNetworkConnection,
+          [],
+        ),
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
+  @override
+  void startNetworkAlivePinging() => super.noSuchMethod(
+        Invocation.method(
+          #startNetworkAlivePinging,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void stopNetworkAlivePinging() => super.noSuchMethod(
+        Invocation.method(
+          #stopNetworkAlivePinging,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i18.Future<Map<String, dynamic>> prepareSendPublic({
+    required String? address,
+    required _i10.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #prepareSendPublic,
+          [],
+          {
+            #address: address,
+            #amount: amount,
+            #args: args,
+          },
+        ),
+        returnValue:
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
+  @override
+  _i18.Future<String> confirmSendPublic({dynamic txData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #confirmSendPublic,
+          [],
+          {#txData: txData},
+        ),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  _i18.Future<Map<String, dynamic>> prepareSend({
+    required String? address,
+    required _i10.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #prepareSend,
+          [],
+          {
+            #address: address,
+            #amount: amount,
+            #args: args,
+          },
+        ),
+        returnValue:
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
+  @override
+  _i18.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #confirmSend,
+          [],
+          {#txData: txData},
+        ),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  int estimateTxFee({
+    required int? vSize,
+    required int? feeRatePerKB,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateTxFee,
+          [],
+          {
+            #vSize: vSize,
+            #feeRatePerKB: feeRatePerKB,
+          },
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  dynamic coinSelection(
+    int? satoshiAmountToSend,
+    int? selectedTxFeeRate,
+    String? _recipientAddress,
+    bool? isSendAll, {
+    int? additionalOutputs = 0,
+    List<_i21.UTXO>? utxos,
+  }) =>
+      super.noSuchMethod(Invocation.method(
+        #coinSelection,
+        [
+          satoshiAmountToSend,
+          selectedTxFeeRate,
+          _recipientAddress,
+          isSendAll,
+        ],
+        {
+          #additionalOutputs: additionalOutputs,
+          #utxos: utxos,
+        },
+      ));
+  @override
+  _i18.Future<List<_i23.SigningData>> fetchBuildTxData(
+          List<_i21.UTXO>? utxosToUse) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchBuildTxData,
+          [utxosToUse],
+        ),
+        returnValue:
+            _i18.Future<List<_i23.SigningData>>.value(<_i23.SigningData>[]),
+      ) as _i18.Future<List<_i23.SigningData>>);
+  @override
+  _i18.Future<Map<String, dynamic>> buildTransaction({
+    required List<_i23.SigningData>? utxoSigningData,
+    required List<String>? recipients,
+    required List<int>? satoshiAmounts,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #buildTransaction,
+          [],
+          {
+            #utxoSigningData: utxoSigningData,
+            #recipients: recipients,
+            #satoshiAmounts: satoshiAmounts,
+          },
+        ),
+        returnValue:
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
+  @override
+  _i18.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+        Invocation.method(
+          #updateNode,
+          [shouldRefresh],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> initializeNew() => (super.noSuchMethod(
+        Invocation.method(
+          #initializeNew,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> initializeExisting() => (super.noSuchMethod(
+        Invocation.method(
+          #initializeExisting,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
+        Invocation.method(
+          #refreshIfThereIsNewData,
+          [],
+        ),
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
+  @override
+  _i18.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
+        Invocation.method(
+          #getAllTxsToWatch,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> refresh() => (super.noSuchMethod(
+        Invocation.method(
+          #refresh,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  List<Map<dynamic, _i8.LelantusCoin>> getLelantusCoinMap() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getLelantusCoinMap,
+          [],
+        ),
+        returnValue: <Map<dynamic, _i8.LelantusCoin>>[],
+      ) as List<Map<dynamic, _i8.LelantusCoin>>);
+  @override
+  _i18.Future<void> anonymizeAllPublicFunds() => (super.noSuchMethod(
+        Invocation.method(
+          #anonymizeAllPublicFunds,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<List<Map<String, dynamic>>> createMintsFromAmount(int? total) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #createMintsFromAmount,
+          [total],
+        ),
+        returnValue: _i18.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i18.Future<List<Map<String, dynamic>>>);
+  @override
+  _i18.Future<String> submitHexToNetwork(String? hex) => (super.noSuchMethod(
+        Invocation.method(
+          #submitHexToNetwork,
+          [hex],
+        ),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  _i18.Future<Map<String, dynamic>> buildMintTransaction(
+    List<_i21.UTXO>? utxosToUse,
+    int? satoshisPerRecipient,
+    List<Map<String, dynamic>>? mintsMap,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #buildMintTransaction,
+          [
+            utxosToUse,
+            satoshisPerRecipient,
+            mintsMap,
+          ],
+        ),
+        returnValue:
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
+  @override
+  _i18.Future<void> checkReceivingAddressForTransactions() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkReceivingAddressForTransactions,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> checkChangeAddressForTransactions() => (super.noSuchMethod(
+        Invocation.method(
+          #checkChangeAddressForTransactions,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> fullRescan(
+    int? maxUnusedAddressGap,
+    int? maxNumberOfIndexesToCheck,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fullRescan,
+          [
+            maxUnusedAddressGap,
+            maxNumberOfIndexesToCheck,
+          ],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> recoverFromMnemonic({
+    required String? mnemonic,
+    String? mnemonicPassphrase,
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+    required int? height,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #recoverFromMnemonic,
+          [],
+          {
+            #mnemonic: mnemonic,
+            #mnemonicPassphrase: mnemonicPassphrase,
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+            #height: height,
+          },
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<Map<int, dynamic>> getSetDataMap(int? latestSetId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getSetDataMap,
+          [latestSetId],
+        ),
+        returnValue: _i18.Future<Map<int, dynamic>>.value(<int, dynamic>{}),
+      ) as _i18.Future<Map<int, dynamic>>);
+  @override
+  _i18.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransactionCacheEarly,
+          [allAddresses],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<List<Map<String, dynamic>>> fetchAnonymitySets() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchAnonymitySets,
+          [],
+        ),
+        returnValue: _i18.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i18.Future<List<Map<String, dynamic>>>);
+  @override
+  _i18.Future<int> getLatestSetId() => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestSetId,
+          [],
+        ),
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
+  @override
+  _i18.Future<List<String>> getUsedCoinSerials() => (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+        ),
+        returnValue: _i18.Future<List<String>>.value(<String>[]),
+      ) as _i18.Future<List<String>>);
+  @override
+  _i18.Future<void> exit() => (super.noSuchMethod(
+        Invocation.method(
+          #exit,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<dynamic> getCoinsToJoinSplit(int? required) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getCoinsToJoinSplit,
+          [required],
+        ),
+        returnValue: _i18.Future<dynamic>.value(),
+      ) as _i18.Future<dynamic>);
+  @override
+  _i18.Future<int> estimateJoinSplitFee(int? spendAmount) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateJoinSplitFee,
+          [spendAmount],
+        ),
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
+  @override
+  _i18.Future<_i10.Amount> estimateFeeFor(
+    _i10.Amount? amount,
+    int? feeRate,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFeeFor,
+          [
+            amount,
+            feeRate,
+          ],
+        ),
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
+          this,
+          Invocation.method(
+            #estimateFeeFor,
+            [
+              amount,
+              feeRate,
+            ],
+          ),
+        )),
+      ) as _i18.Future<_i10.Amount>);
+  @override
+  _i18.Future<_i10.Amount> estimateFeeForPublic(
+    _i10.Amount? amount,
+    int? feeRate,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFeeForPublic,
+          [
+            amount,
+            feeRate,
+          ],
+        ),
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
+          this,
+          Invocation.method(
+            #estimateFeeForPublic,
+            [
+              amount,
+              feeRate,
+            ],
+          ),
+        )),
+      ) as _i18.Future<_i10.Amount>);
+  @override
+  _i10.Amount roughFeeEstimate(
+    int? inputCount,
+    int? outputCount,
+    int? feeRatePerKB,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #roughFeeEstimate,
+          [
+            inputCount,
+            outputCount,
+            feeRatePerKB,
+          ],
+        ),
+        returnValue: _FakeAmount_7(
+          this,
+          Invocation.method(
+            #roughFeeEstimate,
+            [
+              inputCount,
+              outputCount,
+              feeRatePerKB,
+            ],
+          ),
+        ),
+      ) as _i10.Amount);
+  @override
+  _i18.Future<_i10.Amount> sweepAllEstimate(int? feeRate) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #sweepAllEstimate,
+          [feeRate],
+        ),
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
+          this,
+          Invocation.method(
+            #sweepAllEstimate,
+            [feeRate],
+          ),
+        )),
+      ) as _i18.Future<_i10.Amount>);
+  @override
+  _i18.Future<List<Map<String, dynamic>>> fastFetch(
+          List<String>? allTxHashes) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fastFetch,
+          [allTxHashes],
+        ),
+        returnValue: _i18.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i18.Future<List<Map<String, dynamic>>>);
+  @override
+  _i18.Future<Map<_i21.Address, _i21.Transaction>> getJMintTransactions(
+    _i13.CachedElectrumX? cachedClient,
+    List<String>? transactions,
+    _i17.Coin? coin,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getJMintTransactions,
+          [
+            cachedClient,
+            transactions,
+            coin,
+          ],
+        ),
+        returnValue: _i18.Future<Map<_i21.Address, _i21.Transaction>>.value(
+            <_i21.Address, _i21.Transaction>{}),
+      ) as _i18.Future<Map<_i21.Address, _i21.Transaction>>);
+  @override
+  _i18.Future<bool> generateNewAddress() => (super.noSuchMethod(
+        Invocation.method(
+          #generateNewAddress,
+          [],
+        ),
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
+  @override
+  _i10.Amount availablePrivateBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #availablePrivateBalance,
+          [],
+        ),
+        returnValue: _FakeAmount_7(
+          this,
+          Invocation.method(
+            #availablePrivateBalance,
+            [],
+          ),
+        ),
+      ) as _i10.Amount);
+  @override
+  _i10.Amount availablePublicBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #availablePublicBalance,
+          [],
+        ),
+        returnValue: _FakeAmount_7(
+          this,
+          Invocation.method(
+            #availablePublicBalance,
+            [],
+          ),
+        ),
+      ) as _i10.Amount);
+  @override
+  void initCache(
+    String? walletId,
+    _i17.Coin? coin,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #initCache,
+          [
+            walletId,
+            coin,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i18.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedId,
+          [id],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  int getCachedChainHeight() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedChainHeight,
+          [],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  _i18.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedChainHeight,
+          [height],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  bool getCachedIsFavorite() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedIsFavorite,
+          [],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i18.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedIsFavorite,
+          [isFavorite],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i9.Balance getCachedBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedBalance,
+          [],
+        ),
+        returnValue: _FakeBalance_6(
+          this,
+          Invocation.method(
+            #getCachedBalance,
+            [],
+          ),
+        ),
+      ) as _i9.Balance);
+  @override
+  _i18.Future<void> updateCachedBalance(_i9.Balance? balance) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedBalance,
+          [balance],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i9.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedBalanceSecondary,
+          [],
+        ),
+        returnValue: _FakeBalance_6(
+          this,
+          Invocation.method(
+            #getCachedBalanceSecondary,
+            [],
+          ),
+        ),
+      ) as _i9.Balance);
+  @override
+  _i18.Future<void> updateCachedBalanceSecondary(_i9.Balance? balance) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedBalanceSecondary,
+          [balance],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i18.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  void initWalletDB({_i14.MainDB? mockableOverride}) => super.noSuchMethod(
+        Invocation.method(
+          #initWalletDB,
+          [],
+          {#mockableOverride: mockableOverride},
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void initFiroHive(String? walletId) => super.noSuchMethod(
+        Invocation.method(
+          #initFiroHive,
+          [walletId],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i18.Future<void> firoUpdateJIndex(List<dynamic>? jIndex) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #firoUpdateJIndex,
+          [jIndex],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> firoUpdateLelantusCoins(List<dynamic>? lelantusCoins) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #firoUpdateLelantusCoins,
+          [lelantusCoins],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  int firoGetMintIndex() => (super.noSuchMethod(
+        Invocation.method(
+          #firoGetMintIndex,
+          [],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  _i18.Future<void> firoUpdateMintIndex(int? mintIndex) => (super.noSuchMethod(
+        Invocation.method(
+          #firoUpdateMintIndex,
+          [mintIndex],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+}
+
+/// A class which mocks [LocaleService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockLocaleService extends _i1.Mock implements _i24.LocaleService {
+  MockLocaleService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get locale => (super.noSuchMethod(
+        Invocation.getter(#locale),
+        returnValue: '',
+      ) as String);
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i18.Future<void> loadLocale({bool? notify = true}) => (super.noSuchMethod(
+        Invocation.method(
+          #loadLocale,
+          [],
+          {#notify: notify},
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [Prefs].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockPrefs extends _i1.Mock implements _i19.Prefs {
+  MockPrefs() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  bool get isInitialized => (super.noSuchMethod(
+        Invocation.getter(#isInitialized),
+        returnValue: false,
+      ) as bool);
+  @override
+  int get lastUnlockedTimeout => (super.noSuchMethod(
+        Invocation.getter(#lastUnlockedTimeout),
+        returnValue: 0,
+      ) as int);
+  @override
+  set lastUnlockedTimeout(int? lastUnlockedTimeout) => super.noSuchMethod(
+        Invocation.setter(
+          #lastUnlockedTimeout,
+          lastUnlockedTimeout,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get lastUnlocked => (super.noSuchMethod(
+        Invocation.getter(#lastUnlocked),
+        returnValue: 0,
+      ) as int);
+  @override
+  set lastUnlocked(int? lastUnlocked) => super.noSuchMethod(
+        Invocation.setter(
+          #lastUnlocked,
+          lastUnlocked,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentNotificationId => (super.noSuchMethod(
+        Invocation.getter(#currentNotificationId),
+        returnValue: 0,
+      ) as int);
+  @override
+  List<String> get walletIdsSyncOnStartup => (super.noSuchMethod(
+        Invocation.getter(#walletIdsSyncOnStartup),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  set walletIdsSyncOnStartup(List<String>? walletIdsSyncOnStartup) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #walletIdsSyncOnStartup,
+          walletIdsSyncOnStartup,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i25.SyncingType get syncType => (super.noSuchMethod(
+        Invocation.getter(#syncType),
+        returnValue: _i25.SyncingType.currentWalletOnly,
+      ) as _i25.SyncingType);
+  @override
+  set syncType(_i25.SyncingType? syncType) => super.noSuchMethod(
+        Invocation.setter(
+          #syncType,
+          syncType,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get wifiOnly => (super.noSuchMethod(
+        Invocation.getter(#wifiOnly),
+        returnValue: false,
+      ) as bool);
+  @override
+  set wifiOnly(bool? wifiOnly) => super.noSuchMethod(
+        Invocation.setter(
+          #wifiOnly,
+          wifiOnly,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get showFavoriteWallets => (super.noSuchMethod(
+        Invocation.getter(#showFavoriteWallets),
+        returnValue: false,
+      ) as bool);
+  @override
+  set showFavoriteWallets(bool? showFavoriteWallets) => super.noSuchMethod(
+        Invocation.setter(
+          #showFavoriteWallets,
+          showFavoriteWallets,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get language => (super.noSuchMethod(
+        Invocation.getter(#language),
+        returnValue: '',
+      ) as String);
+  @override
+  set language(String? newLanguage) => super.noSuchMethod(
+        Invocation.setter(
+          #language,
+          newLanguage,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get currency => (super.noSuchMethod(
+        Invocation.getter(#currency),
+        returnValue: '',
+      ) as String);
+  @override
+  set currency(String? newCurrency) => super.noSuchMethod(
+        Invocation.setter(
+          #currency,
+          newCurrency,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get randomizePIN => (super.noSuchMethod(
+        Invocation.getter(#randomizePIN),
+        returnValue: false,
+      ) as bool);
+  @override
+  set randomizePIN(bool? randomizePIN) => super.noSuchMethod(
+        Invocation.setter(
+          #randomizePIN,
+          randomizePIN,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get useBiometrics => (super.noSuchMethod(
+        Invocation.getter(#useBiometrics),
+        returnValue: false,
+      ) as bool);
+  @override
+  set useBiometrics(bool? useBiometrics) => super.noSuchMethod(
+        Invocation.setter(
+          #useBiometrics,
+          useBiometrics,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get hasPin => (super.noSuchMethod(
+        Invocation.getter(#hasPin),
+        returnValue: false,
+      ) as bool);
+  @override
+  set hasPin(bool? hasPin) => super.noSuchMethod(
+        Invocation.setter(
+          #hasPin,
+          hasPin,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get familiarity => (super.noSuchMethod(
+        Invocation.getter(#familiarity),
+        returnValue: 0,
+      ) as int);
+  @override
+  set familiarity(int? familiarity) => super.noSuchMethod(
+        Invocation.setter(
+          #familiarity,
+          familiarity,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get showTestNetCoins => (super.noSuchMethod(
+        Invocation.getter(#showTestNetCoins),
+        returnValue: false,
+      ) as bool);
+  @override
+  set showTestNetCoins(bool? showTestNetCoins) => super.noSuchMethod(
+        Invocation.setter(
+          #showTestNetCoins,
+          showTestNetCoins,
+        ),
+        returnValueForMissingStub: null,
       );
   @override
   bool get isAutoBackupEnabled => (super.noSuchMethod(
@@ -1318,12 +2366,12 @@ class MockPrefs extends _i1.Mock implements _i15.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  _i20.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
+  _i26.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
         Invocation.getter(#backupFrequencyType),
-        returnValue: _i20.BackupFrequencyType.everyTenMinutes,
-      ) as _i20.BackupFrequencyType);
+        returnValue: _i26.BackupFrequencyType.everyTenMinutes,
+      ) as _i26.BackupFrequencyType);
   @override
-  set backupFrequencyType(_i20.BackupFrequencyType? backupFrequencyType) =>
+  set backupFrequencyType(_i26.BackupFrequencyType? backupFrequencyType) =>
       super.noSuchMethod(
         Invocation.setter(
           #backupFrequencyType,
@@ -1461,51 +2509,51 @@ class MockPrefs extends _i1.Mock implements _i15.Prefs {
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<void> init() => (super.noSuchMethod(
+  _i18.Future<void> init() => (super.noSuchMethod(
         Invocation.method(
           #init,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> incrementCurrentNotificationIndex() => (super.noSuchMethod(
+  _i18.Future<void> incrementCurrentNotificationIndex() => (super.noSuchMethod(
         Invocation.method(
           #incrementCurrentNotificationIndex,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<bool> isExternalCallsSet() => (super.noSuchMethod(
+  _i18.Future<bool> isExternalCallsSet() => (super.noSuchMethod(
         Invocation.method(
           #isExternalCallsSet,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> saveUserID(String? userId) => (super.noSuchMethod(
+  _i18.Future<void> saveUserID(String? userId) => (super.noSuchMethod(
         Invocation.method(
           #saveUserID,
           [userId],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> saveSignupEpoch(int? signupEpoch) => (super.noSuchMethod(
+  _i18.Future<void> saveSignupEpoch(int? signupEpoch) => (super.noSuchMethod(
         Invocation.method(
           #saveSignupEpoch,
           [signupEpoch],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -1513,7 +2561,7 @@ class MockPrefs extends _i1.Mock implements _i15.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -1541,7 +2589,7 @@ class MockPrefs extends _i1.Mock implements _i15.Prefs {
 /// A class which mocks [PriceService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockPriceService extends _i1.Mock implements _i21.PriceService {
+class MockPriceService extends _i1.Mock implements _i27.PriceService {
   MockPriceService() {
     _i1.throwOnMissingStub(this);
   }
@@ -1560,9 +2608,14 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
         returnValueForMissingStub: null,
       );
   @override
+  Set<String> get tokenContractAddressesToCheck => (super.noSuchMethod(
+        Invocation.getter(#tokenContractAddressesToCheck),
+        returnValue: <String>{},
+      ) as Set<String>);
+  @override
   Duration get updateInterval => (super.noSuchMethod(
         Invocation.getter(#updateInterval),
-        returnValue: _FakeDuration_8(
+        returnValue: _FakeDuration_12(
           this,
           Invocation.getter(#updateInterval),
         ),
@@ -1573,29 +2626,44 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
         returnValue: false,
       ) as bool);
   @override
-  _i11.Tuple2<_i22.Decimal, double> getPrice(_i13.Coin? coin) =>
+  _i15.Tuple2<_i28.Decimal, double> getPrice(_i17.Coin? coin) =>
       (super.noSuchMethod(
         Invocation.method(
           #getPrice,
           [coin],
         ),
-        returnValue: _FakeTuple2_9<_i22.Decimal, double>(
+        returnValue: _FakeTuple2_13<_i28.Decimal, double>(
           this,
           Invocation.method(
             #getPrice,
             [coin],
           ),
         ),
-      ) as _i11.Tuple2<_i22.Decimal, double>);
+      ) as _i15.Tuple2<_i28.Decimal, double>);
+  @override
+  _i15.Tuple2<_i28.Decimal, double> getTokenPrice(String? contractAddress) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTokenPrice,
+          [contractAddress],
+        ),
+        returnValue: _FakeTuple2_13<_i28.Decimal, double>(
+          this,
+          Invocation.method(
+            #getTokenPrice,
+            [contractAddress],
+          ),
+        ),
+      ) as _i15.Tuple2<_i28.Decimal, double>);
   @override
-  _i14.Future<void> updatePrice() => (super.noSuchMethod(
+  _i18.Future<void> updatePrice() => (super.noSuchMethod(
         Invocation.method(
           #updatePrice,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
   void cancel() => super.noSuchMethod(
         Invocation.method(
@@ -1621,7 +2689,7 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
         returnValueForMissingStub: null,
       );
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -1629,7 +2697,7 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -1649,7 +2717,7 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i23.NotesService {
+class MockNotesService extends _i1.Mock implements _i29.NotesService {
   MockNotesService() {
     _i1.throwOnMissingStub(this);
   }
@@ -1665,35 +2733,35 @@ class MockNotesService extends _i1.Mock implements _i23.NotesService {
         returnValue: <String, String>{},
       ) as Map<String, String>);
   @override
-  _i14.Future<Map<String, String>> get notes => (super.noSuchMethod(
+  _i18.Future<Map<String, String>> get notes => (super.noSuchMethod(
         Invocation.getter(#notes),
-        returnValue: _i14.Future<Map<String, String>>.value(<String, String>{}),
-      ) as _i14.Future<Map<String, String>>);
+        returnValue: _i18.Future<Map<String, String>>.value(<String, String>{}),
+      ) as _i18.Future<Map<String, String>>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<Map<String, String>> search(String? text) => (super.noSuchMethod(
+  _i18.Future<Map<String, String>> search(String? text) => (super.noSuchMethod(
         Invocation.method(
           #search,
           [text],
         ),
-        returnValue: _i14.Future<Map<String, String>>.value(<String, String>{}),
-      ) as _i14.Future<Map<String, String>>);
+        returnValue: _i18.Future<Map<String, String>>.value(<String, String>{}),
+      ) as _i18.Future<Map<String, String>>);
   @override
-  _i14.Future<String> getNoteFor({required String? txid}) =>
+  _i18.Future<String> getNoteFor({required String? txid}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getNoteFor,
           [],
           {#txid: txid},
         ),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
-  _i14.Future<void> editOrAddNote({
+  _i18.Future<void> editOrAddNote({
     required String? txid,
     required String? note,
   }) =>
@@ -1706,21 +2774,21 @@ class MockNotesService extends _i1.Mock implements _i23.NotesService {
             #note: note,
           },
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> deleteNote({required String? txid}) => (super.noSuchMethod(
+  _i18.Future<void> deleteNote({required String? txid}) => (super.noSuchMethod(
         Invocation.method(
           #deleteNote,
           [],
           {#txid: txid},
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -1728,7 +2796,7 @@ class MockNotesService extends _i1.Mock implements _i23.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -1752,3 +2820,102 @@ class MockNotesService extends _i1.Mock implements _i23.NotesService {
         returnValueForMissingStub: null,
       );
 }
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i30.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i14.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_11(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i14.MainDB);
+  @override
+  List<_i31.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i31.StackTheme>[],
+      ) as List<_i31.StackTheme>);
+  @override
+  void init(_i14.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i18.Future<void> install({required _i32.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
+  @override
+  _i18.Future<List<_i30.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i18.Future<List<_i30.StackThemeMetaData>>.value(
+            <_i30.StackThemeMetaData>[]),
+      ) as _i18.Future<List<_i30.StackThemeMetaData>>);
+  @override
+  _i18.Future<_i32.Uint8List> fetchTheme(
+          {required _i30.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i18.Future<_i32.Uint8List>.value(_i32.Uint8List(0)),
+      ) as _i18.Future<_i32.Uint8List>);
+  @override
+  _i31.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i31.StackTheme?);
+}
diff --git a/test/widget_tests/wallet_card_test.mocks.dart b/test/widget_tests/wallet_card_test.mocks.dart
new file mode 100644
index 000000000..af955c477
--- /dev/null
+++ b/test/widget_tests/wallet_card_test.mocks.dart
@@ -0,0 +1,1861 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/wallet_card_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i21;
+import 'dart:typed_data' as _i28;
+import 'dart:ui' as _i23;
+
+import 'package:bip32/bip32.dart' as _i16;
+import 'package:bip47/bip47.dart' as _i18;
+import 'package:bitcoindart/bitcoindart.dart' as _i13;
+import 'package:flutter/foundation.dart' as _i4;
+import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i12;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i10;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i9;
+import 'package:stackwallet/models/balance.dart' as _i11;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i31;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i8;
+import 'package:stackwallet/models/signing_data.dart' as _i26;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i24;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/locale_service.dart' as _i29;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/services/wallets.dart' as _i19;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i30;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i20;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i25;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
+    as _i27;
+import 'package:stackwallet/utilities/prefs.dart' as _i22;
+import 'package:tuple/tuple.dart' as _i15;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeWalletsService_0 extends _i1.SmartFake
+    implements _i2.WalletsService {
+  _FakeWalletsService_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeNodeService_1 extends _i1.SmartFake implements _i3.NodeService {
+  _FakeNodeService_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeChangeNotifierProvider_2<Notifier extends _i4.ChangeNotifier?>
+    extends _i1.SmartFake implements _i5.ChangeNotifierProvider<Notifier> {
+  _FakeChangeNotifierProvider_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
+  _FakeManager_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
+    implements _i7.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
+  _FakeFeeObject_5(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
+  _FakeElectrumX_6(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeCachedElectrumX_7 extends _i1.SmartFake
+    implements _i10.CachedElectrumX {
+  _FakeCachedElectrumX_7(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
+  _FakeBalance_8(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeMainDB_9 extends _i1.SmartFake implements _i12.MainDB {
+  _FakeMainDB_9(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeNetworkType_10 extends _i1.SmartFake implements _i13.NetworkType {
+  _FakeNetworkType_10(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumXNode_11 extends _i1.SmartFake implements _i9.ElectrumXNode {
+  _FakeElectrumXNode_11(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeAmount_12 extends _i1.SmartFake implements _i14.Amount {
+  _FakeAmount_12(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeTuple2_13<T1, T2> extends _i1.SmartFake
+    implements _i15.Tuple2<T1, T2> {
+  _FakeTuple2_13(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeBIP32_14 extends _i1.SmartFake implements _i16.BIP32 {
+  _FakeBIP32_14(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeAddress_15 extends _i1.SmartFake implements _i17.Address {
+  _FakeAddress_15(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakePaymentCode_16 extends _i1.SmartFake implements _i18.PaymentCode {
+  _FakePaymentCode_16(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [Wallets].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWallets extends _i1.Mock implements _i19.Wallets {
+  MockWallets() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WalletsService get walletsService => (super.noSuchMethod(
+        Invocation.getter(#walletsService),
+        returnValue: _FakeWalletsService_0(
+          this,
+          Invocation.getter(#walletsService),
+        ),
+      ) as _i2.WalletsService);
+  @override
+  set walletsService(_i2.WalletsService? _walletsService) => super.noSuchMethod(
+        Invocation.setter(
+          #walletsService,
+          _walletsService,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i3.NodeService get nodeService => (super.noSuchMethod(
+        Invocation.getter(#nodeService),
+        returnValue: _FakeNodeService_1(
+          this,
+          Invocation.getter(#nodeService),
+        ),
+      ) as _i3.NodeService);
+  @override
+  set nodeService(_i3.NodeService? _nodeService) => super.noSuchMethod(
+        Invocation.setter(
+          #nodeService,
+          _nodeService,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get hasWallets => (super.noSuchMethod(
+        Invocation.getter(#hasWallets),
+        returnValue: false,
+      ) as bool);
+  @override
+  List<_i5.ChangeNotifierProvider<_i6.Manager>> get managerProviders =>
+      (super.noSuchMethod(
+        Invocation.getter(#managerProviders),
+        returnValue: <_i5.ChangeNotifierProvider<_i6.Manager>>[],
+      ) as List<_i5.ChangeNotifierProvider<_i6.Manager>>);
+  @override
+  List<_i6.Manager> get managers => (super.noSuchMethod(
+        Invocation.getter(#managers),
+        returnValue: <_i6.Manager>[],
+      ) as List<_i6.Manager>);
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+      ) as bool);
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  List<String> getWalletIdsFor({required _i20.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getWalletIdsFor,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<_i15.Tuple2<_i20.Coin, List<_i5.ChangeNotifierProvider<_i6.Manager>>>>
+      getManagerProvidersByCoin() => (super.noSuchMethod(
+            Invocation.method(
+              #getManagerProvidersByCoin,
+              [],
+            ),
+            returnValue: <
+                _i15.Tuple2<_i20.Coin,
+                    List<_i5.ChangeNotifierProvider<_i6.Manager>>>>[],
+          ) as List<
+              _i15.Tuple2<_i20.Coin,
+                  List<_i5.ChangeNotifierProvider<_i6.Manager>>>>);
+  @override
+  List<_i5.ChangeNotifierProvider<_i6.Manager>> getManagerProvidersForCoin(
+          _i20.Coin? coin) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getManagerProvidersForCoin,
+          [coin],
+        ),
+        returnValue: <_i5.ChangeNotifierProvider<_i6.Manager>>[],
+      ) as List<_i5.ChangeNotifierProvider<_i6.Manager>>);
+  @override
+  _i5.ChangeNotifierProvider<_i6.Manager> getManagerProvider(
+          String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getManagerProvider,
+          [walletId],
+        ),
+        returnValue: _FakeChangeNotifierProvider_2<_i6.Manager>(
+          this,
+          Invocation.method(
+            #getManagerProvider,
+            [walletId],
+          ),
+        ),
+      ) as _i5.ChangeNotifierProvider<_i6.Manager>);
+  @override
+  _i6.Manager getManager(String? walletId) => (super.noSuchMethod(
+        Invocation.method(
+          #getManager,
+          [walletId],
+        ),
+        returnValue: _FakeManager_3(
+          this,
+          Invocation.method(
+            #getManager,
+            [walletId],
+          ),
+        ),
+      ) as _i6.Manager);
+  @override
+  void addWallet({
+    required String? walletId,
+    required _i6.Manager? manager,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #addWallet,
+          [],
+          {
+            #walletId: walletId,
+            #manager: manager,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void removeWallet({required String? walletId}) => super.noSuchMethod(
+        Invocation.method(
+          #removeWallet,
+          [],
+          {#walletId: walletId},
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> load(_i22.Prefs? prefs) => (super.noSuchMethod(
+        Invocation.method(
+          #load,
+          [prefs],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> loadAfterStackRestore(
+    _i22.Prefs? prefs,
+    List<_i6.Manager>? managers,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #loadAfterStackRestore,
+          [
+            prefs,
+            managers,
+          ],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  void addListener(_i23.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void removeListener(_i23.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [BitcoinWallet].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockBitcoinWallet extends _i1.Mock implements _i24.BitcoinWallet {
+  MockBitcoinWallet() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set timer(_i21.Timer? _timer) => super.noSuchMethod(
+        Invocation.setter(
+          #timer,
+          _timer,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i7.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+        Invocation.getter(#txTracker),
+        returnValue: _FakeTransactionNotificationTracker_4(
+          this,
+          Invocation.getter(#txTracker),
+        ),
+      ) as _i7.TransactionNotificationTracker);
+  @override
+  set txTracker(_i7.TransactionNotificationTracker? _txTracker) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #txTracker,
+          _txTracker,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get longMutex => (super.noSuchMethod(
+        Invocation.getter(#longMutex),
+        returnValue: false,
+      ) as bool);
+  @override
+  set longMutex(bool? _longMutex) => super.noSuchMethod(
+        Invocation.setter(
+          #longMutex,
+          _longMutex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get refreshMutex => (super.noSuchMethod(
+        Invocation.getter(#refreshMutex),
+        returnValue: false,
+      ) as bool);
+  @override
+  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
+        Invocation.setter(
+          #refreshMutex,
+          _refreshMutex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get isActive => (super.noSuchMethod(
+        Invocation.getter(#isActive),
+        returnValue: false,
+      ) as bool);
+  @override
+  set isActive(bool? _isActive) => super.noSuchMethod(
+        Invocation.setter(
+          #isActive,
+          _isActive,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  set isFavorite(bool? markFavorite) => super.noSuchMethod(
+        Invocation.setter(
+          #isFavorite,
+          markFavorite,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get isFavorite => (super.noSuchMethod(
+        Invocation.getter(#isFavorite),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i20.Coin get coin => (super.noSuchMethod(
+        Invocation.getter(#coin),
+        returnValue: _i20.Coin.bitcoin,
+      ) as _i20.Coin);
+  @override
+  _i21.Future<List<_i17.UTXO>> get utxos => (super.noSuchMethod(
+        Invocation.getter(#utxos),
+        returnValue: _i21.Future<List<_i17.UTXO>>.value(<_i17.UTXO>[]),
+      ) as _i21.Future<List<_i17.UTXO>>);
+  @override
+  _i21.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
+        Invocation.getter(#transactions),
+        returnValue:
+            _i21.Future<List<_i17.Transaction>>.value(<_i17.Transaction>[]),
+      ) as _i21.Future<List<_i17.Transaction>>);
+  @override
+  _i21.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+        Invocation.getter(#currentReceivingAddress),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<String> get currentChangeAddress => (super.noSuchMethod(
+        Invocation.getter(#currentChangeAddress),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<String> get currentChangeAddressP2PKH => (super.noSuchMethod(
+        Invocation.getter(#currentChangeAddressP2PKH),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  bool get hasCalledExit => (super.noSuchMethod(
+        Invocation.getter(#hasCalledExit),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i21.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+        Invocation.getter(#fees),
+        returnValue: _i21.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+          this,
+          Invocation.getter(#fees),
+        )),
+      ) as _i21.Future<_i8.FeeObject>);
+  @override
+  _i21.Future<int> get maxFee => (super.noSuchMethod(
+        Invocation.getter(#maxFee),
+        returnValue: _i21.Future<int>.value(0),
+      ) as _i21.Future<int>);
+  @override
+  _i21.Future<List<String>> get mnemonic => (super.noSuchMethod(
+        Invocation.getter(#mnemonic),
+        returnValue: _i21.Future<List<String>>.value(<String>[]),
+      ) as _i21.Future<List<String>>);
+  @override
+  _i21.Future<String?> get mnemonicString => (super.noSuchMethod(
+        Invocation.getter(#mnemonicString),
+        returnValue: _i21.Future<String?>.value(),
+      ) as _i21.Future<String?>);
+  @override
+  _i21.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+        Invocation.getter(#mnemonicPassphrase),
+        returnValue: _i21.Future<String?>.value(),
+      ) as _i21.Future<String?>);
+  @override
+  _i21.Future<int> get chainHeight => (super.noSuchMethod(
+        Invocation.getter(#chainHeight),
+        returnValue: _i21.Future<int>.value(0),
+      ) as _i21.Future<int>);
+  @override
+  int get storedChainHeight => (super.noSuchMethod(
+        Invocation.getter(#storedChainHeight),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get shouldAutoSync => (super.noSuchMethod(
+        Invocation.getter(#shouldAutoSync),
+        returnValue: false,
+      ) as bool);
+  @override
+  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
+        Invocation.setter(
+          #shouldAutoSync,
+          shouldAutoSync,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get isRefreshing => (super.noSuchMethod(
+        Invocation.getter(#isRefreshing),
+        returnValue: false,
+      ) as bool);
+  @override
+  bool get isConnected => (super.noSuchMethod(
+        Invocation.getter(#isConnected),
+        returnValue: false,
+      ) as bool);
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  String get walletName => (super.noSuchMethod(
+        Invocation.getter(#walletName),
+        returnValue: '',
+      ) as String);
+  @override
+  set walletName(String? newName) => super.noSuchMethod(
+        Invocation.setter(
+          #walletName,
+          newName,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i9.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_6(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i9.ElectrumX);
+  @override
+  _i10.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+        Invocation.getter(#cachedElectrumXClient),
+        returnValue: _FakeCachedElectrumX_7(
+          this,
+          Invocation.getter(#cachedElectrumXClient),
+        ),
+      ) as _i10.CachedElectrumX);
+  @override
+  _i11.Balance get balance => (super.noSuchMethod(
+        Invocation.getter(#balance),
+        returnValue: _FakeBalance_8(
+          this,
+          Invocation.getter(#balance),
+        ),
+      ) as _i11.Balance);
+  @override
+  _i21.Future<String> get xpub => (super.noSuchMethod(
+        Invocation.getter(#xpub),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #onIsActiveWalletChanged,
+          _onIsActiveWalletChanged,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i12.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_9(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i12.MainDB);
+  @override
+  _i13.NetworkType get networkType => (super.noSuchMethod(
+        Invocation.getter(#networkType),
+        returnValue: _FakeNetworkType_10(
+          this,
+          Invocation.getter(#networkType),
+        ),
+      ) as _i13.NetworkType);
+  @override
+  _i21.Future<void> exit() => (super.noSuchMethod(
+        Invocation.method(
+          #exit,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i25.DerivePathType addressType({required String? address}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #addressType,
+          [],
+          {#address: address},
+        ),
+        returnValue: _i25.DerivePathType.bip44,
+      ) as _i25.DerivePathType);
+  @override
+  _i21.Future<void> recoverFromMnemonic({
+    required String? mnemonic,
+    String? mnemonicPassphrase,
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+    required int? height,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #recoverFromMnemonic,
+          [],
+          {
+            #mnemonic: mnemonic,
+            #mnemonicPassphrase: mnemonicPassphrase,
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+            #height: height,
+          },
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransactionCacheEarly,
+          [allAddresses],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
+        Invocation.method(
+          #refreshIfThereIsNewData,
+          [],
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  _i21.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
+        Invocation.method(
+          #getAllTxsToWatch,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> refresh() => (super.noSuchMethod(
+        Invocation.method(
+          #refresh,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<Map<String, dynamic>> prepareSend({
+    required String? address,
+    required _i14.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #prepareSend,
+          [],
+          {
+            #address: address,
+            #amount: amount,
+            #args: args,
+          },
+        ),
+        returnValue:
+            _i21.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i21.Future<Map<String, dynamic>>);
+  @override
+  _i21.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #confirmSend,
+          [],
+          {#txData: txData},
+        ),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+        Invocation.method(
+          #testNetworkConnection,
+          [],
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  void startNetworkAlivePinging() => super.noSuchMethod(
+        Invocation.method(
+          #startNetworkAlivePinging,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void stopNetworkAlivePinging() => super.noSuchMethod(
+        Invocation.method(
+          #stopNetworkAlivePinging,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> initializeNew() => (super.noSuchMethod(
+        Invocation.method(
+          #initializeNew,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> initializeExisting() => (super.noSuchMethod(
+        Invocation.method(
+          #initializeExisting,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateSentCachedTxData,
+          [txData],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  bool validateAddress(String? address) => (super.noSuchMethod(
+        Invocation.method(
+          #validateAddress,
+          [address],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i21.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+        Invocation.method(
+          #updateNode,
+          [shouldRefresh],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<_i9.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+        Invocation.method(
+          #getCurrentNode,
+          [],
+        ),
+        returnValue: _i21.Future<_i9.ElectrumXNode>.value(_FakeElectrumXNode_11(
+          this,
+          Invocation.method(
+            #getCurrentNode,
+            [],
+          ),
+        )),
+      ) as _i21.Future<_i9.ElectrumXNode>);
+  @override
+  _i21.Future<List<Map<String, dynamic>>> fastFetch(
+          List<String>? allTxHashes) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fastFetch,
+          [allTxHashes],
+        ),
+        returnValue: _i21.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i21.Future<List<Map<String, dynamic>>>);
+  @override
+  _i21.Future<int> getTxCount({required String? address}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTxCount,
+          [],
+          {#address: address},
+        ),
+        returnValue: _i21.Future<int>.value(0),
+      ) as _i21.Future<int>);
+  @override
+  _i21.Future<void> checkCurrentReceivingAddressesForTransactions() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkCurrentReceivingAddressesForTransactions,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> checkCurrentChangeAddressesForTransactions() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkCurrentChangeAddressesForTransactions,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  int estimateTxFee({
+    required int? vSize,
+    required int? feeRatePerKB,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateTxFee,
+          [],
+          {
+            #vSize: vSize,
+            #feeRatePerKB: feeRatePerKB,
+          },
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  dynamic coinSelection({
+    required int? satoshiAmountToSend,
+    required int? selectedTxFeeRate,
+    required String? recipientAddress,
+    required bool? coinControl,
+    required bool? isSendAll,
+    int? additionalOutputs = 0,
+    List<_i17.UTXO>? utxos,
+  }) =>
+      super.noSuchMethod(Invocation.method(
+        #coinSelection,
+        [],
+        {
+          #satoshiAmountToSend: satoshiAmountToSend,
+          #selectedTxFeeRate: selectedTxFeeRate,
+          #recipientAddress: recipientAddress,
+          #coinControl: coinControl,
+          #isSendAll: isSendAll,
+          #additionalOutputs: additionalOutputs,
+          #utxos: utxos,
+        },
+      ));
+  @override
+  _i21.Future<List<_i26.SigningData>> fetchBuildTxData(
+          List<_i17.UTXO>? utxosToUse) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchBuildTxData,
+          [utxosToUse],
+        ),
+        returnValue:
+            _i21.Future<List<_i26.SigningData>>.value(<_i26.SigningData>[]),
+      ) as _i21.Future<List<_i26.SigningData>>);
+  @override
+  _i21.Future<Map<String, dynamic>> buildTransaction({
+    required List<_i26.SigningData>? utxoSigningData,
+    required List<String>? recipients,
+    required List<int>? satoshiAmounts,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #buildTransaction,
+          [],
+          {
+            #utxoSigningData: utxoSigningData,
+            #recipients: recipients,
+            #satoshiAmounts: satoshiAmounts,
+          },
+        ),
+        returnValue:
+            _i21.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i21.Future<Map<String, dynamic>>);
+  @override
+  _i21.Future<void> fullRescan(
+    int? maxUnusedAddressGap,
+    int? maxNumberOfIndexesToCheck,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fullRescan,
+          [
+            maxUnusedAddressGap,
+            maxNumberOfIndexesToCheck,
+          ],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<_i14.Amount> estimateFeeFor(
+    _i14.Amount? amount,
+    int? feeRate,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFeeFor,
+          [
+            amount,
+            feeRate,
+          ],
+        ),
+        returnValue: _i21.Future<_i14.Amount>.value(_FakeAmount_12(
+          this,
+          Invocation.method(
+            #estimateFeeFor,
+            [
+              amount,
+              feeRate,
+            ],
+          ),
+        )),
+      ) as _i21.Future<_i14.Amount>);
+  @override
+  _i14.Amount roughFeeEstimate(
+    int? inputCount,
+    int? outputCount,
+    int? feeRatePerKB,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #roughFeeEstimate,
+          [
+            inputCount,
+            outputCount,
+            feeRatePerKB,
+          ],
+        ),
+        returnValue: _FakeAmount_12(
+          this,
+          Invocation.method(
+            #roughFeeEstimate,
+            [
+              inputCount,
+              outputCount,
+              feeRatePerKB,
+            ],
+          ),
+        ),
+      ) as _i14.Amount);
+  @override
+  _i21.Future<_i14.Amount> sweepAllEstimate(int? feeRate) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #sweepAllEstimate,
+          [feeRate],
+        ),
+        returnValue: _i21.Future<_i14.Amount>.value(_FakeAmount_12(
+          this,
+          Invocation.method(
+            #sweepAllEstimate,
+            [feeRate],
+          ),
+        )),
+      ) as _i21.Future<_i14.Amount>);
+  @override
+  _i21.Future<bool> generateNewAddress() => (super.noSuchMethod(
+        Invocation.method(
+          #generateNewAddress,
+          [],
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  void initCache(
+    String? walletId,
+    _i20.Coin? coin,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #initCache,
+          [
+            walletId,
+            coin,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedId,
+          [id],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  int getCachedChainHeight() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedChainHeight,
+          [],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  _i21.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedChainHeight,
+          [height],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  bool getCachedIsFavorite() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedIsFavorite,
+          [],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i21.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedIsFavorite,
+          [isFavorite],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i11.Balance getCachedBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedBalance,
+          [],
+        ),
+        returnValue: _FakeBalance_8(
+          this,
+          Invocation.method(
+            #getCachedBalance,
+            [],
+          ),
+        ),
+      ) as _i11.Balance);
+  @override
+  _i21.Future<void> updateCachedBalance(_i11.Balance? balance) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedBalance,
+          [balance],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i11.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedBalanceSecondary,
+          [],
+        ),
+        returnValue: _FakeBalance_8(
+          this,
+          Invocation.method(
+            #getCachedBalanceSecondary,
+            [],
+          ),
+        ),
+      ) as _i11.Balance);
+  @override
+  _i21.Future<void> updateCachedBalanceSecondary(_i11.Balance? balance) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedBalanceSecondary,
+          [balance],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i21.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
+        Invocation.method(
+          #initWalletDB,
+          [],
+          {#mockableOverride: mockableOverride},
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<_i15.Tuple2<_i17.Transaction, _i17.Address>> parseTransaction(
+    Map<String, dynamic>? txData,
+    dynamic electrumxClient,
+    List<_i17.Address>? myAddresses,
+    _i20.Coin? coin,
+    int? minConfirms,
+    String? walletId,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #parseTransaction,
+          [
+            txData,
+            electrumxClient,
+            myAddresses,
+            coin,
+            minConfirms,
+            walletId,
+          ],
+        ),
+        returnValue:
+            _i21.Future<_i15.Tuple2<_i17.Transaction, _i17.Address>>.value(
+                _FakeTuple2_13<_i17.Transaction, _i17.Address>(
+          this,
+          Invocation.method(
+            #parseTransaction,
+            [
+              txData,
+              electrumxClient,
+              myAddresses,
+              coin,
+              minConfirms,
+              walletId,
+            ],
+          ),
+        )),
+      ) as _i21.Future<_i15.Tuple2<_i17.Transaction, _i17.Address>>);
+  @override
+  void initPaynymWalletInterface({
+    required String? walletId,
+    required String? walletName,
+    required _i13.NetworkType? network,
+    required _i20.Coin? coin,
+    required _i12.MainDB? db,
+    required _i9.ElectrumX? electrumXClient,
+    required _i27.SecureStorageInterface? secureStorage,
+    required int? dustLimit,
+    required int? dustLimitP2PKH,
+    required int? minConfirms,
+    required _i21.Future<String?> Function()? getMnemonicString,
+    required _i21.Future<String?> Function()? getMnemonicPassphrase,
+    required _i21.Future<int> Function()? getChainHeight,
+    required _i21.Future<String> Function()? getCurrentChangeAddress,
+    required int Function({
+      required int feeRatePerKB,
+      required int vSize,
+    })?
+        estimateTxFee,
+    required _i21.Future<Map<String, dynamic>> Function({
+      required String address,
+      required _i14.Amount amount,
+      Map<String, dynamic>? args,
+    })?
+        prepareSend,
+    required _i21.Future<int> Function({required String address})? getTxCount,
+    required _i21.Future<List<_i26.SigningData>> Function(List<_i17.UTXO>)?
+        fetchBuildTxData,
+    required _i21.Future<void> Function()? refresh,
+    required _i21.Future<void> Function()? checkChangeAddressForTransactions,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #initPaynymWalletInterface,
+          [],
+          {
+            #walletId: walletId,
+            #walletName: walletName,
+            #network: network,
+            #coin: coin,
+            #db: db,
+            #electrumXClient: electrumXClient,
+            #secureStorage: secureStorage,
+            #dustLimit: dustLimit,
+            #dustLimitP2PKH: dustLimitP2PKH,
+            #minConfirms: minConfirms,
+            #getMnemonicString: getMnemonicString,
+            #getMnemonicPassphrase: getMnemonicPassphrase,
+            #getChainHeight: getChainHeight,
+            #getCurrentChangeAddress: getCurrentChangeAddress,
+            #estimateTxFee: estimateTxFee,
+            #prepareSend: prepareSend,
+            #getTxCount: getTxCount,
+            #fetchBuildTxData: fetchBuildTxData,
+            #refresh: refresh,
+            #checkChangeAddressForTransactions:
+                checkChangeAddressForTransactions,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<_i16.BIP32> getBip47BaseNode() => (super.noSuchMethod(
+        Invocation.method(
+          #getBip47BaseNode,
+          [],
+        ),
+        returnValue: _i21.Future<_i16.BIP32>.value(_FakeBIP32_14(
+          this,
+          Invocation.method(
+            #getBip47BaseNode,
+            [],
+          ),
+        )),
+      ) as _i21.Future<_i16.BIP32>);
+  @override
+  _i21.Future<_i28.Uint8List> getPrivateKeyForPaynymReceivingAddress({
+    required String? paymentCodeString,
+    required int? index,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getPrivateKeyForPaynymReceivingAddress,
+          [],
+          {
+            #paymentCodeString: paymentCodeString,
+            #index: index,
+          },
+        ),
+        returnValue: _i21.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i21.Future<_i28.Uint8List>);
+  @override
+  _i21.Future<_i17.Address> currentReceivingPaynymAddress({
+    required _i18.PaymentCode? sender,
+    required bool? isSegwit,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #currentReceivingPaynymAddress,
+          [],
+          {
+            #sender: sender,
+            #isSegwit: isSegwit,
+          },
+        ),
+        returnValue: _i21.Future<_i17.Address>.value(_FakeAddress_15(
+          this,
+          Invocation.method(
+            #currentReceivingPaynymAddress,
+            [],
+            {
+              #sender: sender,
+              #isSegwit: isSegwit,
+            },
+          ),
+        )),
+      ) as _i21.Future<_i17.Address>);
+  @override
+  _i21.Future<void> checkCurrentPaynymReceivingAddressForTransactions({
+    required _i18.PaymentCode? sender,
+    required bool? isSegwit,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkCurrentPaynymReceivingAddressForTransactions,
+          [],
+          {
+            #sender: sender,
+            #isSegwit: isSegwit,
+          },
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> checkAllCurrentReceivingPaynymAddressesForTransactions() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkAllCurrentReceivingPaynymAddressesForTransactions,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<_i16.BIP32> deriveNotificationBip32Node() => (super.noSuchMethod(
+        Invocation.method(
+          #deriveNotificationBip32Node,
+          [],
+        ),
+        returnValue: _i21.Future<_i16.BIP32>.value(_FakeBIP32_14(
+          this,
+          Invocation.method(
+            #deriveNotificationBip32Node,
+            [],
+          ),
+        )),
+      ) as _i21.Future<_i16.BIP32>);
+  @override
+  _i21.Future<_i18.PaymentCode> getPaymentCode({required bool? isSegwit}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getPaymentCode,
+          [],
+          {#isSegwit: isSegwit},
+        ),
+        returnValue: _i21.Future<_i18.PaymentCode>.value(_FakePaymentCode_16(
+          this,
+          Invocation.method(
+            #getPaymentCode,
+            [],
+            {#isSegwit: isSegwit},
+          ),
+        )),
+      ) as _i21.Future<_i18.PaymentCode>);
+  @override
+  _i21.Future<_i28.Uint8List> signWithNotificationKey(_i28.Uint8List? data) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #signWithNotificationKey,
+          [data],
+        ),
+        returnValue: _i21.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i21.Future<_i28.Uint8List>);
+  @override
+  _i21.Future<String> signStringWithNotificationKey(String? data) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #signStringWithNotificationKey,
+          [data],
+        ),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<Map<String, dynamic>> preparePaymentCodeSend({
+    required _i18.PaymentCode? paymentCode,
+    required bool? isSegwit,
+    required _i14.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #preparePaymentCodeSend,
+          [],
+          {
+            #paymentCode: paymentCode,
+            #isSegwit: isSegwit,
+            #amount: amount,
+            #args: args,
+          },
+        ),
+        returnValue:
+            _i21.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i21.Future<Map<String, dynamic>>);
+  @override
+  _i21.Future<_i17.Address> nextUnusedSendAddressFrom({
+    required _i18.PaymentCode? pCode,
+    required bool? isSegwit,
+    required _i16.BIP32? privateKeyNode,
+    int? startIndex = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #nextUnusedSendAddressFrom,
+          [],
+          {
+            #pCode: pCode,
+            #isSegwit: isSegwit,
+            #privateKeyNode: privateKeyNode,
+            #startIndex: startIndex,
+          },
+        ),
+        returnValue: _i21.Future<_i17.Address>.value(_FakeAddress_15(
+          this,
+          Invocation.method(
+            #nextUnusedSendAddressFrom,
+            [],
+            {
+              #pCode: pCode,
+              #isSegwit: isSegwit,
+              #privateKeyNode: privateKeyNode,
+              #startIndex: startIndex,
+            },
+          ),
+        )),
+      ) as _i21.Future<_i17.Address>);
+  @override
+  _i21.Future<Map<String, dynamic>> prepareNotificationTx({
+    required int? selectedTxFeeRate,
+    required String? targetPaymentCodeString,
+    int? additionalOutputs = 0,
+    List<_i17.UTXO>? utxos,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #prepareNotificationTx,
+          [],
+          {
+            #selectedTxFeeRate: selectedTxFeeRate,
+            #targetPaymentCodeString: targetPaymentCodeString,
+            #additionalOutputs: additionalOutputs,
+            #utxos: utxos,
+          },
+        ),
+        returnValue:
+            _i21.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i21.Future<Map<String, dynamic>>);
+  @override
+  _i21.Future<String> broadcastNotificationTx(
+          {required Map<String, dynamic>? preparedTx}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastNotificationTx,
+          [],
+          {#preparedTx: preparedTx},
+        ),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<bool> hasConnected(String? paymentCodeString) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #hasConnected,
+          [paymentCodeString],
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  _i21.Future<_i18.PaymentCode?> unBlindedPaymentCodeFromTransaction(
+          {required _i17.Transaction? transaction}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #unBlindedPaymentCodeFromTransaction,
+          [],
+          {#transaction: transaction},
+        ),
+        returnValue: _i21.Future<_i18.PaymentCode?>.value(),
+      ) as _i21.Future<_i18.PaymentCode?>);
+  @override
+  _i21.Future<_i18.PaymentCode?> unBlindedPaymentCodeFromTransactionBad(
+          {required _i17.Transaction? transaction}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #unBlindedPaymentCodeFromTransactionBad,
+          [],
+          {#transaction: transaction},
+        ),
+        returnValue: _i21.Future<_i18.PaymentCode?>.value(),
+      ) as _i21.Future<_i18.PaymentCode?>);
+  @override
+  _i21.Future<List<_i18.PaymentCode>>
+      getAllPaymentCodesFromNotificationTransactions() => (super.noSuchMethod(
+            Invocation.method(
+              #getAllPaymentCodesFromNotificationTransactions,
+              [],
+            ),
+            returnValue:
+                _i21.Future<List<_i18.PaymentCode>>.value(<_i18.PaymentCode>[]),
+          ) as _i21.Future<List<_i18.PaymentCode>>);
+  @override
+  _i21.Future<void> checkForNotificationTransactionsTo(
+          Set<String>? otherCodeStrings) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkForNotificationTransactionsTo,
+          [otherCodeStrings],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> restoreAllHistory({
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+    required Set<String>? paymentCodeStrings,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #restoreAllHistory,
+          [],
+          {
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+            #paymentCodeStrings: paymentCodeStrings,
+          },
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> restoreHistoryWith({
+    required _i18.PaymentCode? other,
+    required bool? checkSegwitAsWell,
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #restoreHistoryWith,
+          [],
+          {
+            #other: other,
+            #checkSegwitAsWell: checkSegwitAsWell,
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+          },
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<_i17.Address> getMyNotificationAddress() => (super.noSuchMethod(
+        Invocation.method(
+          #getMyNotificationAddress,
+          [],
+        ),
+        returnValue: _i21.Future<_i17.Address>.value(_FakeAddress_15(
+          this,
+          Invocation.method(
+            #getMyNotificationAddress,
+            [],
+          ),
+        )),
+      ) as _i21.Future<_i17.Address>);
+  @override
+  _i21.Future<List<String>> lookupKey(String? paymentCodeString) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #lookupKey,
+          [paymentCodeString],
+        ),
+        returnValue: _i21.Future<List<String>>.value(<String>[]),
+      ) as _i21.Future<List<String>>);
+  @override
+  _i21.Future<String?> paymentCodeStringByKey(String? key) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #paymentCodeStringByKey,
+          [key],
+        ),
+        returnValue: _i21.Future<String?>.value(),
+      ) as _i21.Future<String?>);
+  @override
+  _i21.Future<String> storeCode(String? paymentCodeString) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #storeCode,
+          [paymentCodeString],
+        ),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  void initCoinControlInterface({
+    required String? walletId,
+    required String? walletName,
+    required _i20.Coin? coin,
+    required _i12.MainDB? db,
+    required _i21.Future<int> Function()? getChainHeight,
+    required _i21.Future<void> Function(_i11.Balance)? refreshedBalanceCallback,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #initCoinControlInterface,
+          [],
+          {
+            #walletId: walletId,
+            #walletName: walletName,
+            #coin: coin,
+            #db: db,
+            #getChainHeight: getChainHeight,
+            #refreshedBalanceCallback: refreshedBalanceCallback,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> refreshBalance({bool? notify = false}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #refreshBalance,
+          [],
+          {#notify: notify},
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+}
+
+/// A class which mocks [LocaleService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockLocaleService extends _i1.Mock implements _i29.LocaleService {
+  MockLocaleService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get locale => (super.noSuchMethod(
+        Invocation.getter(#locale),
+        returnValue: '',
+      ) as String);
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i21.Future<void> loadLocale({bool? notify = true}) => (super.noSuchMethod(
+        Invocation.method(
+          #loadLocale,
+          [],
+          {#notify: notify},
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  void addListener(_i23.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void removeListener(_i23.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i30.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i12.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_9(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i12.MainDB);
+  @override
+  List<_i31.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i31.StackTheme>[],
+      ) as List<_i31.StackTheme>);
+  @override
+  void init(_i12.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> install({required _i28.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  _i21.Future<List<_i30.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i21.Future<List<_i30.StackThemeMetaData>>.value(
+            <_i30.StackThemeMetaData>[]),
+      ) as _i21.Future<List<_i30.StackThemeMetaData>>);
+  @override
+  _i21.Future<_i28.Uint8List> fetchTheme(
+          {required _i30.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i21.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i21.Future<_i28.Uint8List>);
+  @override
+  _i31.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i31.StackTheme?);
+}
diff --git a/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart b/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
index 1cfa90f00..f76a04c74 100644
--- a/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
+++ b/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
@@ -1,10 +1,10 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/widget_tests/wallet_info_row/wallet_info_row_test.dart.
+// in stackwallet/test/widget_tests/wallet_info_row/wallet_info_row_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i23;
-import 'dart:typed_data' as _i29;
+import 'dart:typed_data' as _i28;
 import 'dart:ui' as _i25;
 
 import 'package:bip32/bip32.dart' as _i16;
@@ -13,27 +13,30 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i12;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
-import 'package:stackduo/models/balance.dart' as _i11;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/node_model.dart' as _i30;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
-import 'package:stackduo/models/signing_data.dart' as _i28;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i26;
-import 'package:stackduo/services/coins/coin_service.dart' as _i20;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
-import 'package:stackduo/services/wallets.dart' as _i21;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i14;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i27;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
+import 'package:stackwallet/db/isar/main_db.dart' as _i7;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i11;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i10;
+import 'package:stackwallet/models/balance.dart' as _i12;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i27;
+import 'package:stackwallet/models/node_model.dart' as _i32;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i9;
+import 'package:stackwallet/models/signing_data.dart' as _i31;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i29;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i20;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i8;
+import 'package:stackwallet/services/wallets.dart' as _i21;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i26;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i22;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i30;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
     as _i19;
-import 'package:stackduo/utilities/prefs.dart' as _i24;
+import 'package:stackwallet/utilities/prefs.dart' as _i24;
 import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
@@ -89,9 +92,8 @@ class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
         );
 }
 
-class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
-    implements _i7.TransactionNotificationTracker {
-  _FakeTransactionNotificationTracker_4(
+class _FakeMainDB_4 extends _i1.SmartFake implements _i7.MainDB {
+  _FakeMainDB_4(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -100,8 +102,9 @@ class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
         );
 }
 
-class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
-  _FakeFeeObject_5(
+class _FakeTransactionNotificationTracker_5 extends _i1.SmartFake
+    implements _i8.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_5(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -110,8 +113,8 @@ class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
         );
 }
 
-class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
-  _FakeElectrumX_6(
+class _FakeFeeObject_6 extends _i1.SmartFake implements _i9.FeeObject {
+  _FakeFeeObject_6(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -120,9 +123,8 @@ class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
         );
 }
 
-class _FakeCachedElectrumX_7 extends _i1.SmartFake
-    implements _i10.CachedElectrumX {
-  _FakeCachedElectrumX_7(
+class _FakeElectrumX_7 extends _i1.SmartFake implements _i10.ElectrumX {
+  _FakeElectrumX_7(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -131,8 +133,9 @@ class _FakeCachedElectrumX_7 extends _i1.SmartFake
         );
 }
 
-class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
-  _FakeBalance_8(
+class _FakeCachedElectrumX_8 extends _i1.SmartFake
+    implements _i11.CachedElectrumX {
+  _FakeCachedElectrumX_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -141,8 +144,8 @@ class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
         );
 }
 
-class _FakeMainDB_9 extends _i1.SmartFake implements _i12.MainDB {
-  _FakeMainDB_9(
+class _FakeBalance_9 extends _i1.SmartFake implements _i12.Balance {
+  _FakeBalance_9(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -161,7 +164,8 @@ class _FakeNetworkType_10 extends _i1.SmartFake implements _i13.NetworkType {
         );
 }
 
-class _FakeElectrumXNode_11 extends _i1.SmartFake implements _i9.ElectrumXNode {
+class _FakeElectrumXNode_11 extends _i1.SmartFake
+    implements _i10.ElectrumXNode {
   _FakeElectrumXNode_11(
     Object parent,
     Invocation parentInvocation,
@@ -686,10 +690,109 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
       );
 }
 
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i26.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i7.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_4(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i7.MainDB);
+  @override
+  List<_i27.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i27.StackTheme>[],
+      ) as List<_i27.StackTheme>);
+  @override
+  void init(_i7.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i23.Future<void> install({required _i28.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<bool>.value(false),
+      ) as _i23.Future<bool>);
+  @override
+  _i23.Future<List<_i26.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i23.Future<List<_i26.StackThemeMetaData>>.value(
+            <_i26.StackThemeMetaData>[]),
+      ) as _i23.Future<List<_i26.StackThemeMetaData>>);
+  @override
+  _i23.Future<_i28.Uint8List> fetchTheme(
+          {required _i26.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
+  @override
+  _i27.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i27.StackTheme?);
+}
+
 /// A class which mocks [BitcoinWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
+class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
   MockBitcoinWallet() {
     _i1.throwOnMissingStub(this);
   }
@@ -703,15 +806,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i7.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+  _i8.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
         Invocation.getter(#txTracker),
-        returnValue: _FakeTransactionNotificationTracker_4(
+        returnValue: _FakeTransactionNotificationTracker_5(
           this,
           Invocation.getter(#txTracker),
         ),
-      ) as _i7.TransactionNotificationTracker);
+      ) as _i8.TransactionNotificationTracker);
   @override
-  set txTracker(_i7.TransactionNotificationTracker? _txTracker) =>
+  set txTracker(_i8.TransactionNotificationTracker? _txTracker) =>
       super.noSuchMethod(
         Invocation.setter(
           #txTracker,
@@ -808,13 +911,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i23.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i23.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i23.Future<_i8.FeeObject>);
+      ) as _i23.Future<_i9.FeeObject>);
   @override
   _i23.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -887,29 +990,29 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i9.ElectrumX get electrumXClient => (super.noSuchMethod(
+  _i10.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_6(
+        returnValue: _FakeElectrumX_7(
           this,
           Invocation.getter(#electrumXClient),
         ),
-      ) as _i9.ElectrumX);
+      ) as _i10.ElectrumX);
   @override
-  _i10.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+  _i11.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
         Invocation.getter(#cachedElectrumXClient),
-        returnValue: _FakeCachedElectrumX_7(
+        returnValue: _FakeCachedElectrumX_8(
           this,
           Invocation.getter(#cachedElectrumXClient),
         ),
-      ) as _i10.CachedElectrumX);
+      ) as _i11.CachedElectrumX);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i23.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
@@ -925,13 +1028,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i12.MainDB get db => (super.noSuchMethod(
+  _i7.MainDB get db => (super.noSuchMethod(
         Invocation.getter(#db),
-        returnValue: _FakeMainDB_9(
+        returnValue: _FakeMainDB_4(
           this,
           Invocation.getter(#db),
         ),
-      ) as _i12.MainDB);
+      ) as _i7.MainDB);
   @override
   _i13.NetworkType get networkType => (super.noSuchMethod(
         Invocation.getter(#networkType),
@@ -950,15 +1053,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i27.DerivePathType addressType({required String? address}) =>
+  _i30.DerivePathType addressType({required String? address}) =>
       (super.noSuchMethod(
         Invocation.method(
           #addressType,
           [],
           {#address: address},
         ),
-        returnValue: _i27.DerivePathType.bip44,
-      ) as _i27.DerivePathType);
+        returnValue: _i30.DerivePathType.bip44,
+      ) as _i30.DerivePathType);
   @override
   _i23.Future<void> recoverFromMnemonic({
     required String? mnemonic,
@@ -1117,19 +1220,20 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i23.Future<_i9.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+  _i23.Future<_i10.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
         Invocation.method(
           #getCurrentNode,
           [],
         ),
-        returnValue: _i23.Future<_i9.ElectrumXNode>.value(_FakeElectrumXNode_11(
+        returnValue:
+            _i23.Future<_i10.ElectrumXNode>.value(_FakeElectrumXNode_11(
           this,
           Invocation.method(
             #getCurrentNode,
             [],
           ),
         )),
-      ) as _i23.Future<_i9.ElectrumXNode>);
+      ) as _i23.Future<_i10.ElectrumXNode>);
   @override
   _i23.Future<List<Map<String, dynamic>>> fastFetch(
           List<String>? allTxHashes) =>
@@ -1211,7 +1315,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         },
       ));
   @override
-  _i23.Future<List<_i28.SigningData>> fetchBuildTxData(
+  _i23.Future<List<_i31.SigningData>> fetchBuildTxData(
           List<_i17.UTXO>? utxosToUse) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1219,11 +1323,11 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
           [utxosToUse],
         ),
         returnValue:
-            _i23.Future<List<_i28.SigningData>>.value(<_i28.SigningData>[]),
-      ) as _i23.Future<List<_i28.SigningData>>);
+            _i23.Future<List<_i31.SigningData>>.value(<_i31.SigningData>[]),
+      ) as _i23.Future<List<_i31.SigningData>>);
   @override
   _i23.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i28.SigningData>? utxoSigningData,
+    required List<_i31.SigningData>? utxoSigningData,
     required List<String>? recipients,
     required List<int>? satoshiAmounts,
   }) =>
@@ -1390,21 +1494,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i11.Balance getCachedBalance() => (super.noSuchMethod(
+  _i12.Balance getCachedBalance() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalance,
           [],
         ),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.method(
             #getCachedBalance,
             [],
           ),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
-  _i23.Future<void> updateCachedBalance(_i11.Balance? balance) =>
+  _i23.Future<void> updateCachedBalance(_i12.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalance,
@@ -1414,21 +1518,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i11.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+  _i12.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalanceSecondary,
           [],
         ),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.method(
             #getCachedBalanceSecondary,
             [],
           ),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
-  _i23.Future<void> updateCachedBalanceSecondary(_i11.Balance? balance) =>
+  _i23.Future<void> updateCachedBalanceSecondary(_i12.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalanceSecondary,
@@ -1438,7 +1542,26 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i23.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
           [],
@@ -1490,8 +1613,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     required String? walletName,
     required _i13.NetworkType? network,
     required _i22.Coin? coin,
-    required _i12.MainDB? db,
-    required _i9.ElectrumX? electrumXClient,
+    required _i7.MainDB? db,
+    required _i10.ElectrumX? electrumXClient,
     required _i19.SecureStorageInterface? secureStorage,
     required int? dustLimit,
     required int? dustLimitP2PKH,
@@ -1512,7 +1635,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     })?
         prepareSend,
     required _i23.Future<int> Function({required String address})? getTxCount,
-    required _i23.Future<List<_i28.SigningData>> Function(List<_i17.UTXO>)?
+    required _i23.Future<List<_i31.SigningData>> Function(List<_i17.UTXO>)?
         fetchBuildTxData,
     required _i23.Future<void> Function()? refresh,
     required _i23.Future<void> Function()? checkChangeAddressForTransactions,
@@ -1562,7 +1685,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         )),
       ) as _i23.Future<_i16.BIP32>);
   @override
-  _i23.Future<_i29.Uint8List> getPrivateKeyForPaynymReceivingAddress({
+  _i23.Future<_i28.Uint8List> getPrivateKeyForPaynymReceivingAddress({
     required String? paymentCodeString,
     required int? index,
   }) =>
@@ -1575,8 +1698,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
             #index: index,
           },
         ),
-        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i23.Future<_i29.Uint8List>);
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
   @override
   _i23.Future<_i17.Address> currentReceivingPaynymAddress({
     required _i18.PaymentCode? sender,
@@ -1662,14 +1785,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         )),
       ) as _i23.Future<_i18.PaymentCode>);
   @override
-  _i23.Future<_i29.Uint8List> signWithNotificationKey(_i29.Uint8List? data) =>
+  _i23.Future<_i28.Uint8List> signWithNotificationKey(_i28.Uint8List? data) =>
       (super.noSuchMethod(
         Invocation.method(
           #signWithNotificationKey,
           [data],
         ),
-        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i23.Future<_i29.Uint8List>);
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
   @override
   _i23.Future<String> signStringWithNotificationKey(String? data) =>
       (super.noSuchMethod(
@@ -1902,9 +2025,9 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     required String? walletId,
     required String? walletName,
     required _i22.Coin? coin,
-    required _i12.MainDB? db,
+    required _i7.MainDB? db,
     required _i23.Future<int> Function()? getChainHeight,
-    required _i23.Future<void> Function(_i11.Balance)? refreshedBalanceCallback,
+    required _i23.Future<void> Function(_i12.Balance)? refreshedBalanceCallback,
   }) =>
       super.noSuchMethod(
         Invocation.method(
@@ -1947,15 +2070,15 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         ),
       ) as _i19.SecureStorageInterface);
   @override
-  List<_i30.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i32.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i32.NodeModel>[],
+      ) as List<_i32.NodeModel>);
   @override
-  List<_i30.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i32.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i32.NodeModel>[],
+      ) as List<_i32.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -1973,7 +2096,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
   @override
   _i23.Future<void> setPrimaryNodeFor({
     required _i22.Coin? coin,
-    required _i30.NodeModel? node,
+    required _i32.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -1990,40 +2113,40 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i30.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
+  _i32.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i30.NodeModel?);
+      )) as _i32.NodeModel?);
   @override
-  List<_i30.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
+  List<_i32.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i32.NodeModel>[],
+      ) as List<_i32.NodeModel>);
   @override
-  _i30.NodeModel? getNodeById({required String? id}) =>
+  _i32.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i30.NodeModel?);
+      )) as _i32.NodeModel?);
   @override
-  List<_i30.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
+  List<_i32.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i32.NodeModel>[],
+      ) as List<_i32.NodeModel>);
   @override
   _i23.Future<void> add(
-    _i30.NodeModel? node,
+    _i32.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2075,7 +2198,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
       ) as _i23.Future<void>);
   @override
   _i23.Future<void> edit(
-    _i30.NodeModel? editedNode,
+    _i32.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2201,13 +2324,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i23.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i23.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i23.Future<_i8.FeeObject>);
+      ) as _i23.Future<_i9.FeeObject>);
   @override
   _i23.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2219,13 +2342,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: _i23.Future<String>.value(''),
       ) as _i23.Future<String>);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i23.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
@@ -2286,6 +2409,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -2564,13 +2692,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i20.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i23.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i23.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i23.Future<_i8.FeeObject>);
+      ) as _i23.Future<_i9.FeeObject>);
   @override
   _i23.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2582,13 +2710,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i20.CoinServiceAPI {
         returnValue: _i23.Future<String>.value(''),
       ) as _i23.Future<String>);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i23.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),

From 4b465107210ec8cc0df8f41dd5ccf5376dece5ee Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 29 May 2023 10:39:14 -0600
Subject: [PATCH 58/87] fix: update fiat price on fiat currency selection
 changed

---
 .../settings_views/global_settings_view/currency_view.dart    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/pages/settings_views/global_settings_view/currency_view.dart b/lib/pages/settings_views/global_settings_view/currency_view.dart
index 87f31e190..9ce682c14 100644
--- a/lib/pages/settings_views/global_settings_view/currency_view.dart
+++ b/lib/pages/settings_views/global_settings_view/currency_view.dart
@@ -50,6 +50,10 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
       currenciesWithoutSelected.remove(current);
       currenciesWithoutSelected.insert(0, current);
       ref.read(prefsChangeNotifierProvider).currency = current;
+
+      if (ref.read(prefsChangeNotifierProvider).externalCalls) {
+        ref.read(priceAnd24hChangeNotifierProvider).updatePrice();
+      }
     }
   }
 

From 83090fdce7342176640bc8a95dd7e26b1b4a525f Mon Sep 17 00:00:00 2001
From: likho <likhojiba@gmail.com>
Date: Mon, 29 May 2023 12:19:14 -0600
Subject: [PATCH 59/87] Fix failing tests

---
 test/models/transactions_model_test.dart     |   2 +-
 test/services/coins/manager_test.dart        | 108 +++++-----
 test/widget_tests/transaction_card_test.dart | 197 +++++++++++++++----
 3 files changed, 225 insertions(+), 82 deletions(-)

diff --git a/test/models/transactions_model_test.dart b/test/models/transactions_model_test.dart
index 176452694..3fca56511 100644
--- a/test/models/transactions_model_test.dart
+++ b/test/models/transactions_model_test.dart
@@ -118,7 +118,7 @@ void main() {
         ]
       });
       expect(txChunk.toString(),
-          "timestamp: 993260735 transactions: [\n    {txid: txid, type: txType, subType: mint, value: 10, fee: 1, height: 1, confirm: true, confirmations: 1, address: address, timestamp: 1876352482, worthNow: 1, inputs: [], slateid: slateId } \n]");
+          "timestamp: 993260735 transactions: [\n    {txid: txid, type: txType, subType: mint, value: 10, fee: 1, height: 1, confirm: true, confirmations: 1, address: address, timestamp: 1876352482, worthNow: 1, inputs: [], slateid: slateId, numberOfMessages: null } \n]");
     });
   });
 
diff --git a/test/services/coins/manager_test.dart b/test/services/coins/manager_test.dart
index 52a31b1b7..fcc246882 100644
--- a/test/services/coins/manager_test.dart
+++ b/test/services/coins/manager_test.dart
@@ -1,37 +1,44 @@
+import 'package:decimal/decimal.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/electrumx_rpc/electrumx.dart';
-import 'package:stackduo/models/balance.dart';
-import 'package:stackduo/models/isar/models/isar_models.dart';
-import 'package:stackduo/models/paymint/fee_object_model.dart';
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart';
-import 'package:stackduo/services/coins/coin_service.dart';
-import 'package:stackduo/services/coins/manager.dart';
-import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-
-// import '../../pages/send_view/send_view_test.mocks.dart';
+import 'package:stackwallet/electrumx_rpc/electrumx.dart';
+import 'package:stackwallet/models/balance.dart';
+import 'package:stackwallet/models/isar/models/isar_models.dart';
+import 'package:stackwallet/models/paymint/fee_object_model.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+
 import 'manager_test.mocks.dart';
 
-@GenerateMocks([BitcoinWallet, ElectrumX])
+/// quick amount constructor wrapper. Using an int is bad practice but for
+/// testing with small amounts this should be fine
+Amount _a(int i) => Amount.fromDecimal(
+      Decimal.fromInt(i),
+      fractionDigits: 8,
+    );
+
+@GenerateMocks([FiroWallet, ElectrumX])
 void main() {
   test("Manager should have a backgroundRefreshListener on initialization", () {
-    final manager = Manager(MockBitcoinWallet());
+    final manager = Manager(MockFiroWallet());
 
     expect(manager.hasBackgroundRefreshListener, true);
   });
 
   test("get coin", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
-    when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
+    final CoinServiceAPI wallet = MockFiroWallet();
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
     final manager = Manager(wallet);
 
-    expect(manager.coin, Coin.bitcoin);
+    expect(manager.coin, Coin.firo);
   });
 
   test("fees", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.fees).thenAnswer((_) async => FeeObject(
         fast: 10,
         medium: 5,
@@ -53,7 +60,7 @@ void main() {
   });
 
   test("maxFee", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.maxFee).thenAnswer((_) async => 10);
 
     final manager = Manager(wallet);
@@ -64,7 +71,7 @@ void main() {
   });
 
   test("get currentReceivingAddress", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.currentReceivingAddress)
         .thenAnswer((_) async => "Some address string");
 
@@ -75,27 +82,30 @@ void main() {
 
   group("get balances", () {
     test("balance", () async {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
+      final balance = Balance(
+        total: _a(10),
+        spendable: _a(1),
+        blockedTotal: _a(0),
+        pendingSpendable: _a(9),
+      );
+
+      when(wallet.coin).thenAnswer((_) => Coin.firo);
       when(wallet.balance).thenAnswer(
-        (_) => Balance(
-          total: 10.toAmountAsRaw(fractionDigits: 8),
-          spendable: 1.toAmountAsRaw(fractionDigits: 8),
-          blockedTotal: 0.toAmountAsRaw(fractionDigits: 8),
-          pendingSpendable: 9.toAmountAsRaw(fractionDigits: 8),
-        ),
+        (_) => balance,
       );
 
       final manager = Manager(wallet);
 
-      expect(manager.balance.total.raw.toInt(), 10);
-      expect(manager.balance.spendable.raw.toInt(), 1);
-      expect(manager.balance.blockedTotal.raw.toInt(), 0);
-      expect(manager.balance.pendingSpendable.raw.toInt(), 9);
+      expect(manager.balance, balance);
     });
   });
 
   test("transactions", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(wallet.coin).thenAnswer((realInvocation) => Coin.firo);
+
     final tx = Transaction(
       walletId: "walletId",
       txid: "txid",
@@ -103,16 +113,20 @@ void main() {
       type: TransactionType.incoming,
       subType: TransactionSubType.mint,
       amount: 123,
+      amountString: Amount(
+        rawValue: BigInt.from(123),
+        fractionDigits: wallet.coin.decimals,
+      ).toJsonString(),
       fee: 3,
       height: 123,
       isCancelled: false,
       isLelantus: true,
       slateId: null,
       otherData: null,
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: '',
-      nonce: null,
+      numberOfMessages: null,
     );
     when(wallet.transactions).thenAnswer((_) async => [
           tx,
@@ -128,7 +142,7 @@ void main() {
   });
 
   test("refresh", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.refresh()).thenAnswer((_) => Future(() => {}));
 
     final manager = Manager(wallet);
@@ -139,7 +153,7 @@ void main() {
   });
 
   test("get walletName", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.walletName).thenAnswer((_) => "Some wallet name");
     final manager = Manager(wallet);
 
@@ -147,7 +161,7 @@ void main() {
   });
 
   test("get walletId", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.walletId).thenAnswer((_) => "Some wallet ID");
 
     final manager = Manager(wallet);
@@ -157,7 +171,7 @@ void main() {
 
   group("validateAddress", () {
     test("some valid address", () {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.validateAddress("a valid address")).thenAnswer((_) => true);
 
       final manager = Manager(wallet);
@@ -166,7 +180,7 @@ void main() {
     });
 
     test("some invalid address", () {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.validateAddress("an invalid address"))
           .thenAnswer((_) => false);
 
@@ -177,7 +191,7 @@ void main() {
   });
 
   test("get mnemonic", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.mnemonic)
         .thenAnswer((_) async => ["Some", "seed", "word", "list"]);
 
@@ -187,7 +201,7 @@ void main() {
   });
 
   test("testNetworkConnection", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.testNetworkConnection()).thenAnswer((_) async => true);
 
     final manager = Manager(wallet);
@@ -197,7 +211,7 @@ void main() {
 
   group("recoverFromMnemonic", () {
     test("successfully recover", () async {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.recoverFromMnemonic(
               mnemonic: "Some valid mnemonic",
               maxUnusedAddressGap: 20,
@@ -222,7 +236,7 @@ void main() {
     });
 
     test("failed recovery", () async {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.recoverFromMnemonic(
               mnemonic: "Some invalid mnemonic",
               maxUnusedAddressGap: 20,
@@ -249,7 +263,7 @@ void main() {
     });
 
     test("failed recovery due to some other error", () async {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.recoverFromMnemonic(
               mnemonic: "Some valid mnemonic",
               maxUnusedAddressGap: 20,
@@ -277,7 +291,7 @@ void main() {
   });
 
   test("exitCurrentWallet", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
     when(wallet.walletId).thenAnswer((realInvocation) => "some id");
     when(wallet.walletName).thenAnswer((realInvocation) => "some name");
@@ -294,7 +308,7 @@ void main() {
   });
 
   test("dispose", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
     when(wallet.walletId).thenAnswer((realInvocation) => "some id");
     when(wallet.walletName).thenAnswer((realInvocation) => "some name");
@@ -305,7 +319,7 @@ void main() {
   });
 
   test("fullRescan succeeds", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.fullRescan(20, 1000)).thenAnswer((_) async {});
 
     final manager = Manager(wallet);
@@ -314,7 +328,7 @@ void main() {
   });
 
   test("fullRescan fails", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.fullRescan(20, 1000)).thenThrow(Exception());
 
     final manager = Manager(wallet);
diff --git a/test/widget_tests/transaction_card_test.dart b/test/widget_tests/transaction_card_test.dart
index 9bbd93dee..d3d16b655 100644
--- a/test/widget_tests/transaction_card_test.dart
+++ b/test/widget_tests/transaction_card_test.dart
@@ -1,3 +1,4 @@
+import 'package:decimal/decimal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -5,33 +6,40 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockingjay/mockingjay.dart' as mockingjay;
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/models/isar/models/blockchain_data/address.dart';
-import 'package:stackduo/models/isar/models/blockchain_data/transaction.dart';
-import 'package:stackduo/pages/wallet_view/transaction_views/transaction_details_view.dart';
-import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/coins/coin_service.dart';
-import 'package:stackduo/services/coins/manager.dart';
-import 'package:stackduo/services/locale_service.dart';
-import 'package:stackduo/services/notes_service.dart';
-import 'package:stackduo/services/price_service.dart';
-import 'package:stackduo/services/wallets.dart';
-import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/prefs.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/utilities/util.dart';
-import 'package:stackduo/widgets/transaction_card.dart';
-
+import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
+import 'package:stackwallet/models/isar/models/blockchain_data/transaction.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart';
+import 'package:stackwallet/providers/providers.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/services/locale_service.dart';
+import 'package:stackwallet/services/notes_service.dart';
+import 'package:stackwallet/services/price_service.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/utilities/prefs.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/widgets/transaction_card.dart';
+import 'package:tuple/tuple.dart';
+
+import '../sample_data/theme_json.dart';
 import 'transaction_card_test.mocks.dart';
 
 @GenerateMocks([
   Wallets,
   Manager,
   CoinServiceAPI,
+  FiroWallet,
   LocaleService,
   Prefs,
   PriceService,
-  NotesService
+  NotesService,
+  ThemeService,
 ], customMocks: [])
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -41,12 +49,17 @@ void main() {
     final wallets = MockWallets();
     final mockPrefs = MockPrefs();
     final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
 
     final tx = Transaction(
       txid: "some txid",
       timestamp: 1648595998,
       type: TransactionType.outgoing,
       amount: 100000000,
+      amountString: Amount(
+        rawValue: BigInt.from(100000000),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
       fee: 3794,
       height: 450123,
       subType: TransactionSubType.none,
@@ -55,10 +68,10 @@ void main() {
       isLelantus: null,
       slateId: '',
       otherData: '',
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: Amount.zero.toJsonString(),
-      nonce: null,
+      numberOfMessages: null,
     )..address.value = Address(
         walletId: "walletId",
         value: "",
@@ -68,10 +81,27 @@ void main() {
         type: AddressType.p2pkh,
         subType: AddressSubType.receiving);
 
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+        applicationThemesDirectoryPath: "test",
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
     when(mockPrefs.currency).thenAnswer((_) => "USD");
     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
 
+    when(wallets.getManager("wallet-id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
     //
     await tester.pumpWidget(
       ProviderScope(
@@ -79,6 +109,7 @@ void main() {
           walletsChangeNotifierProvider.overrideWithValue(wallets),
           localeServiceChangeNotifierProvider
               .overrideWithValue(mockLocaleService),
+          pThemeService.overrideWithValue(mockThemeService),
           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
         ],
@@ -86,7 +117,10 @@ void main() {
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
               ),
             ],
           ),
@@ -118,6 +152,8 @@ void main() {
     verify(mockLocaleService.addListener(any)).called(1);
 
     verify(mockPrefs.currency).called(1);
+    verify(mockPriceService.getPrice(Coin.firo)).called(1);
+    verify(wallet.coin.ticker).called(1);
 
     verify(mockLocaleService.locale).called(1);
 
@@ -131,12 +167,17 @@ void main() {
     final wallets = MockWallets();
     final mockPrefs = MockPrefs();
     final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
 
     final tx = Transaction(
       txid: "some txid",
       timestamp: 1648595998,
       type: TransactionType.outgoing,
       amount: 9659,
+      amountString: Amount(
+        rawValue: BigInt.from(9659),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
       fee: 3794,
       height: 450123,
       subType: TransactionSubType.mint,
@@ -145,10 +186,10 @@ void main() {
       isLelantus: null,
       slateId: '',
       otherData: '',
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: Amount.zero.toJsonString(),
-      nonce: null,
+      numberOfMessages: null,
     )..address.value = Address(
         walletId: "walletId",
         value: "",
@@ -158,10 +199,26 @@ void main() {
         type: AddressType.p2pkh,
         subType: AddressSubType.receiving);
 
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+        applicationThemesDirectoryPath: "test",
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
     when(mockPrefs.currency).thenAnswer((_) => "USD");
     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
 
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+
+    when(wallets.getManager("wallet-id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
     //
     await tester.pumpWidget(
       ProviderScope(
@@ -170,13 +227,17 @@ void main() {
           localeServiceChangeNotifierProvider
               .overrideWithValue(mockLocaleService),
           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
               ),
             ],
           ),
@@ -206,6 +267,8 @@ void main() {
     verify(mockLocaleService.addListener(any)).called(1);
 
     verify(mockPrefs.currency).called(1);
+    verify(mockPriceService.getPrice(Coin.firo)).called(1);
+    verify(wallet.coin.ticker).called(1);
 
     verify(mockLocaleService.locale).called(1);
 
@@ -219,12 +282,17 @@ void main() {
     final wallets = MockWallets();
     final mockPrefs = MockPrefs();
     final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
 
     final tx = Transaction(
       txid: "some txid",
       timestamp: 1648595998,
       type: TransactionType.incoming,
       amount: 100000000,
+      amountString: Amount(
+        rawValue: BigInt.from(100000000),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
       fee: 3794,
       height: 450123,
       subType: TransactionSubType.none,
@@ -233,10 +301,10 @@ void main() {
       isLelantus: null,
       slateId: '',
       otherData: '',
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: Amount.zero.toJsonString(),
-      nonce: null,
+      numberOfMessages: null,
     )..address.value = Address(
         walletId: "walletId",
         value: "",
@@ -246,9 +314,27 @@ void main() {
         type: AddressType.p2pkh,
         subType: AddressSubType.receiving);
 
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+        applicationThemesDirectoryPath: "test",
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
     when(mockPrefs.currency).thenAnswer((_) => "USD");
     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+
+    when(wallets.getManager("wallet-id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
 
     await tester.pumpWidget(
       ProviderScope(
@@ -257,13 +343,17 @@ void main() {
           localeServiceChangeNotifierProvider
               .overrideWithValue(mockLocaleService),
           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
               ),
             ],
           ),
@@ -285,6 +375,8 @@ void main() {
     verify(mockLocaleService.addListener(any)).called(1);
 
     verify(mockPrefs.currency).called(1);
+    verify(mockPriceService.getPrice(Coin.firo)).called(1);
+    verify(wallet.coin.ticker).called(1);
 
     verify(mockLocaleService.locale).called(1);
 
@@ -298,6 +390,7 @@ void main() {
     final wallets = MockWallets();
     final mockPrefs = MockPrefs();
     final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
     final navigator = mockingjay.MockNavigator();
 
     final tx = Transaction(
@@ -305,6 +398,10 @@ void main() {
       timestamp: 1648595998,
       type: TransactionType.outgoing,
       amount: 100000000,
+      amountString: Amount(
+        rawValue: BigInt.from(100000000),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
       fee: 3794,
       height: 450123,
       subType: TransactionSubType.none,
@@ -313,10 +410,10 @@ void main() {
       isLelantus: null,
       slateId: '',
       otherData: '',
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: Amount.zero.toJsonString(),
-      nonce: null,
+      numberOfMessages: null,
     )..address.value = Address(
         walletId: "walletId",
         value: "",
@@ -326,9 +423,32 @@ void main() {
         type: AddressType.p2pkh,
         subType: AddressSubType.receiving);
 
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+        applicationThemesDirectoryPath: "test",
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
     when(mockPrefs.currency).thenAnswer((_) => "USD");
     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+
+    when(wallets.getManager("wallet id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+
+    mockingjay
+        .when(() => navigator.pushNamed("/transactionDetails",
+            arguments: Tuple3(tx, Coin.firo, "wallet id")))
+        .thenAnswer((_) async => {});
 
     await tester.pumpWidget(
       ProviderScope(
@@ -337,12 +457,18 @@ void main() {
           localeServiceChangeNotifierProvider
               .overrideWithValue(mockLocaleService),
           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
             ],
           ),
           home: mockingjay.MockNavigatorProvider(
@@ -361,16 +487,19 @@ void main() {
 
     verify(mockPrefs.currency).called(2);
     verify(mockLocaleService.locale).called(4);
+    verify(wallet.coin.ticker).called(1);
+    verify(wallet.storedChainHeight).called(2);
 
+    verifyNoMoreInteractions(wallet);
     verifyNoMoreInteractions(mockLocaleService);
 
     if (Util.isDesktop) {
       expect(find.byType(TransactionDetailsView), findsOneWidget);
     } else {
-      // mockingjay
-      //     .verify(() => navigator.pushNamed("/transactionDetails",
-      //         arguments: Tuple3(tx, Coin.firo, "wallet id")))
-      //     .called(1);
+      mockingjay
+          .verify(() => navigator.pushNamed("/transactionDetails",
+              arguments: Tuple3(tx, Coin.firo, "wallet id")))
+          .called(1);
     }
   });
 }

From 028cfc67a3112340cb16fce0cc3cd60c463a5dc8 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 29 May 2023 16:29:36 -0600
Subject: [PATCH 60/87] fix: rpc test

---
 test/json_rpc_test.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/json_rpc_test.dart b/test/json_rpc_test.dart
index b7a613631..d6af19546 100644
--- a/test/json_rpc_test.dart
+++ b/test/json_rpc_test.dart
@@ -17,7 +17,7 @@ void main() {
         '{"jsonrpc": "2.0", "id": "some id","method": "server.ping","params": []}';
     final result = await jsonRPC.request(jsonRequestString);
 
-    expect(result, {"jsonrpc": "2.0", "result": null, "id": "some id"});
+    expect(result.data, {"jsonrpc": "2.0", "result": null, "id": "some id"});
   });
 
   test("JsonRPC.request fails due to SocketException", () async {

From 5a88095f1347a0f6df55f39b32d1dfc89c3af120 Mon Sep 17 00:00:00 2001
From: julian-CStack <97684800+julian-CStack@users.noreply.github.com>
Date: Mon, 29 May 2023 17:34:03 -0600
Subject: [PATCH 61/87] Upgrades from stack (#36)

* untested protected rpc version

* update tests

* cleaned up electrumx rpc

* fix: bug in setting _isConnected as well as adding call to refresh on reconnection established

* fix: update electrumx tests

* fix: update fiat price on fiat currency selection changed

* Fix failing tests

* fix: rpc test

---------

Co-authored-by: likho <likhojiba@gmail.com>
---
 lib/electrumx_rpc/electrumx.dart              |   27 +-
 lib/electrumx_rpc/rpc.dart                    |  262 ++-
 .../global_settings_view/currency_view.dart   |    4 +
 .../coins/bitcoin/bitcoin_wallet.dart         |    7 +-
 test/cached_electrumx_test.dart               |    6 +-
 test/electrumx_test.dart                      |  233 +-
 test/electrumx_test.mocks.dart                |   76 +-
 test/json_rpc_test.dart                       |    2 +-
 test/models/transactions_model_test.dart      |    2 +-
 .../notification_card_test.mocks.dart         |  131 ++
 .../pages/send_view/send_view_test.mocks.dart |  190 +-
 ...allet_settings_view_screen_test.mocks.dart |  438 ++--
 .../bitcoin/bitcoin_wallet_test.mocks.dart    |  226 +-
 .../bitcoincash_wallet_test.mocks.dart        |  564 +++++
 .../dogecoin/dogecoin_wallet_test.mocks.dart  |  564 +++++
 .../coins/firo/firo_wallet_test.mocks.dart    | 1152 ++++++++++
 test/services/coins/manager_test.dart         |  108 +-
 test/services/coins/manager_test.mocks.dart   | 1575 +++++--------
 .../namecoin/namecoin_wallet_test.mocks.dart  |  564 +++++
 .../particl/particl_wallet_test.mocks.dart    |  564 +++++
 .../favorite_toggle_test.mocks.dart           |  131 ++
 .../custom_loading_overlay_test.mocks.dart    |  131 ++
 .../desktop/desktop_scaffold_test.mocks.dart  |  131 ++
 .../managed_favorite_test.mocks.dart          |  210 +-
 .../table_view/table_view_row_test.mocks.dart |  328 ++-
 test/widget_tests/trade_card_test.mocks.dart  |  131 ++
 test/widget_tests/transaction_card_test.dart  |  197 +-
 .../transaction_card_test.mocks.dart          | 2003 +++++++++++++----
 test/widget_tests/wallet_card_test.mocks.dart | 1861 +++++++++++++++
 .../wallet_info_row_test.mocks.dart           |  364 ++-
 30 files changed, 9860 insertions(+), 2322 deletions(-)
 create mode 100644 test/notifications/notification_card_test.mocks.dart
 create mode 100644 test/services/coins/bitcoincash/bitcoincash_wallet_test.mocks.dart
 create mode 100644 test/services/coins/dogecoin/dogecoin_wallet_test.mocks.dart
 create mode 100644 test/services/coins/firo/firo_wallet_test.mocks.dart
 create mode 100644 test/services/coins/namecoin/namecoin_wallet_test.mocks.dart
 create mode 100644 test/services/coins/particl/particl_wallet_test.mocks.dart
 create mode 100644 test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart
 create mode 100644 test/widget_tests/custom_loading_overlay_test.mocks.dart
 create mode 100644 test/widget_tests/desktop/desktop_scaffold_test.mocks.dart
 create mode 100644 test/widget_tests/trade_card_test.mocks.dart
 create mode 100644 test/widget_tests/wallet_card_test.mocks.dart

diff --git a/lib/electrumx_rpc/electrumx.dart b/lib/electrumx_rpc/electrumx.dart
index 1b7b7158e..78adc6cd5 100644
--- a/lib/electrumx_rpc/electrumx.dart
+++ b/lib/electrumx_rpc/electrumx.dart
@@ -132,13 +132,12 @@ class ElectrumX {
 
       final response = await _rpcClient!.request(jsonRequestString);
 
-      print("=================================================");
-      print("TYPE: ${response.runtimeType}");
-      print("RESPONSE: $response");
-      print("=================================================");
+      if (response.exception != null) {
+        throw response.exception!;
+      }
 
-      if (response["error"] != null) {
-        if (response["error"]
+      if (response.data["error"] != null) {
+        if (response.data["error"]
             .toString()
             .contains("No such mempool or blockchain transaction")) {
           throw NoSuchTransactionException(
@@ -148,11 +147,15 @@ class ElectrumX {
         }
 
         throw Exception(
-            "JSONRPC response     \ncommand: $command     \nargs: $args     \nerror: $response");
+          "JSONRPC response\n"
+          "     command: $command\n"
+          "     args: $args\n"
+          "     error: $response.data",
+        );
       }
 
       currentFailoverIndex = -1;
-      return response;
+      return response.data;
     } on WifiOnlyException {
       rethrow;
     } on SocketException {
@@ -233,7 +236,13 @@ class ElectrumX {
       // Logging.instance.log("batch request: $request");
 
       // send batch request
-      final response = (await _rpcClient!.request(request)) as List<dynamic>;
+      final jsonRpcResponse = (await _rpcClient!.request(request));
+
+      if (jsonRpcResponse.exception != null) {
+        throw jsonRpcResponse.exception!;
+      }
+
+      final response = jsonRpcResponse.data as List;
 
       // check for errors, format and throw if there are any
       final List<String> errors = [];
diff --git a/lib/electrumx_rpc/rpc.dart b/lib/electrumx_rpc/rpc.dart
index a426b96b1..a62f7511d 100644
--- a/lib/electrumx_rpc/rpc.dart
+++ b/lib/electrumx_rpc/rpc.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 
+import 'package:flutter/foundation.dart';
 import 'package:mutex/mutex.dart';
 import 'package:stackduo/utilities/logger.dart';
 
-// hacky fix to receive large jsonrpc responses
+// Json RPC class to handle connecting to electrumx servers
 class JsonRPC {
   JsonRPC({
     required this.host,
@@ -25,90 +25,60 @@ class JsonRPC {
   StreamSubscription<Uint8List>? _subscription;
 
   void _dataHandler(List<int> data) {
-    if (_requestQueue.isEmpty) {
-      // probably just return although this case should never actually hit
-      return;
-    }
-
-    final req = _requestQueue.next;
-    req.appendDataAndCheckIfComplete(data);
+    _requestQueue.nextIncompleteReq.then((req) {
+      if (req != null) {
+        req.appendDataAndCheckIfComplete(data);
 
-    if (req.isComplete) {
-      _onReqCompleted(req);
-    }
+        if (req.isComplete) {
+          _onReqCompleted(req);
+        }
+      } else {
+        Logging.instance.log(
+          "_dataHandler found a null req!",
+          level: LogLevel.Warning,
+        );
+      }
+    });
   }
 
   void _errorHandler(Object error, StackTrace trace) {
-    Logging.instance.log(
-      "JsonRPC errorHandler: $error\n$trace",
-      level: LogLevel.Error,
-    );
-
-    final req = _requestQueue.next;
-    req.completer.completeError(error, trace);
-    _onReqCompleted(req);
+    _requestQueue.nextIncompleteReq.then((req) {
+      if (req != null) {
+        req.completer.completeError(error, trace);
+        _onReqCompleted(req);
+      }
+    });
   }
 
   void _doneHandler() {
-    Logging.instance.log(
-      "JsonRPC doneHandler: "
-      "connection closed to $host:$port, destroying socket",
-      level: LogLevel.Info,
-    );
-
-    if (_requestQueue.isNotEmpty) {
-      Logging.instance.log(
-        "JsonRPC doneHandler: queue not empty but connection closed, "
-        "completing pending requests with errors",
-        level: LogLevel.Error,
-      );
-
-      for (final req in _requestQueue.queue) {
-        if (!req.isComplete) {
-          try {
-            throw Exception(
-              "JsonRPC doneHandler: socket closed "
-              "before request could complete",
-            );
-          } catch (e, s) {
-            req.completer.completeError(e, s);
-          }
-        }
-      }
-      _requestQueue.clear();
-    }
-
-    disconnect();
+    disconnect(reason: "JsonRPC _doneHandler() called");
   }
 
   void _onReqCompleted(_JsonRPCRequest req) {
-    _requestQueue.remove(req);
-    if (_requestQueue.isNotEmpty) {
+    _requestQueue.remove(req).then((_) {
+      // attempt to send next request
       _sendNextAvailableRequest();
-    }
+    });
   }
 
   void _sendNextAvailableRequest() {
-    if (_requestQueue.isEmpty) {
-      // TODO handle properly
-      throw Exception("JSON RPC queue empty");
-    }
-
-    final req = _requestQueue.next;
-
-    _socket!.write('${req.jsonRequest}\r\n');
-
-    req.initiateTimeout(const Duration(seconds: 10));
-    // Logging.instance.log(
-    //   "JsonRPC request: wrote request ${req.jsonRequest} "
-    //   "to socket $host:$port",
-    //   level: LogLevel.Info,
-    // );
+    _requestQueue.nextIncompleteReq.then((req) {
+      if (req != null) {
+        // \r\n required by electrumx server
+        _socket!.write('${req.jsonRequest}\r\n');
+
+        // TODO different timeout length?
+        req.initiateTimeout(
+          const Duration(seconds: 10),
+          onTimedOut: () {
+            _requestQueue.remove(req);
+          },
+        );
+      }
+    });
   }
 
-  Future<dynamic> request(String jsonRpcRequest) async {
-    // todo: handle this better?
-    // Do we need to check the subscription, too?
+  Future<JsonRPCResponse> request(String jsonRpcRequest) async {
     await _requestMutex.protect(() async {
       if (_socket == null) {
         Logging.instance.log(
@@ -121,51 +91,69 @@ class JsonRPC {
 
     final req = _JsonRPCRequest(
       jsonRequest: jsonRpcRequest,
-      completer: Completer<dynamic>(),
+      completer: Completer<JsonRPCResponse>(),
     );
 
-    _requestQueue.add(req);
+    final future = req.completer.future.onError(
+      (error, stackTrace) async {
+        await disconnect(
+          reason: "return req.completer.future.onError: $error\n$stackTrace",
+        );
+        return JsonRPCResponse(
+          exception: error is Exception
+              ? error
+              : Exception(
+                  "req.completer.future.onError: $error\n$stackTrace",
+                ),
+        );
+      },
+    );
 
     // if this is the only/first request then send it right away
-    if (_requestQueue.length == 1) {
-      _sendNextAvailableRequest();
-    } else {
-      // Logging.instance.log(
-      //   "JsonRPC request: queued request $jsonRpcRequest "
-      //   "to socket $host:$port",
-      //   level: LogLevel.Info,
-      // );
-    }
-
-    return req.completer.future.onError(
-      (error, stackTrace) =>
-          Exception("return req.completer.future.onError: $error"),
+    await _requestQueue.add(
+      req,
+      onInitialRequestAdded: _sendNextAvailableRequest,
     );
+
+    return future;
   }
 
-  void disconnect() {
-    // TODO: maybe clear req queue here and wrap in mutex?
-    _subscription?.cancel().then((_) => _subscription = null);
-    _socket?.destroy();
-    _socket = null;
+  Future<void> disconnect({required String reason}) async {
+    await _requestMutex.protect(() async {
+      await _subscription?.cancel();
+      _subscription = null;
+      _socket?.destroy();
+      _socket = null;
+
+      // clean up remaining queue
+      await _requestQueue.completeRemainingWithError(
+        "JsonRPC disconnect() called with reason: \"$reason\"",
+      );
+    });
   }
 
   Future<void> connect() async {
+    if (_socket != null) {
+      throw Exception(
+        "JsonRPC attempted to connect to an already existing socket!",
+      );
+    }
+
     if (useSSL) {
-      _socket ??= await SecureSocket.connect(
+      _socket = await SecureSocket.connect(
         host,
         port,
         timeout: connectionTimeout,
         onBadCertificate: (_) => true,
       ); // TODO do not automatically trust bad certificates
     } else {
-      _socket ??= await Socket.connect(
+      _socket = await Socket.connect(
         host,
         port,
         timeout: connectionTimeout,
       );
     }
-    await _subscription?.cancel();
+
     _subscription = _socket!.listen(
       _dataHandler,
       onError: _errorHandler,
@@ -176,36 +164,85 @@ class JsonRPC {
 }
 
 class _JsonRPCRequestQueue {
+  final _lock = Mutex();
   final List<_JsonRPCRequest> _rq = [];
 
-  void add(_JsonRPCRequest req) => _rq.add(req);
+  Future<void> add(
+    _JsonRPCRequest req, {
+    VoidCallback? onInitialRequestAdded,
+  }) async {
+    return await _lock.protect(() async {
+      _rq.add(req);
+      if (_rq.length == 1) {
+        onInitialRequestAdded?.call();
+      }
+    });
+  }
+
+  Future<bool> remove(_JsonRPCRequest req) async {
+    return await _lock.protect(() async {
+      final result = _rq.remove(req);
+      return result;
+    });
+  }
+
+  Future<_JsonRPCRequest?> get nextIncompleteReq async {
+    return await _lock.protect(() async {
+      int removeCount = 0;
+      _JsonRPCRequest? returnValue;
+      for (final req in _rq) {
+        if (req.isComplete) {
+          removeCount++;
+        } else {
+          returnValue = req;
+          break;
+        }
+      }
 
-  bool remove(_JsonRPCRequest req) => _rq.remove(req);
+      _rq.removeRange(0, removeCount);
 
-  void clear() => _rq.clear();
+      return returnValue;
+    });
+  }
 
-  bool get isEmpty => _rq.isEmpty;
-  bool get isNotEmpty => _rq.isNotEmpty;
-  int get length => _rq.length;
-  _JsonRPCRequest get next => _rq.first;
-  List<_JsonRPCRequest> get queue => _rq.toList(growable: false);
+  Future<void> completeRemainingWithError(
+    String error, {
+    StackTrace? stackTrace,
+  }) async {
+    await _lock.protect(() async {
+      for (final req in _rq) {
+        if (!req.isComplete) {
+          req.completer.completeError(Exception(error), stackTrace);
+        }
+      }
+      _rq.clear();
+    });
+  }
+
+  Future<bool> get isEmpty async {
+    return await _lock.protect(() async {
+      return _rq.isEmpty;
+    });
+  }
 }
 
 class _JsonRPCRequest {
+  // 0x0A is newline
+  // https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-basics.html
+  static const int separatorByte = 0x0A;
+
   final String jsonRequest;
-  final Completer<dynamic> completer;
+  final Completer<JsonRPCResponse> completer;
   final List<int> _responseData = [];
 
   _JsonRPCRequest({required this.jsonRequest, required this.completer});
 
   void appendDataAndCheckIfComplete(List<int> data) {
     _responseData.addAll(data);
-    // 0x0A is newline
-    // https://electrumx-spesmilo.readthedocs.io/en/latest/protocol-basics.html
-    if (data.last == 0x0A) {
+    if (data.last == separatorByte) {
       try {
         final response = json.decode(String.fromCharCodes(_responseData));
-        completer.complete(response);
+        completer.complete(JsonRPCResponse(data: response));
       } catch (e, s) {
         Logging.instance.log(
           "JsonRPC json.decode: $e\n$s",
@@ -216,13 +253,17 @@ class _JsonRPCRequest {
     }
   }
 
-  void initiateTimeout(Duration timeout) {
+  void initiateTimeout(
+    Duration timeout, {
+    VoidCallback? onTimedOut,
+  }) {
     Future<void>.delayed(timeout).then((_) {
       if (!isComplete) {
         try {
           throw Exception("_JsonRPCRequest timed out: $jsonRequest");
         } catch (e, s) {
           completer.completeError(e, s);
+          onTimedOut?.call();
         }
       }
     });
@@ -230,3 +271,10 @@ class _JsonRPCRequest {
 
   bool get isComplete => completer.isCompleted;
 }
+
+class JsonRPCResponse {
+  final dynamic data;
+  final Exception? exception;
+
+  JsonRPCResponse({this.data, this.exception});
+}
diff --git a/lib/pages/settings_views/global_settings_view/currency_view.dart b/lib/pages/settings_views/global_settings_view/currency_view.dart
index 87f31e190..9ce682c14 100644
--- a/lib/pages/settings_views/global_settings_view/currency_view.dart
+++ b/lib/pages/settings_views/global_settings_view/currency_view.dart
@@ -50,6 +50,10 @@ class _CurrencyViewState extends ConsumerState<BaseCurrencySettingsView> {
       currenciesWithoutSelected.remove(current);
       currenciesWithoutSelected.insert(0, current);
       ref.read(prefsChangeNotifierProvider).currency = current;
+
+      if (ref.read(prefsChangeNotifierProvider).externalCalls) {
+        ref.read(priceAnd24hChangeNotifierProvider).updatePrice();
+      }
     }
   }
 
diff --git a/lib/services/coins/bitcoin/bitcoin_wallet.dart b/lib/services/coins/bitcoin/bitcoin_wallet.dart
index 2278588ec..0fa906a9e 100644
--- a/lib/services/coins/bitcoin/bitcoin_wallet.dart
+++ b/lib/services/coins/bitcoin/bitcoin_wallet.dart
@@ -1201,13 +1201,18 @@ class BitcoinWallet extends CoinServiceAPI
 
   void _periodicPingCheck() async {
     bool hasNetwork = await testNetworkConnection();
-    _isConnected = hasNetwork;
+
     if (_isConnected != hasNetwork) {
       NodeConnectionStatus status = hasNetwork
           ? NodeConnectionStatus.connected
           : NodeConnectionStatus.disconnected;
       GlobalEventBus.instance
           .fire(NodeConnectionStatusChangedEvent(status, walletId, coin));
+
+      _isConnected = hasNetwork;
+      if (hasNetwork) {
+        unawaited(refresh());
+      }
     }
   }
 
diff --git a/test/cached_electrumx_test.dart b/test/cached_electrumx_test.dart
index c3df6c2e8..052bf87b2 100644
--- a/test/cached_electrumx_test.dart
+++ b/test/cached_electrumx_test.dart
@@ -142,11 +142,7 @@ void main() {
       useSSL: true,
     );
 
-    final client = CachedElectrumX.from(
-        node: node,
-        prefs: MockPrefs(),
-        failovers: [],
-        electrumXClient: MockElectrumX());
+    final client = CachedElectrumX.from(electrumXClient: MockElectrumX());
 
     expect(client, isA<CachedElectrumX>());
   });
diff --git a/test/electrumx_test.dart b/test/electrumx_test.dart
index 3ae162529..8d29f63e9 100644
--- a/test/electrumx_test.dart
+++ b/test/electrumx_test.dart
@@ -57,16 +57,18 @@ void main() {
     const jsonArgs = '["",true]';
     when(
       mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+        '{"jsonrpc": "2.0", "id": "some requestId",'
+        '"method": "$command","params": $jsonArgs}',
+      ),
     ).thenAnswer(
-      (_) async => {
+      (_) async => JsonRPCResponse(data: {
         "jsonrpc": "2.0",
         "error": {
           "code": 1,
           "message": "None should be a transaction hash",
         },
         "id": "some requestId",
-      },
+      }),
     );
 
     final mockPrefs = MockPrefs();
@@ -93,13 +95,15 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": {"height": 520481, "hex": "some block hex string"},
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -126,7 +130,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -153,9 +159,15 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {"jsonrpc": "2.0", "result": null, "id": "some requestId"},
+        (_) async => JsonRPCResponse(data: {
+          "jsonrpc": "2.0",
+          "result": null,
+          "id": "some requestId",
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -181,7 +193,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -208,9 +222,11 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": {
             "genesis_hash":
@@ -225,7 +241,7 @@ void main() {
             "hash_function": "sha256"
           },
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -263,7 +279,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -290,13 +308,15 @@ void main() {
       const jsonArgs = '["some raw transaction string"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": "the txid of the rawtx",
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -323,7 +343,9 @@ void main() {
       const jsonArgs = '["some raw transaction string"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -353,16 +375,18 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": {
             "confirmed": 103873966,
             "unconfirmed": 23684400,
           },
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -389,7 +413,9 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -418,9 +444,11 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": [
             {
@@ -435,7 +463,7 @@ void main() {
             }
           ],
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -473,7 +501,9 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -502,9 +532,11 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": [
             {
@@ -523,7 +555,7 @@ void main() {
             }
           ],
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -565,7 +597,9 @@ void main() {
       const jsonArgs = '["dummy hash"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -594,13 +628,15 @@ void main() {
       const jsonArgs = '["${SampleGetTransactionData.txHash0}",true]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": SampleGetTransactionData.txData0,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -629,7 +665,9 @@ void main() {
       const jsonArgs = '["${SampleGetTransactionData.txHash0}",true]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -659,13 +697,15 @@ void main() {
       const jsonArgs = '["1",""]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": GetAnonymitySetSampleData.data,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -692,7 +732,9 @@ void main() {
       const jsonArgs = '["1",""]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -721,13 +763,15 @@ void main() {
       const jsonArgs = '["some mints"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": "mint meta data",
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -754,7 +798,9 @@ void main() {
       const jsonArgs = '["some mints"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -783,13 +829,15 @@ void main() {
       const jsonArgs = '["0"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": GetUsedSerialsSampleData.serials,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -816,7 +864,9 @@ void main() {
       const jsonArgs = '["0"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -845,9 +895,15 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {"jsonrpc": "2.0", "result": 1, "id": "some requestId"},
+        (_) async => JsonRPCResponse(data: {
+          "jsonrpc": "2.0",
+          "result": 1,
+          "id": "some requestId",
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -873,7 +929,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -886,7 +944,10 @@ void main() {
           prefs: mockPrefs,
           failovers: []);
 
-      expect(() => client.getLatestCoinId(requestID: "some requestId"),
+      expect(
+          () => client.getLatestCoinId(
+                requestID: "some requestId",
+              ),
           throwsA(isA<Exception>()));
       verify(mockPrefs.wifiOnly).called(1);
       verifyNoMoreInteractions(mockPrefs);
@@ -900,13 +961,15 @@ void main() {
       const jsonArgs = '["1",""]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": GetAnonymitySetSampleData.data,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -933,7 +996,9 @@ void main() {
       const jsonArgs = '["1",""]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -947,8 +1012,10 @@ void main() {
           failovers: []);
 
       expect(
-          () =>
-              client.getAnonymitySet(groupId: "1", requestID: "some requestId"),
+          () => client.getAnonymitySet(
+                groupId: "1",
+                requestID: "some requestId",
+              ),
           throwsA(isA<Exception>()));
       verify(mockPrefs.wifiOnly).called(1);
       verifyNoMoreInteractions(mockPrefs);
@@ -962,13 +1029,15 @@ void main() {
       const jsonArgs = '["some mints"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": "mint meta data",
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -995,7 +1064,9 @@ void main() {
       const jsonArgs = '["some mints"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -1010,7 +1081,9 @@ void main() {
 
       expect(
           () => client.getMintData(
-              mints: "some mints", requestID: "some requestId"),
+                mints: "some mints",
+                requestID: "some requestId",
+              ),
           throwsA(isA<Exception>()));
       verify(mockPrefs.wifiOnly).called(1);
       verifyNoMoreInteractions(mockPrefs);
@@ -1024,13 +1097,15 @@ void main() {
       const jsonArgs = '["0"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": GetUsedSerialsSampleData.serials,
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -1057,7 +1132,9 @@ void main() {
       const jsonArgs = '["0"]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -1086,9 +1163,15 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {"jsonrpc": "2.0", "result": 1, "id": "some requestId"},
+        (_) async => JsonRPCResponse(data: {
+          "jsonrpc": "2.0",
+          "result": 1,
+          "id": "some requestId",
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -1114,7 +1197,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
@@ -1141,15 +1226,17 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenAnswer(
-        (_) async => {
+        (_) async => JsonRPCResponse(data: {
           "jsonrpc": "2.0",
           "result": {
             "rate": 1000,
           },
           "id": "some requestId"
-        },
+        }),
       );
 
       final mockPrefs = MockPrefs();
@@ -1175,7 +1262,9 @@ void main() {
       const jsonArgs = '[]';
       when(
         mockClient.request(
-            '{"jsonrpc": "2.0", "id": "some requestId","method": "$command","params": $jsonArgs}'),
+          '{"jsonrpc": "2.0", "id": "some requestId",'
+          '"method": "$command","params": $jsonArgs}',
+        ),
       ).thenThrow(Exception());
 
       final mockPrefs = MockPrefs();
diff --git a/test/electrumx_test.mocks.dart b/test/electrumx_test.mocks.dart
index 2f3abf347..8c9649d20 100644
--- a/test/electrumx_test.mocks.dart
+++ b/test/electrumx_test.mocks.dart
@@ -33,6 +33,17 @@ class _FakeDuration_0 extends _i1.SmartFake implements Duration {
         );
 }
 
+class _FakeJsonRPCResponse_1 extends _i1.SmartFake
+    implements _i2.JsonRPCResponse {
+  _FakeJsonRPCResponse_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
 /// A class which mocks [JsonRPC].
 ///
 /// See the documentation for Mockito's code generation for more information.
@@ -47,40 +58,16 @@ class MockJsonRPC extends _i1.Mock implements _i2.JsonRPC {
         returnValue: false,
       ) as bool);
   @override
-  set useSSL(bool? _useSSL) => super.noSuchMethod(
-        Invocation.setter(
-          #useSSL,
-          _useSSL,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
   String get host => (super.noSuchMethod(
         Invocation.getter(#host),
         returnValue: '',
       ) as String);
   @override
-  set host(String? _host) => super.noSuchMethod(
-        Invocation.setter(
-          #host,
-          _host,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
   int get port => (super.noSuchMethod(
         Invocation.getter(#port),
         returnValue: 0,
       ) as int);
   @override
-  set port(int? _port) => super.noSuchMethod(
-        Invocation.setter(
-          #port,
-          _port,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
   Duration get connectionTimeout => (super.noSuchMethod(
         Invocation.getter(#connectionTimeout),
         returnValue: _FakeDuration_0(
@@ -89,21 +76,40 @@ class MockJsonRPC extends _i1.Mock implements _i2.JsonRPC {
         ),
       ) as Duration);
   @override
-  set connectionTimeout(Duration? _connectionTimeout) => super.noSuchMethod(
-        Invocation.setter(
-          #connectionTimeout,
-          _connectionTimeout,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i3.Future<dynamic> request(String? jsonRpcRequest) => (super.noSuchMethod(
+  _i3.Future<_i2.JsonRPCResponse> request(String? jsonRpcRequest) =>
+      (super.noSuchMethod(
         Invocation.method(
           #request,
           [jsonRpcRequest],
         ),
-        returnValue: _i3.Future<dynamic>.value(),
-      ) as _i3.Future<dynamic>);
+        returnValue:
+            _i3.Future<_i2.JsonRPCResponse>.value(_FakeJsonRPCResponse_1(
+          this,
+          Invocation.method(
+            #request,
+            [jsonRpcRequest],
+          ),
+        )),
+      ) as _i3.Future<_i2.JsonRPCResponse>);
+  @override
+  _i3.Future<void> disconnect({required String? reason}) => (super.noSuchMethod(
+        Invocation.method(
+          #disconnect,
+          [],
+          {#reason: reason},
+        ),
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
+  @override
+  _i3.Future<void> connect() => (super.noSuchMethod(
+        Invocation.method(
+          #connect,
+          [],
+        ),
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
 }
 
 /// A class which mocks [Prefs].
diff --git a/test/json_rpc_test.dart b/test/json_rpc_test.dart
index b7a613631..d6af19546 100644
--- a/test/json_rpc_test.dart
+++ b/test/json_rpc_test.dart
@@ -17,7 +17,7 @@ void main() {
         '{"jsonrpc": "2.0", "id": "some id","method": "server.ping","params": []}';
     final result = await jsonRPC.request(jsonRequestString);
 
-    expect(result, {"jsonrpc": "2.0", "result": null, "id": "some id"});
+    expect(result.data, {"jsonrpc": "2.0", "result": null, "id": "some id"});
   });
 
   test("JsonRPC.request fails due to SocketException", () async {
diff --git a/test/models/transactions_model_test.dart b/test/models/transactions_model_test.dart
index 176452694..3fca56511 100644
--- a/test/models/transactions_model_test.dart
+++ b/test/models/transactions_model_test.dart
@@ -118,7 +118,7 @@ void main() {
         ]
       });
       expect(txChunk.toString(),
-          "timestamp: 993260735 transactions: [\n    {txid: txid, type: txType, subType: mint, value: 10, fee: 1, height: 1, confirm: true, confirmations: 1, address: address, timestamp: 1876352482, worthNow: 1, inputs: [], slateid: slateId } \n]");
+          "timestamp: 993260735 transactions: [\n    {txid: txid, type: txType, subType: mint, value: 10, fee: 1, height: 1, confirm: true, confirmations: 1, address: address, timestamp: 1876352482, worthNow: 1, inputs: [], slateid: slateId, numberOfMessages: null } \n]");
     });
   });
 
diff --git a/test/notifications/notification_card_test.mocks.dart b/test/notifications/notification_card_test.mocks.dart
new file mode 100644
index 000000000..bb8b8ae74
--- /dev/null
+++ b/test/notifications/notification_card_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/notifications/notification_card_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/pages/send_view/send_view_test.mocks.dart b/test/pages/send_view/send_view_test.mocks.dart
index 60041c9d9..2276836ce 100644
--- a/test/pages/send_view/send_view_test.mocks.dart
+++ b/test/pages/send_view/send_view_test.mocks.dart
@@ -1,5 +1,5 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/pages/send_view/send_view_test.dart.
+// in stackwallet/test/pages/send_view/send_view_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
@@ -13,30 +13,33 @@ import 'package:bitcoindart/bitcoindart.dart' as _i14;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i13;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i11;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i10;
-import 'package:stackduo/models/balance.dart' as _i12;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i18;
-import 'package:stackduo/models/node_model.dart' as _i26;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i9;
-import 'package:stackduo/models/signing_data.dart' as _i29;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i27;
-import 'package:stackduo/services/coins/coin_service.dart' as _i20;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/locale_service.dart' as _i31;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i8;
-import 'package:stackduo/services/wallets.dart' as _i21;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i15;
-import 'package:stackduo/utilities/enums/backup_frequency_type.dart' as _i33;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i28;
-import 'package:stackduo/utilities/enums/sync_type_enum.dart' as _i32;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
+import 'package:stackwallet/db/isar/main_db.dart' as _i13;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i11;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i10;
+import 'package:stackwallet/models/balance.dart' as _i12;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i18;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i33;
+import 'package:stackwallet/models/node_model.dart' as _i26;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i9;
+import 'package:stackwallet/models/signing_data.dart' as _i29;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i27;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i20;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/locale_service.dart' as _i31;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i8;
+import 'package:stackwallet/services/wallets.dart' as _i21;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i32;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i15;
+import 'package:stackwallet/utilities/enums/backup_frequency_type.dart' as _i35;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i22;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i28;
+import 'package:stackwallet/utilities/enums/sync_type_enum.dart' as _i34;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
     as _i7;
-import 'package:stackduo/utilities/prefs.dart' as _i24;
+import 'package:stackwallet/utilities/prefs.dart' as _i24;
 import 'package:tuple/tuple.dart' as _i16;
 
 // ignore_for_file: type=lint
@@ -1647,6 +1650,25 @@ class MockBitcoinWallet extends _i1.Mock implements _i27.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i23.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
   void initWalletDB({_i13.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
@@ -2205,6 +2227,105 @@ class MockLocaleService extends _i1.Mock implements _i31.LocaleService {
       );
 }
 
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i32.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i13.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_10(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i13.MainDB);
+  @override
+  List<_i33.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i33.StackTheme>[],
+      ) as List<_i33.StackTheme>);
+  @override
+  void init(_i13.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i23.Future<void> install({required _i30.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<bool>.value(false),
+      ) as _i23.Future<bool>);
+  @override
+  _i23.Future<List<_i32.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i23.Future<List<_i32.StackThemeMetaData>>.value(
+            <_i32.StackThemeMetaData>[]),
+      ) as _i23.Future<List<_i32.StackThemeMetaData>>);
+  @override
+  _i23.Future<_i30.Uint8List> fetchTheme(
+          {required _i32.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i23.Future<_i30.Uint8List>.value(_i30.Uint8List(0)),
+      ) as _i23.Future<_i30.Uint8List>);
+  @override
+  _i33.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i33.StackTheme?);
+}
+
 /// A class which mocks [Prefs].
 ///
 /// See the documentation for Mockito's code generation for more information.
@@ -2264,12 +2385,12 @@ class MockPrefs extends _i1.Mock implements _i24.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  _i32.SyncingType get syncType => (super.noSuchMethod(
+  _i34.SyncingType get syncType => (super.noSuchMethod(
         Invocation.getter(#syncType),
-        returnValue: _i32.SyncingType.currentWalletOnly,
-      ) as _i32.SyncingType);
+        returnValue: _i34.SyncingType.currentWalletOnly,
+      ) as _i34.SyncingType);
   @override
-  set syncType(_i32.SyncingType? syncType) => super.noSuchMethod(
+  set syncType(_i34.SyncingType? syncType) => super.noSuchMethod(
         Invocation.setter(
           #syncType,
           syncType,
@@ -2415,12 +2536,12 @@ class MockPrefs extends _i1.Mock implements _i24.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  _i33.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
+  _i35.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
         Invocation.getter(#backupFrequencyType),
-        returnValue: _i33.BackupFrequencyType.everyTenMinutes,
-      ) as _i33.BackupFrequencyType);
+        returnValue: _i35.BackupFrequencyType.everyTenMinutes,
+      ) as _i35.BackupFrequencyType);
   @override
-  set backupFrequencyType(_i33.BackupFrequencyType? backupFrequencyType) =>
+  set backupFrequencyType(_i35.BackupFrequencyType? backupFrequencyType) =>
       super.noSuchMethod(
         Invocation.setter(
           #backupFrequencyType,
@@ -2787,6 +2908,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
diff --git a/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
index db4ad51c9..df8c7958c 100644
--- a/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
@@ -1,26 +1,25 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.dart.
+// in stackwallet/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i9;
-import 'dart:ui' as _i15;
+import 'dart:async' as _i8;
+import 'dart:ui' as _i14;
 
-import 'package:local_auth/auth_strings.dart' as _i12;
-import 'package:local_auth/local_auth.dart' as _i11;
+import 'package:local_auth/auth_strings.dart' as _i11;
+import 'package:local_auth/local_auth.dart' as _i10;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i7;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i8;
-import 'package:stackduo/models/balance.dart' as _i5;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/models.dart' as _i4;
-import 'package:stackduo/services/coins/coin_service.dart' as _i3;
-import 'package:stackduo/services/coins/manager.dart' as _i16;
-import 'package:stackduo/services/wallets_service.dart' as _i14;
-import 'package:stackduo/utilities/amount/amount.dart' as _i6;
-import 'package:stackduo/utilities/biometrics.dart' as _i13;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i10;
-import 'package:stackduo/utilities/prefs.dart' as _i2;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i7;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i2;
+import 'package:stackwallet/models/balance.dart' as _i5;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i16;
+import 'package:stackwallet/models/models.dart' as _i4;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i3;
+import 'package:stackwallet/services/coins/manager.dart' as _i15;
+import 'package:stackwallet/services/wallets_service.dart' as _i13;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i6;
+import 'package:stackwallet/utilities/biometrics.dart' as _i12;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i9;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -33,8 +32,8 @@ import 'package:stackduo/utilities/prefs.dart' as _i2;
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
-class _FakePrefs_0 extends _i1.SmartFake implements _i2.Prefs {
-  _FakePrefs_0(
+class _FakeElectrumX_0 extends _i1.SmartFake implements _i2.ElectrumX {
+  _FakeElectrumX_0(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -93,38 +92,18 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
   }
 
   @override
-  String get server => (super.noSuchMethod(
-        Invocation.getter(#server),
-        returnValue: '',
-      ) as String);
-  @override
-  int get port => (super.noSuchMethod(
-        Invocation.getter(#port),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get useSSL => (super.noSuchMethod(
-        Invocation.getter(#useSSL),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i2.Prefs get prefs => (super.noSuchMethod(
-        Invocation.getter(#prefs),
-        returnValue: _FakePrefs_0(
+  _i2.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_0(
           this,
-          Invocation.getter(#prefs),
+          Invocation.getter(#electrumXClient),
         ),
-      ) as _i2.Prefs);
-  @override
-  List<_i8.ElectrumXNode> get failovers => (super.noSuchMethod(
-        Invocation.getter(#failovers),
-        returnValue: <_i8.ElectrumXNode>[],
-      ) as List<_i8.ElectrumXNode>);
+      ) as _i2.ElectrumX);
   @override
-  _i9.Future<Map<String, dynamic>> getAnonymitySet({
+  _i8.Future<Map<String, dynamic>> getAnonymitySet({
     required String? groupId,
     String? blockhash = r'',
-    required _i10.Coin? coin,
+    required _i9.Coin? coin,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -137,8 +116,8 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
           },
         ),
         returnValue:
-            _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i9.Future<Map<String, dynamic>>);
+            _i8.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i8.Future<Map<String, dynamic>>);
   @override
   String base64ToHex(String? source) => (super.noSuchMethod(
         Invocation.method(
@@ -156,9 +135,9 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
         returnValue: '',
       ) as String);
   @override
-  _i9.Future<Map<String, dynamic>> getTransaction({
+  _i8.Future<Map<String, dynamic>> getTransaction({
     required String? txHash,
-    required _i10.Coin? coin,
+    required _i9.Coin? coin,
     bool? verbose = true,
   }) =>
       (super.noSuchMethod(
@@ -172,11 +151,11 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
           },
         ),
         returnValue:
-            _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i9.Future<Map<String, dynamic>>);
+            _i8.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i8.Future<Map<String, dynamic>>);
   @override
-  _i9.Future<List<dynamic>> getUsedCoinSerials({
-    required _i10.Coin? coin,
+  _i8.Future<List<String>> getUsedCoinSerials({
+    required _i9.Coin? coin,
     int? startNumber = 0,
   }) =>
       (super.noSuchMethod(
@@ -188,43 +167,43 @@ class MockCachedElectrumX extends _i1.Mock implements _i7.CachedElectrumX {
             #startNumber: startNumber,
           },
         ),
-        returnValue: _i9.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i9.Future<List<dynamic>>);
+        returnValue: _i8.Future<List<String>>.value(<String>[]),
+      ) as _i8.Future<List<String>>);
   @override
-  _i9.Future<void> clearSharedTransactionCache({required _i10.Coin? coin}) =>
+  _i8.Future<void> clearSharedTransactionCache({required _i9.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #clearSharedTransactionCache,
           [],
           {#coin: coin},
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
 }
 
 /// A class which mocks [LocalAuthentication].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockLocalAuthentication extends _i1.Mock
-    implements _i11.LocalAuthentication {
+    implements _i10.LocalAuthentication {
   MockLocalAuthentication() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i9.Future<bool> get canCheckBiometrics => (super.noSuchMethod(
+  _i8.Future<bool> get canCheckBiometrics => (super.noSuchMethod(
         Invocation.getter(#canCheckBiometrics),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<bool> authenticateWithBiometrics({
+  _i8.Future<bool> authenticateWithBiometrics({
     required String? localizedReason,
     bool? useErrorDialogs = true,
     bool? stickyAuth = false,
-    _i12.AndroidAuthMessages? androidAuthStrings =
-        const _i12.AndroidAuthMessages(),
-    _i12.IOSAuthMessages? iOSAuthStrings = const _i12.IOSAuthMessages(),
+    _i11.AndroidAuthMessages? androidAuthStrings =
+        const _i11.AndroidAuthMessages(),
+    _i11.IOSAuthMessages? iOSAuthStrings = const _i11.IOSAuthMessages(),
     bool? sensitiveTransaction = true,
   }) =>
       (super.noSuchMethod(
@@ -240,16 +219,16 @@ class MockLocalAuthentication extends _i1.Mock
             #sensitiveTransaction: sensitiveTransaction,
           },
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<bool> authenticate({
+  _i8.Future<bool> authenticate({
     required String? localizedReason,
     bool? useErrorDialogs = true,
     bool? stickyAuth = false,
-    _i12.AndroidAuthMessages? androidAuthStrings =
-        const _i12.AndroidAuthMessages(),
-    _i12.IOSAuthMessages? iOSAuthStrings = const _i12.IOSAuthMessages(),
+    _i11.AndroidAuthMessages? androidAuthStrings =
+        const _i11.AndroidAuthMessages(),
+    _i11.IOSAuthMessages? iOSAuthStrings = const _i11.IOSAuthMessages(),
     bool? sensitiveTransaction = true,
     bool? biometricOnly = false,
   }) =>
@@ -267,46 +246,46 @@ class MockLocalAuthentication extends _i1.Mock
             #biometricOnly: biometricOnly,
           },
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<bool> stopAuthentication() => (super.noSuchMethod(
+  _i8.Future<bool> stopAuthentication() => (super.noSuchMethod(
         Invocation.method(
           #stopAuthentication,
           [],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<bool> isDeviceSupported() => (super.noSuchMethod(
+  _i8.Future<bool> isDeviceSupported() => (super.noSuchMethod(
         Invocation.method(
           #isDeviceSupported,
           [],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<List<_i11.BiometricType>> getAvailableBiometrics() =>
+  _i8.Future<List<_i10.BiometricType>> getAvailableBiometrics() =>
       (super.noSuchMethod(
         Invocation.method(
           #getAvailableBiometrics,
           [],
         ),
         returnValue:
-            _i9.Future<List<_i11.BiometricType>>.value(<_i11.BiometricType>[]),
-      ) as _i9.Future<List<_i11.BiometricType>>);
+            _i8.Future<List<_i10.BiometricType>>.value(<_i10.BiometricType>[]),
+      ) as _i8.Future<List<_i10.BiometricType>>);
 }
 
 /// A class which mocks [Biometrics].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBiometrics extends _i1.Mock implements _i13.Biometrics {
+class MockBiometrics extends _i1.Mock implements _i12.Biometrics {
   MockBiometrics() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i9.Future<bool> authenticate({
+  _i8.Future<bool> authenticate({
     required String? cancelButtonText,
     required String? localizedReason,
     required String? title,
@@ -321,28 +300,28 @@ class MockBiometrics extends _i1.Mock implements _i13.Biometrics {
             #title: title,
           },
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
 }
 
 /// A class which mocks [WalletsService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
+class MockWalletsService extends _i1.Mock implements _i13.WalletsService {
   @override
-  _i9.Future<Map<String, _i14.WalletInfo>> get walletNames =>
+  _i8.Future<Map<String, _i13.WalletInfo>> get walletNames =>
       (super.noSuchMethod(
         Invocation.getter(#walletNames),
-        returnValue: _i9.Future<Map<String, _i14.WalletInfo>>.value(
-            <String, _i14.WalletInfo>{}),
-      ) as _i9.Future<Map<String, _i14.WalletInfo>>);
+        returnValue: _i8.Future<Map<String, _i13.WalletInfo>>.value(
+            <String, _i13.WalletInfo>{}),
+      ) as _i8.Future<Map<String, _i13.WalletInfo>>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
   @override
-  _i9.Future<bool> renameWallet({
+  _i8.Future<bool> renameWallet({
     required String? from,
     required String? to,
     required bool? shouldNotifyListeners,
@@ -357,21 +336,21 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             #shouldNotifyListeners: shouldNotifyListeners,
           },
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  Map<String, _i14.WalletInfo> fetchWalletsData() => (super.noSuchMethod(
+  Map<String, _i13.WalletInfo> fetchWalletsData() => (super.noSuchMethod(
         Invocation.method(
           #fetchWalletsData,
           [],
         ),
-        returnValue: <String, _i14.WalletInfo>{},
-      ) as Map<String, _i14.WalletInfo>);
+        returnValue: <String, _i13.WalletInfo>{},
+      ) as Map<String, _i13.WalletInfo>);
   @override
-  _i9.Future<void> addExistingStackWallet({
+  _i8.Future<void> addExistingStackWallet({
     required String? name,
     required String? walletId,
-    required _i10.Coin? coin,
+    required _i9.Coin? coin,
     required bool? shouldNotifyListeners,
   }) =>
       (super.noSuchMethod(
@@ -385,13 +364,13 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             #shouldNotifyListeners: shouldNotifyListeners,
           },
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<String?> addNewWallet({
+  _i8.Future<String?> addNewWallet({
     required String? name,
-    required _i10.Coin? coin,
+    required _i9.Coin? coin,
     required bool? shouldNotifyListeners,
   }) =>
       (super.noSuchMethod(
@@ -404,46 +383,46 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             #shouldNotifyListeners: shouldNotifyListeners,
           },
         ),
-        returnValue: _i9.Future<String?>.value(),
-      ) as _i9.Future<String?>);
+        returnValue: _i8.Future<String?>.value(),
+      ) as _i8.Future<String?>);
   @override
-  _i9.Future<List<String>> getFavoriteWalletIds() => (super.noSuchMethod(
+  _i8.Future<List<String>> getFavoriteWalletIds() => (super.noSuchMethod(
         Invocation.method(
           #getFavoriteWalletIds,
           [],
         ),
-        returnValue: _i9.Future<List<String>>.value(<String>[]),
-      ) as _i9.Future<List<String>>);
+        returnValue: _i8.Future<List<String>>.value(<String>[]),
+      ) as _i8.Future<List<String>>);
   @override
-  _i9.Future<void> saveFavoriteWalletIds(List<String>? walletIds) =>
+  _i8.Future<void> saveFavoriteWalletIds(List<String>? walletIds) =>
       (super.noSuchMethod(
         Invocation.method(
           #saveFavoriteWalletIds,
           [walletIds],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> addFavorite(String? walletId) => (super.noSuchMethod(
+  _i8.Future<void> addFavorite(String? walletId) => (super.noSuchMethod(
         Invocation.method(
           #addFavorite,
           [walletId],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> removeFavorite(String? walletId) => (super.noSuchMethod(
+  _i8.Future<void> removeFavorite(String? walletId) => (super.noSuchMethod(
         Invocation.method(
           #removeFavorite,
           [walletId],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> moveFavorite({
+  _i8.Future<void> moveFavorite({
     required int? fromIndex,
     required int? toIndex,
   }) =>
@@ -456,48 +435,48 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             #toIndex: toIndex,
           },
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<bool> checkForDuplicate(String? name) => (super.noSuchMethod(
+  _i8.Future<bool> checkForDuplicate(String? name) => (super.noSuchMethod(
         Invocation.method(
           #checkForDuplicate,
           [name],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<String?> getWalletId(String? walletName) => (super.noSuchMethod(
+  _i8.Future<String?> getWalletId(String? walletName) => (super.noSuchMethod(
         Invocation.method(
           #getWalletId,
           [walletName],
         ),
-        returnValue: _i9.Future<String?>.value(),
-      ) as _i9.Future<String?>);
+        returnValue: _i8.Future<String?>.value(),
+      ) as _i8.Future<String?>);
   @override
-  _i9.Future<bool> isMnemonicVerified({required String? walletId}) =>
+  _i8.Future<bool> isMnemonicVerified({required String? walletId}) =>
       (super.noSuchMethod(
         Invocation.method(
           #isMnemonicVerified,
           [],
           {#walletId: walletId},
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<void> setMnemonicVerified({required String? walletId}) =>
+  _i8.Future<void> setMnemonicVerified({required String? walletId}) =>
       (super.noSuchMethod(
         Invocation.method(
           #setMnemonicVerified,
           [],
           {#walletId: walletId},
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<int> deleteWallet(
+  _i8.Future<int> deleteWallet(
     String? name,
     bool? shouldNotifyListeners,
   ) =>
@@ -509,20 +488,20 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
             shouldNotifyListeners,
           ],
         ),
-        returnValue: _i9.Future<int>.value(0),
-      ) as _i9.Future<int>);
+        returnValue: _i8.Future<int>.value(0),
+      ) as _i8.Future<int>);
   @override
-  _i9.Future<void> refreshWallets(bool? shouldNotifyListeners) =>
+  _i8.Future<void> refreshWallets(bool? shouldNotifyListeners) =>
       (super.noSuchMethod(
         Invocation.method(
           #refreshWallets,
           [shouldNotifyListeners],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  void addListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i14.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -530,7 +509,7 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i14.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -558,7 +537,7 @@ class MockWalletsService extends _i1.Mock implements _i14.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i16.Manager {
+class MockManager extends _i1.Mock implements _i15.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -586,10 +565,10 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i10.Coin get coin => (super.noSuchMethod(
+  _i9.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i10.Coin.bitcoin,
-      ) as _i10.Coin);
+        returnValue: _i9.Coin.bitcoin,
+      ) as _i9.Coin);
   @override
   bool get isRefreshing => (super.noSuchMethod(
         Invocation.getter(#isRefreshing),
@@ -622,23 +601,23 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i9.Future<_i4.FeeObject> get fees => (super.noSuchMethod(
+  _i8.Future<_i4.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i9.Future<_i4.FeeObject>.value(_FakeFeeObject_2(
+        returnValue: _i8.Future<_i4.FeeObject>.value(_FakeFeeObject_2(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i9.Future<_i4.FeeObject>);
+      ) as _i8.Future<_i4.FeeObject>);
   @override
-  _i9.Future<int> get maxFee => (super.noSuchMethod(
+  _i8.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
-        returnValue: _i9.Future<int>.value(0),
-      ) as _i9.Future<int>);
+        returnValue: _i8.Future<int>.value(0),
+      ) as _i8.Future<int>);
   @override
-  _i9.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+  _i8.Future<String> get currentReceivingAddress => (super.noSuchMethod(
         Invocation.getter(#currentReceivingAddress),
-        returnValue: _i9.Future<String>.value(''),
-      ) as _i9.Future<String>);
+        returnValue: _i8.Future<String>.value(''),
+      ) as _i8.Future<String>);
   @override
   _i5.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
@@ -648,16 +627,16 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i9.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
+  _i8.Future<List<_i16.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i9.Future<List<_i17.Transaction>>.value(<_i17.Transaction>[]),
-      ) as _i9.Future<List<_i17.Transaction>>);
+            _i8.Future<List<_i16.Transaction>>.value(<_i16.Transaction>[]),
+      ) as _i8.Future<List<_i16.Transaction>>);
   @override
-  _i9.Future<List<_i17.UTXO>> get utxos => (super.noSuchMethod(
+  _i8.Future<List<_i16.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i9.Future<List<_i17.UTXO>>.value(<_i17.UTXO>[]),
-      ) as _i9.Future<List<_i17.UTXO>>);
+        returnValue: _i8.Future<List<_i16.UTXO>>.value(<_i16.UTXO>[]),
+      ) as _i8.Future<List<_i16.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -677,15 +656,15 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: '',
       ) as String);
   @override
-  _i9.Future<List<String>> get mnemonic => (super.noSuchMethod(
+  _i8.Future<List<String>> get mnemonic => (super.noSuchMethod(
         Invocation.getter(#mnemonic),
-        returnValue: _i9.Future<List<String>>.value(<String>[]),
-      ) as _i9.Future<List<String>>);
+        returnValue: _i8.Future<List<String>>.value(<String>[]),
+      ) as _i8.Future<List<String>>);
   @override
-  _i9.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+  _i8.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
         Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i9.Future<String?>.value(),
-      ) as _i9.Future<String?>);
+        returnValue: _i8.Future<String?>.value(),
+      ) as _i8.Future<String?>);
   @override
   bool get isConnected => (super.noSuchMethod(
         Invocation.getter(#isConnected),
@@ -707,6 +686,11 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -722,24 +706,24 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i9.Future<String> get xpub => (super.noSuchMethod(
+  _i8.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
-        returnValue: _i9.Future<String>.value(''),
-      ) as _i9.Future<String>);
+        returnValue: _i8.Future<String>.value(''),
+      ) as _i8.Future<String>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
   @override
-  _i9.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+  _i8.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
         Invocation.method(
           #updateNode,
           [shouldRefresh],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
   void dispose() => super.noSuchMethod(
         Invocation.method(
@@ -749,7 +733,7 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i9.Future<Map<String, dynamic>> prepareSend({
+  _i8.Future<Map<String, dynamic>> prepareSend({
     required String? address,
     required _i6.Amount? amount,
     Map<String, dynamic>? args,
@@ -765,27 +749,27 @@ class MockManager extends _i1.Mock implements _i16.Manager {
           },
         ),
         returnValue:
-            _i9.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i9.Future<Map<String, dynamic>>);
+            _i8.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i8.Future<Map<String, dynamic>>);
   @override
-  _i9.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+  _i8.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
       (super.noSuchMethod(
         Invocation.method(
           #confirmSend,
           [],
           {#txData: txData},
         ),
-        returnValue: _i9.Future<String>.value(''),
-      ) as _i9.Future<String>);
+        returnValue: _i8.Future<String>.value(''),
+      ) as _i8.Future<String>);
   @override
-  _i9.Future<void> refresh() => (super.noSuchMethod(
+  _i8.Future<void> refresh() => (super.noSuchMethod(
         Invocation.method(
           #refresh,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
   bool validateAddress(String? address) => (super.noSuchMethod(
         Invocation.method(
@@ -795,33 +779,33 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i9.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+  _i8.Future<bool> testNetworkConnection() => (super.noSuchMethod(
         Invocation.method(
           #testNetworkConnection,
           [],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<void> initializeNew() => (super.noSuchMethod(
+  _i8.Future<void> initializeNew() => (super.noSuchMethod(
         Invocation.method(
           #initializeNew,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> initializeExisting() => (super.noSuchMethod(
+  _i8.Future<void> initializeExisting() => (super.noSuchMethod(
         Invocation.method(
           #initializeExisting,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> recoverFromMnemonic({
+  _i8.Future<void> recoverFromMnemonic({
     required String? mnemonic,
     String? mnemonicPassphrase,
     required int? maxUnusedAddressGap,
@@ -840,20 +824,20 @@ class MockManager extends _i1.Mock implements _i16.Manager {
             #height: height,
           },
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> exitCurrentWallet() => (super.noSuchMethod(
+  _i8.Future<void> exitCurrentWallet() => (super.noSuchMethod(
         Invocation.method(
           #exitCurrentWallet,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<void> fullRescan(
+  _i8.Future<void> fullRescan(
     int? maxUnusedAddressGap,
     int? maxNumberOfIndexesToCheck,
   ) =>
@@ -865,11 +849,11 @@ class MockManager extends _i1.Mock implements _i16.Manager {
             maxNumberOfIndexesToCheck,
           ],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  _i9.Future<_i6.Amount> estimateFeeFor(
+  _i8.Future<_i6.Amount> estimateFeeFor(
     _i6.Amount? amount,
     int? feeRate,
   ) =>
@@ -881,7 +865,7 @@ class MockManager extends _i1.Mock implements _i16.Manager {
             feeRate,
           ],
         ),
-        returnValue: _i9.Future<_i6.Amount>.value(_FakeAmount_4(
+        returnValue: _i8.Future<_i6.Amount>.value(_FakeAmount_4(
           this,
           Invocation.method(
             #estimateFeeFor,
@@ -891,26 +875,26 @@ class MockManager extends _i1.Mock implements _i16.Manager {
             ],
           ),
         )),
-      ) as _i9.Future<_i6.Amount>);
+      ) as _i8.Future<_i6.Amount>);
   @override
-  _i9.Future<bool> generateNewAddress() => (super.noSuchMethod(
+  _i8.Future<bool> generateNewAddress() => (super.noSuchMethod(
         Invocation.method(
           #generateNewAddress,
           [],
         ),
-        returnValue: _i9.Future<bool>.value(false),
-      ) as _i9.Future<bool>);
+        returnValue: _i8.Future<bool>.value(false),
+      ) as _i8.Future<bool>);
   @override
-  _i9.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
+  _i8.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
         Invocation.method(
           #resetRescanOnOpen,
           [],
         ),
-        returnValue: _i9.Future<void>.value(),
-        returnValueForMissingStub: _i9.Future<void>.value(),
-      ) as _i9.Future<void>);
+        returnValue: _i8.Future<void>.value(),
+        returnValueForMissingStub: _i8.Future<void>.value(),
+      ) as _i8.Future<void>);
   @override
-  void addListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i14.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -918,7 +902,7 @@ class MockManager extends _i1.Mock implements _i16.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i15.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i14.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart b/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart
index 139ef28fd..f88574029 100644
--- a/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart
+++ b/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart
@@ -1,17 +1,17 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/services/coins/bitcoin/bitcoin_wallet_test.dart.
+// in stackwallet/test/services/coins/bitcoin/bitcoin_wallet_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
+import 'dart:async' as _i4;
 
 import 'package:decimal/decimal.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i6;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i4;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i8;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i7;
-import 'package:stackduo/utilities/prefs.dart' as _i3;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -34,8 +34,8 @@ class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
         );
 }
 
-class _FakePrefs_1 extends _i1.SmartFake implements _i3.Prefs {
-  _FakePrefs_1(
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -47,13 +47,13 @@ class _FakePrefs_1 extends _i1.SmartFake implements _i3.Prefs {
 /// A class which mocks [ElectrumX].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
   MockElectrumX() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  set failovers(List<_i4.ElectrumXNode>? _failovers) => super.noSuchMethod(
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
         Invocation.setter(
           #failovers,
           _failovers,
@@ -89,7 +89,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
         returnValue: false,
       ) as bool);
   @override
-  _i5.Future<dynamic> request({
+  _i4.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
     Duration? connectionTimeout = const Duration(seconds: 60),
@@ -108,10 +108,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retries: retries,
           },
         ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
   @override
-  _i5.Future<List<Map<String, dynamic>>> batchRequest({
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
     Duration? connectionTimeout = const Duration(seconds: 60),
@@ -128,11 +128,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retries: retries,
           },
         ),
-        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i5.Future<List<Map<String, dynamic>>>);
+      ) as _i4.Future<List<Map<String, dynamic>>>);
   @override
-  _i5.Future<bool> ping({
+  _i4.Future<bool> ping({
     String? requestID,
     int? retryCount = 1,
   }) =>
@@ -145,10 +145,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retryCount: retryCount,
           },
         ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
   @override
-  _i5.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getBlockHeadTip,
@@ -156,10 +156,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getServerFeatures,
@@ -167,10 +167,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<String> broadcastTransaction({
+  _i4.Future<String> broadcastTransaction({
     required String? rawTx,
     String? requestID,
   }) =>
@@ -183,10 +183,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i5.Future<String>.value(''),
-      ) as _i5.Future<String>);
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
   @override
-  _i5.Future<Map<String, dynamic>> getBalance({
+  _i4.Future<Map<String, dynamic>> getBalance({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -200,10 +200,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<List<Map<String, dynamic>>> getHistory({
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -216,11 +216,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i5.Future<List<Map<String, dynamic>>>);
+      ) as _i4.Future<List<Map<String, dynamic>>>);
   @override
-  _i5.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
           {required Map<String, List<dynamic>>? args}) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -228,11 +228,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           [],
           {#args: args},
         ),
-        returnValue: _i5.Future<Map<String, List<Map<String, dynamic>>>>.value(
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
             <String, List<Map<String, dynamic>>>{}),
-      ) as _i5.Future<Map<String, List<Map<String, dynamic>>>>);
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
   @override
-  _i5.Future<List<Map<String, dynamic>>> getUTXOs({
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -245,11 +245,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i5.Future<List<Map<String, dynamic>>>);
+      ) as _i4.Future<List<Map<String, dynamic>>>);
   @override
-  _i5.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
           {required Map<String, List<dynamic>>? args}) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -257,11 +257,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           [],
           {#args: args},
         ),
-        returnValue: _i5.Future<Map<String, List<Map<String, dynamic>>>>.value(
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
             <String, List<Map<String, dynamic>>>{}),
-      ) as _i5.Future<Map<String, List<Map<String, dynamic>>>>);
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
   @override
-  _i5.Future<Map<String, dynamic>> getTransaction({
+  _i4.Future<Map<String, dynamic>> getTransaction({
     required String? txHash,
     bool? verbose = true,
     String? requestID,
@@ -277,10 +277,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<Map<String, dynamic>> getAnonymitySet({
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
     String? groupId = r'1',
     String? blockhash = r'',
     String? requestID,
@@ -296,10 +296,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<dynamic> getMintData({
+  _i4.Future<dynamic> getMintData({
     dynamic mints,
     String? requestID,
   }) =>
@@ -312,10 +312,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i5.Future<dynamic>.value(),
-      ) as _i5.Future<dynamic>);
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
   @override
-  _i5.Future<Map<String, dynamic>> getUsedCoinSerials({
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
     String? requestID,
     required int? startNumber,
   }) =>
@@ -329,19 +329,19 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
         Invocation.method(
           #getLatestCoinId,
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i5.Future<int>.value(0),
-      ) as _i5.Future<int>);
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
   @override
-  _i5.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getFeeRate,
@@ -349,10 +349,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<_i2.Decimal> estimateFee({
+  _i4.Future<_i2.Decimal> estimateFee({
     String? requestID,
     required int? blocks,
   }) =>
@@ -365,7 +365,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
           this,
           Invocation.method(
             #estimateFee,
@@ -376,15 +376,15 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             },
           ),
         )),
-      ) as _i5.Future<_i2.Decimal>);
+      ) as _i4.Future<_i2.Decimal>);
   @override
-  _i5.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
         Invocation.method(
           #relayFee,
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
           this,
           Invocation.method(
             #relayFee,
@@ -392,50 +392,30 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             {#requestID: requestID},
           ),
         )),
-      ) as _i5.Future<_i2.Decimal>);
+      ) as _i4.Future<_i2.Decimal>);
 }
 
 /// A class which mocks [CachedElectrumX].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
   MockCachedElectrumX() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  String get server => (super.noSuchMethod(
-        Invocation.getter(#server),
-        returnValue: '',
-      ) as String);
-  @override
-  int get port => (super.noSuchMethod(
-        Invocation.getter(#port),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get useSSL => (super.noSuchMethod(
-        Invocation.getter(#useSSL),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i3.Prefs get prefs => (super.noSuchMethod(
-        Invocation.getter(#prefs),
-        returnValue: _FakePrefs_1(
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
           this,
-          Invocation.getter(#prefs),
+          Invocation.getter(#electrumXClient),
         ),
-      ) as _i3.Prefs);
-  @override
-  List<_i4.ElectrumXNode> get failovers => (super.noSuchMethod(
-        Invocation.getter(#failovers),
-        returnValue: <_i4.ElectrumXNode>[],
-      ) as List<_i4.ElectrumXNode>);
+      ) as _i3.ElectrumX);
   @override
-  _i5.Future<Map<String, dynamic>> getAnonymitySet({
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
     required String? groupId,
     String? blockhash = r'',
-    required _i7.Coin? coin,
+    required _i6.Coin? coin,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -448,8 +428,8 @@ class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
   String base64ToHex(String? source) => (super.noSuchMethod(
         Invocation.method(
@@ -467,9 +447,9 @@ class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
         returnValue: '',
       ) as String);
   @override
-  _i5.Future<Map<String, dynamic>> getTransaction({
+  _i4.Future<Map<String, dynamic>> getTransaction({
     required String? txHash,
-    required _i7.Coin? coin,
+    required _i6.Coin? coin,
     bool? verbose = true,
   }) =>
       (super.noSuchMethod(
@@ -483,11 +463,11 @@ class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
           },
         ),
         returnValue:
-            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i5.Future<Map<String, dynamic>>);
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
   @override
-  _i5.Future<List<dynamic>> getUsedCoinSerials({
-    required _i7.Coin? coin,
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
     int? startNumber = 0,
   }) =>
       (super.noSuchMethod(
@@ -499,26 +479,26 @@ class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
             #startNumber: startNumber,
           },
         ),
-        returnValue: _i5.Future<List<dynamic>>.value(<dynamic>[]),
-      ) as _i5.Future<List<dynamic>>);
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
   @override
-  _i5.Future<void> clearSharedTransactionCache({required _i7.Coin? coin}) =>
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #clearSharedTransactionCache,
           [],
           {#coin: coin},
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
 
 /// A class which mocks [TransactionNotificationTracker].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockTransactionNotificationTracker extends _i1.Mock
-    implements _i8.TransactionNotificationTracker {
+    implements _i7.TransactionNotificationTracker {
   MockTransactionNotificationTracker() {
     _i1.throwOnMissingStub(this);
   }
@@ -547,14 +527,14 @@ class MockTransactionNotificationTracker extends _i1.Mock
         returnValue: false,
       ) as bool);
   @override
-  _i5.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
         Invocation.method(
           #addNotifiedPending,
           [txid],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
         Invocation.method(
@@ -564,21 +544,21 @@ class MockTransactionNotificationTracker extends _i1.Mock
         returnValue: false,
       ) as bool);
   @override
-  _i5.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
         Invocation.method(
           #addNotifiedConfirmed,
           [txid],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
-  _i5.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
         Invocation.method(
           #deleteTransaction,
           [txid],
         ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
diff --git a/test/services/coins/bitcoincash/bitcoincash_wallet_test.mocks.dart b/test/services/coins/bitcoincash/bitcoincash_wallet_test.mocks.dart
new file mode 100644
index 000000000..2e39e6916
--- /dev/null
+++ b/test/services/coins/bitcoincash/bitcoincash_wallet_test.mocks.dart
@@ -0,0 +1,564 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/bitcoincash/bitcoincash_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+  @override
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i6.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i6.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
+  @override
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i7.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
diff --git a/test/services/coins/dogecoin/dogecoin_wallet_test.mocks.dart b/test/services/coins/dogecoin/dogecoin_wallet_test.mocks.dart
new file mode 100644
index 000000000..cd9adfe0f
--- /dev/null
+++ b/test/services/coins/dogecoin/dogecoin_wallet_test.mocks.dart
@@ -0,0 +1,564 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/dogecoin/dogecoin_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+  @override
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i6.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i6.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
+  @override
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i7.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
diff --git a/test/services/coins/firo/firo_wallet_test.mocks.dart b/test/services/coins/firo/firo_wallet_test.mocks.dart
new file mode 100644
index 000000000..56864bfdb
--- /dev/null
+++ b/test/services/coins/firo/firo_wallet_test.mocks.dart
@@ -0,0 +1,1152 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/firo/firo_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:isar/isar.dart' as _i4;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i9;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i6;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/models/isar/models/block_explorer.dart' as _i11;
+import 'package:stackwallet/models/isar/models/contact_entry.dart' as _i10;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i12;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i8;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i7;
+import 'package:tuple/tuple.dart' as _i13;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeIsar_2 extends _i1.SmartFake implements _i4.Isar {
+  _FakeIsar_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeQueryBuilder_3<OBJ, R, S> extends _i1.SmartFake
+    implements _i4.QueryBuilder<OBJ, R, S> {
+  _FakeQueryBuilder_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i5.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i5.Future<dynamic>.value(),
+      ) as _i5.Future<dynamic>);
+  @override
+  _i5.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i5.Future<List<Map<String, dynamic>>>);
+  @override
+  _i5.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i5.Future<String>.value(''),
+      ) as _i5.Future<String>);
+  @override
+  _i5.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i5.Future<List<Map<String, dynamic>>>);
+  @override
+  _i5.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i5.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i5.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i5.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i5.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i5.Future<List<Map<String, dynamic>>>);
+  @override
+  _i5.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i5.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i5.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i5.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i5.Future<dynamic>.value(),
+      ) as _i5.Future<dynamic>);
+  @override
+  _i5.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i5.Future<_i2.Decimal>);
+  @override
+  _i5.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i5.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i5.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i6.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i5.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i7.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i5.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i7.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i5.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i5.Future<Map<String, dynamic>>);
+  @override
+  _i5.Future<List<String>> getUsedCoinSerials({
+    required _i7.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i5.Future<List<String>>.value(<String>[]),
+      ) as _i5.Future<List<String>>);
+  @override
+  _i5.Future<void> clearSharedTransactionCache({required _i7.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i8.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i5.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i5.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+}
+
+/// A class which mocks [MainDB].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMainDB extends _i1.Mock implements _i9.MainDB {
+  MockMainDB() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i4.Isar get isar => (super.noSuchMethod(
+        Invocation.getter(#isar),
+        returnValue: _FakeIsar_2(
+          this,
+          Invocation.getter(#isar),
+        ),
+      ) as _i4.Isar);
+  @override
+  _i5.Future<bool> initMainDB({_i4.Isar? mock}) => (super.noSuchMethod(
+        Invocation.method(
+          #initMainDB,
+          [],
+          {#mock: mock},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  List<_i10.ContactEntry> getContactEntries() => (super.noSuchMethod(
+        Invocation.method(
+          #getContactEntries,
+          [],
+        ),
+        returnValue: <_i10.ContactEntry>[],
+      ) as List<_i10.ContactEntry>);
+  @override
+  _i5.Future<bool> deleteContactEntry({required String? id}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteContactEntry,
+          [],
+          {#id: id},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<bool> isContactEntryExists({required String? id}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #isContactEntryExists,
+          [],
+          {#id: id},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i10.ContactEntry? getContactEntry({required String? id}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getContactEntry,
+        [],
+        {#id: id},
+      )) as _i10.ContactEntry?);
+  @override
+  _i5.Future<bool> putContactEntry(
+          {required _i10.ContactEntry? contactEntry}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putContactEntry,
+          [],
+          {#contactEntry: contactEntry},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i11.TransactionBlockExplorer? getTransactionBlockExplorer(
+          {required _i7.Coin? coin}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTransactionBlockExplorer,
+        [],
+        {#coin: coin},
+      )) as _i11.TransactionBlockExplorer?);
+  @override
+  _i5.Future<int> putTransactionBlockExplorer(
+          _i11.TransactionBlockExplorer? explorer) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransactionBlockExplorer,
+          [explorer],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i4.QueryBuilder<_i12.Address, _i12.Address, _i4.QAfterWhereClause>
+      getAddresses(String? walletId) => (super.noSuchMethod(
+            Invocation.method(
+              #getAddresses,
+              [walletId],
+            ),
+            returnValue: _FakeQueryBuilder_3<_i12.Address, _i12.Address,
+                _i4.QAfterWhereClause>(
+              this,
+              Invocation.method(
+                #getAddresses,
+                [walletId],
+              ),
+            ),
+          ) as _i4
+              .QueryBuilder<_i12.Address, _i12.Address, _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<int> putAddress(_i12.Address? address) => (super.noSuchMethod(
+        Invocation.method(
+          #putAddress,
+          [address],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<List<int>> putAddresses(List<_i12.Address>? addresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putAddresses,
+          [addresses],
+        ),
+        returnValue: _i5.Future<List<int>>.value(<int>[]),
+      ) as _i5.Future<List<int>>);
+  @override
+  _i5.Future<List<int>> updateOrPutAddresses(List<_i12.Address>? addresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateOrPutAddresses,
+          [addresses],
+        ),
+        returnValue: _i5.Future<List<int>>.value(<int>[]),
+      ) as _i5.Future<List<int>>);
+  @override
+  _i5.Future<_i12.Address?> getAddress(
+    String? walletId,
+    String? address,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAddress,
+          [
+            walletId,
+            address,
+          ],
+        ),
+        returnValue: _i5.Future<_i12.Address?>.value(),
+      ) as _i5.Future<_i12.Address?>);
+  @override
+  _i5.Future<int> updateAddress(
+    _i12.Address? oldAddress,
+    _i12.Address? newAddress,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateAddress,
+          [
+            oldAddress,
+            newAddress,
+          ],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i4.QueryBuilder<_i12.Transaction, _i12.Transaction, _i4.QAfterWhereClause>
+      getTransactions(String? walletId) => (super.noSuchMethod(
+            Invocation.method(
+              #getTransactions,
+              [walletId],
+            ),
+            returnValue: _FakeQueryBuilder_3<_i12.Transaction, _i12.Transaction,
+                _i4.QAfterWhereClause>(
+              this,
+              Invocation.method(
+                #getTransactions,
+                [walletId],
+              ),
+            ),
+          ) as _i4.QueryBuilder<_i12.Transaction, _i12.Transaction,
+              _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<int> putTransaction(_i12.Transaction? transaction) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransaction,
+          [transaction],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<List<int>> putTransactions(List<_i12.Transaction>? transactions) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransactions,
+          [transactions],
+        ),
+        returnValue: _i5.Future<List<int>>.value(<int>[]),
+      ) as _i5.Future<List<int>>);
+  @override
+  _i5.Future<_i12.Transaction?> getTransaction(
+    String? walletId,
+    String? txid,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [
+            walletId,
+            txid,
+          ],
+        ),
+        returnValue: _i5.Future<_i12.Transaction?>.value(),
+      ) as _i5.Future<_i12.Transaction?>);
+  @override
+  _i5.Stream<_i12.Transaction?> watchTransaction({
+    required int? id,
+    bool? fireImmediately = false,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #watchTransaction,
+          [],
+          {
+            #id: id,
+            #fireImmediately: fireImmediately,
+          },
+        ),
+        returnValue: _i5.Stream<_i12.Transaction?>.empty(),
+      ) as _i5.Stream<_i12.Transaction?>);
+  @override
+  _i4.QueryBuilder<_i12.UTXO, _i12.UTXO, _i4.QAfterWhereClause> getUTXOs(
+          String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [walletId],
+        ),
+        returnValue:
+            _FakeQueryBuilder_3<_i12.UTXO, _i12.UTXO, _i4.QAfterWhereClause>(
+          this,
+          Invocation.method(
+            #getUTXOs,
+            [walletId],
+          ),
+        ),
+      ) as _i4.QueryBuilder<_i12.UTXO, _i12.UTXO, _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<void> putUTXO(_i12.UTXO? utxo) => (super.noSuchMethod(
+        Invocation.method(
+          #putUTXO,
+          [utxo],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> putUTXOs(List<_i12.UTXO>? utxos) => (super.noSuchMethod(
+        Invocation.method(
+          #putUTXOs,
+          [utxos],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> updateUTXOs(
+    String? walletId,
+    List<_i12.UTXO>? utxos,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateUTXOs,
+          [
+            walletId,
+            utxos,
+          ],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Stream<_i12.UTXO?> watchUTXO({
+    required int? id,
+    bool? fireImmediately = false,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #watchUTXO,
+          [],
+          {
+            #id: id,
+            #fireImmediately: fireImmediately,
+          },
+        ),
+        returnValue: _i5.Stream<_i12.UTXO?>.empty(),
+      ) as _i5.Stream<_i12.UTXO?>);
+  @override
+  _i4.QueryBuilder<_i12.TransactionNote, _i12.TransactionNote,
+      _i4.QAfterWhereClause> getTransactionNotes(
+          String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransactionNotes,
+          [walletId],
+        ),
+        returnValue: _FakeQueryBuilder_3<_i12.TransactionNote,
+            _i12.TransactionNote, _i4.QAfterWhereClause>(
+          this,
+          Invocation.method(
+            #getTransactionNotes,
+            [walletId],
+          ),
+        ),
+      ) as _i4.QueryBuilder<_i12.TransactionNote, _i12.TransactionNote,
+          _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<void> putTransactionNote(_i12.TransactionNote? transactionNote) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransactionNote,
+          [transactionNote],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> putTransactionNotes(
+          List<_i12.TransactionNote>? transactionNotes) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putTransactionNotes,
+          [transactionNotes],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<_i12.TransactionNote?> getTransactionNote(
+    String? walletId,
+    String? txid,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransactionNote,
+          [
+            walletId,
+            txid,
+          ],
+        ),
+        returnValue: _i5.Future<_i12.TransactionNote?>.value(),
+      ) as _i5.Future<_i12.TransactionNote?>);
+  @override
+  _i5.Stream<_i12.TransactionNote?> watchTransactionNote({
+    required int? id,
+    bool? fireImmediately = false,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #watchTransactionNote,
+          [],
+          {
+            #id: id,
+            #fireImmediately: fireImmediately,
+          },
+        ),
+        returnValue: _i5.Stream<_i12.TransactionNote?>.empty(),
+      ) as _i5.Stream<_i12.TransactionNote?>);
+  @override
+  _i4.QueryBuilder<_i12.AddressLabel, _i12.AddressLabel, _i4.QAfterWhereClause>
+      getAddressLabels(String? walletId) => (super.noSuchMethod(
+            Invocation.method(
+              #getAddressLabels,
+              [walletId],
+            ),
+            returnValue: _FakeQueryBuilder_3<_i12.AddressLabel,
+                _i12.AddressLabel, _i4.QAfterWhereClause>(
+              this,
+              Invocation.method(
+                #getAddressLabels,
+                [walletId],
+              ),
+            ),
+          ) as _i4.QueryBuilder<_i12.AddressLabel, _i12.AddressLabel,
+              _i4.QAfterWhereClause>);
+  @override
+  _i5.Future<int> putAddressLabel(_i12.AddressLabel? addressLabel) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putAddressLabel,
+          [addressLabel],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  int putAddressLabelSync(_i12.AddressLabel? addressLabel) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putAddressLabelSync,
+          [addressLabel],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  _i5.Future<void> putAddressLabels(List<_i12.AddressLabel>? addressLabels) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putAddressLabels,
+          [addressLabels],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<_i12.AddressLabel?> getAddressLabel(
+    String? walletId,
+    String? addressString,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAddressLabel,
+          [
+            walletId,
+            addressString,
+          ],
+        ),
+        returnValue: _i5.Future<_i12.AddressLabel?>.value(),
+      ) as _i5.Future<_i12.AddressLabel?>);
+  @override
+  _i12.AddressLabel? getAddressLabelSync(
+    String? walletId,
+    String? addressString,
+  ) =>
+      (super.noSuchMethod(Invocation.method(
+        #getAddressLabelSync,
+        [
+          walletId,
+          addressString,
+        ],
+      )) as _i12.AddressLabel?);
+  @override
+  _i5.Stream<_i12.AddressLabel?> watchAddressLabel({
+    required int? id,
+    bool? fireImmediately = false,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #watchAddressLabel,
+          [],
+          {
+            #id: id,
+            #fireImmediately: fireImmediately,
+          },
+        ),
+        returnValue: _i5.Stream<_i12.AddressLabel?>.empty(),
+      ) as _i5.Stream<_i12.AddressLabel?>);
+  @override
+  _i5.Future<int> updateAddressLabel(_i12.AddressLabel? addressLabel) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateAddressLabel,
+          [addressLabel],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<void> deleteWalletBlockchainData(String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteWalletBlockchainData,
+          [walletId],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> deleteAddressLabels(String? walletId) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteAddressLabels,
+          [walletId],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> deleteTransactionNotes(String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransactionNotes,
+          [walletId],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> addNewTransactionData(
+    List<_i13.Tuple2<_i12.Transaction, _i12.Address?>>? transactionsData,
+    String? walletId,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #addNewTransactionData,
+          [
+            transactionsData,
+            walletId,
+          ],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i4.QueryBuilder<_i12.EthContract, _i12.EthContract, _i4.QWhere>
+      getEthContracts() => (super.noSuchMethod(
+            Invocation.method(
+              #getEthContracts,
+              [],
+            ),
+            returnValue: _FakeQueryBuilder_3<_i12.EthContract, _i12.EthContract,
+                _i4.QWhere>(
+              this,
+              Invocation.method(
+                #getEthContracts,
+                [],
+              ),
+            ),
+          ) as _i4
+              .QueryBuilder<_i12.EthContract, _i12.EthContract, _i4.QWhere>);
+  @override
+  _i5.Future<_i12.EthContract?> getEthContract(String? contractAddress) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getEthContract,
+          [contractAddress],
+        ),
+        returnValue: _i5.Future<_i12.EthContract?>.value(),
+      ) as _i5.Future<_i12.EthContract?>);
+  @override
+  _i12.EthContract? getEthContractSync(String? contractAddress) =>
+      (super.noSuchMethod(Invocation.method(
+        #getEthContractSync,
+        [contractAddress],
+      )) as _i12.EthContract?);
+  @override
+  _i5.Future<int> putEthContract(_i12.EthContract? contract) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putEthContract,
+          [contract],
+        ),
+        returnValue: _i5.Future<int>.value(0),
+      ) as _i5.Future<int>);
+  @override
+  _i5.Future<void> putEthContracts(List<_i12.EthContract>? contracts) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #putEthContracts,
+          [contracts],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+}
diff --git a/test/services/coins/manager_test.dart b/test/services/coins/manager_test.dart
index 52a31b1b7..fcc246882 100644
--- a/test/services/coins/manager_test.dart
+++ b/test/services/coins/manager_test.dart
@@ -1,37 +1,44 @@
+import 'package:decimal/decimal.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/electrumx_rpc/electrumx.dart';
-import 'package:stackduo/models/balance.dart';
-import 'package:stackduo/models/isar/models/isar_models.dart';
-import 'package:stackduo/models/paymint/fee_object_model.dart';
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart';
-import 'package:stackduo/services/coins/coin_service.dart';
-import 'package:stackduo/services/coins/manager.dart';
-import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-
-// import '../../pages/send_view/send_view_test.mocks.dart';
+import 'package:stackwallet/electrumx_rpc/electrumx.dart';
+import 'package:stackwallet/models/balance.dart';
+import 'package:stackwallet/models/isar/models/isar_models.dart';
+import 'package:stackwallet/models/paymint/fee_object_model.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+
 import 'manager_test.mocks.dart';
 
-@GenerateMocks([BitcoinWallet, ElectrumX])
+/// quick amount constructor wrapper. Using an int is bad practice but for
+/// testing with small amounts this should be fine
+Amount _a(int i) => Amount.fromDecimal(
+      Decimal.fromInt(i),
+      fractionDigits: 8,
+    );
+
+@GenerateMocks([FiroWallet, ElectrumX])
 void main() {
   test("Manager should have a backgroundRefreshListener on initialization", () {
-    final manager = Manager(MockBitcoinWallet());
+    final manager = Manager(MockFiroWallet());
 
     expect(manager.hasBackgroundRefreshListener, true);
   });
 
   test("get coin", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
-    when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
+    final CoinServiceAPI wallet = MockFiroWallet();
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
     final manager = Manager(wallet);
 
-    expect(manager.coin, Coin.bitcoin);
+    expect(manager.coin, Coin.firo);
   });
 
   test("fees", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.fees).thenAnswer((_) async => FeeObject(
         fast: 10,
         medium: 5,
@@ -53,7 +60,7 @@ void main() {
   });
 
   test("maxFee", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.maxFee).thenAnswer((_) async => 10);
 
     final manager = Manager(wallet);
@@ -64,7 +71,7 @@ void main() {
   });
 
   test("get currentReceivingAddress", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.currentReceivingAddress)
         .thenAnswer((_) async => "Some address string");
 
@@ -75,27 +82,30 @@ void main() {
 
   group("get balances", () {
     test("balance", () async {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
+      final balance = Balance(
+        total: _a(10),
+        spendable: _a(1),
+        blockedTotal: _a(0),
+        pendingSpendable: _a(9),
+      );
+
+      when(wallet.coin).thenAnswer((_) => Coin.firo);
       when(wallet.balance).thenAnswer(
-        (_) => Balance(
-          total: 10.toAmountAsRaw(fractionDigits: 8),
-          spendable: 1.toAmountAsRaw(fractionDigits: 8),
-          blockedTotal: 0.toAmountAsRaw(fractionDigits: 8),
-          pendingSpendable: 9.toAmountAsRaw(fractionDigits: 8),
-        ),
+        (_) => balance,
       );
 
       final manager = Manager(wallet);
 
-      expect(manager.balance.total.raw.toInt(), 10);
-      expect(manager.balance.spendable.raw.toInt(), 1);
-      expect(manager.balance.blockedTotal.raw.toInt(), 0);
-      expect(manager.balance.pendingSpendable.raw.toInt(), 9);
+      expect(manager.balance, balance);
     });
   });
 
   test("transactions", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(wallet.coin).thenAnswer((realInvocation) => Coin.firo);
+
     final tx = Transaction(
       walletId: "walletId",
       txid: "txid",
@@ -103,16 +113,20 @@ void main() {
       type: TransactionType.incoming,
       subType: TransactionSubType.mint,
       amount: 123,
+      amountString: Amount(
+        rawValue: BigInt.from(123),
+        fractionDigits: wallet.coin.decimals,
+      ).toJsonString(),
       fee: 3,
       height: 123,
       isCancelled: false,
       isLelantus: true,
       slateId: null,
       otherData: null,
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: '',
-      nonce: null,
+      numberOfMessages: null,
     );
     when(wallet.transactions).thenAnswer((_) async => [
           tx,
@@ -128,7 +142,7 @@ void main() {
   });
 
   test("refresh", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.refresh()).thenAnswer((_) => Future(() => {}));
 
     final manager = Manager(wallet);
@@ -139,7 +153,7 @@ void main() {
   });
 
   test("get walletName", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.walletName).thenAnswer((_) => "Some wallet name");
     final manager = Manager(wallet);
 
@@ -147,7 +161,7 @@ void main() {
   });
 
   test("get walletId", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.walletId).thenAnswer((_) => "Some wallet ID");
 
     final manager = Manager(wallet);
@@ -157,7 +171,7 @@ void main() {
 
   group("validateAddress", () {
     test("some valid address", () {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.validateAddress("a valid address")).thenAnswer((_) => true);
 
       final manager = Manager(wallet);
@@ -166,7 +180,7 @@ void main() {
     });
 
     test("some invalid address", () {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.validateAddress("an invalid address"))
           .thenAnswer((_) => false);
 
@@ -177,7 +191,7 @@ void main() {
   });
 
   test("get mnemonic", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.mnemonic)
         .thenAnswer((_) async => ["Some", "seed", "word", "list"]);
 
@@ -187,7 +201,7 @@ void main() {
   });
 
   test("testNetworkConnection", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.testNetworkConnection()).thenAnswer((_) async => true);
 
     final manager = Manager(wallet);
@@ -197,7 +211,7 @@ void main() {
 
   group("recoverFromMnemonic", () {
     test("successfully recover", () async {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.recoverFromMnemonic(
               mnemonic: "Some valid mnemonic",
               maxUnusedAddressGap: 20,
@@ -222,7 +236,7 @@ void main() {
     });
 
     test("failed recovery", () async {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.recoverFromMnemonic(
               mnemonic: "Some invalid mnemonic",
               maxUnusedAddressGap: 20,
@@ -249,7 +263,7 @@ void main() {
     });
 
     test("failed recovery due to some other error", () async {
-      final CoinServiceAPI wallet = MockBitcoinWallet();
+      final CoinServiceAPI wallet = MockFiroWallet();
       when(wallet.recoverFromMnemonic(
               mnemonic: "Some valid mnemonic",
               maxUnusedAddressGap: 20,
@@ -277,7 +291,7 @@ void main() {
   });
 
   test("exitCurrentWallet", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
     when(wallet.walletId).thenAnswer((realInvocation) => "some id");
     when(wallet.walletName).thenAnswer((realInvocation) => "some name");
@@ -294,7 +308,7 @@ void main() {
   });
 
   test("dispose", () async {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
     when(wallet.walletId).thenAnswer((realInvocation) => "some id");
     when(wallet.walletName).thenAnswer((realInvocation) => "some name");
@@ -305,7 +319,7 @@ void main() {
   });
 
   test("fullRescan succeeds", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.fullRescan(20, 1000)).thenAnswer((_) async {});
 
     final manager = Manager(wallet);
@@ -314,7 +328,7 @@ void main() {
   });
 
   test("fullRescan fails", () {
-    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final CoinServiceAPI wallet = MockFiroWallet();
     when(wallet.fullRescan(20, 1000)).thenThrow(Exception());
 
     final manager = Manager(wallet);
diff --git a/test/services/coins/manager_test.mocks.dart b/test/services/coins/manager_test.mocks.dart
index ad1c81f32..821da6efc 100644
--- a/test/services/coins/manager_test.mocks.dart
+++ b/test/services/coins/manager_test.mocks.dart
@@ -1,31 +1,25 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/services/coins/manager_test.dart.
+// in stackwallet/test/services/coins/manager_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i16;
-import 'dart:typed_data' as _i21;
+import 'dart:async' as _i11;
 
-import 'package:bip32/bip32.dart' as _i11;
-import 'package:bip47/bip47.dart' as _i13;
-import 'package:bitcoindart/bitcoindart.dart' as _i8;
-import 'package:decimal/decimal.dart' as _i14;
+import 'package:decimal/decimal.dart' as _i9;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i7;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i5;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i4;
-import 'package:stackduo/models/balance.dart' as _i6;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i12;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i3;
-import 'package:stackduo/models/signing_data.dart' as _i19;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i15;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i9;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i17;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i18;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
-    as _i20;
-import 'package:tuple/tuple.dart' as _i10;
+import 'package:stackwallet/db/isar/main_db.dart' as _i7;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i4;
+import 'package:stackwallet/models/balance.dart' as _i6;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i13;
+import 'package:stackwallet/models/lelantus_coin.dart' as _i15;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i3;
+import 'package:stackwallet/models/signing_data.dart' as _i14;
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart' as _i10;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i2;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i8;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i12;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -100,8 +94,8 @@ class _FakeMainDB_5 extends _i1.SmartFake implements _i7.MainDB {
         );
 }
 
-class _FakeNetworkType_6 extends _i1.SmartFake implements _i8.NetworkType {
-  _FakeNetworkType_6(
+class _FakeAmount_6 extends _i1.SmartFake implements _i8.Amount {
+  _FakeAmount_6(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -110,8 +104,8 @@ class _FakeNetworkType_6 extends _i1.SmartFake implements _i8.NetworkType {
         );
 }
 
-class _FakeElectrumXNode_7 extends _i1.SmartFake implements _i4.ElectrumXNode {
-  _FakeElectrumXNode_7(
+class _FakeDecimal_7 extends _i1.SmartFake implements _i9.Decimal {
+  _FakeDecimal_7(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -120,77 +114,16 @@ class _FakeElectrumXNode_7 extends _i1.SmartFake implements _i4.ElectrumXNode {
         );
 }
 
-class _FakeAmount_8 extends _i1.SmartFake implements _i9.Amount {
-  _FakeAmount_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeTuple2_9<T1, T2> extends _i1.SmartFake
-    implements _i10.Tuple2<T1, T2> {
-  _FakeTuple2_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeBIP32_10 extends _i1.SmartFake implements _i11.BIP32 {
-  _FakeBIP32_10(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeAddress_11 extends _i1.SmartFake implements _i12.Address {
-  _FakeAddress_11(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakePaymentCode_12 extends _i1.SmartFake implements _i13.PaymentCode {
-  _FakePaymentCode_12(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeDecimal_13 extends _i1.SmartFake implements _i14.Decimal {
-  _FakeDecimal_13(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [BitcoinWallet].
+/// A class which mocks [FiroWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
-  MockBitcoinWallet() {
+class MockFiroWallet extends _i1.Mock implements _i10.FiroWallet {
+  MockFiroWallet() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  set timer(_i16.Timer? _timer) => super.noSuchMethod(
+  set timer(_i11.Timer? _timer) => super.noSuchMethod(
         Invocation.setter(
           #timer,
           _timer,
@@ -215,28 +148,28 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  bool get longMutex => (super.noSuchMethod(
-        Invocation.getter(#longMutex),
+  bool get refreshMutex => (super.noSuchMethod(
+        Invocation.getter(#refreshMutex),
         returnValue: false,
       ) as bool);
   @override
-  set longMutex(bool? _longMutex) => super.noSuchMethod(
+  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
         Invocation.setter(
-          #longMutex,
-          _longMutex,
+          #refreshMutex,
+          _refreshMutex,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  bool get refreshMutex => (super.noSuchMethod(
-        Invocation.getter(#refreshMutex),
+  bool get longMutex => (super.noSuchMethod(
+        Invocation.getter(#longMutex),
         returnValue: false,
       ) as bool);
   @override
-  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
+  set longMutex(bool? _longMutex) => super.noSuchMethod(
         Invocation.setter(
-          #refreshMutex,
-          _refreshMutex,
+          #longMutex,
+          _longMutex,
         ),
         returnValueForMissingStub: null,
       );
@@ -254,6 +187,19 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
+  bool get shouldAutoSync => (super.noSuchMethod(
+        Invocation.getter(#shouldAutoSync),
+        returnValue: false,
+      ) as bool);
+  @override
+  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
+        Invocation.setter(
+          #shouldAutoSync,
+          shouldAutoSync,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
   set isFavorite(bool? markFavorite) => super.noSuchMethod(
         Invocation.setter(
           #isFavorite,
@@ -267,107 +213,48 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i17.Coin get coin => (super.noSuchMethod(
+  _i12.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i17.Coin.bitcoin,
-      ) as _i17.Coin);
-  @override
-  _i16.Future<List<_i12.UTXO>> get utxos => (super.noSuchMethod(
-        Invocation.getter(#utxos),
-        returnValue: _i16.Future<List<_i12.UTXO>>.value(<_i12.UTXO>[]),
-      ) as _i16.Future<List<_i12.UTXO>>);
+        returnValue: _i12.Coin.bitcoin,
+      ) as _i12.Coin);
   @override
-  _i16.Future<List<_i12.Transaction>> get transactions => (super.noSuchMethod(
-        Invocation.getter(#transactions),
-        returnValue:
-            _i16.Future<List<_i12.Transaction>>.value(<_i12.Transaction>[]),
-      ) as _i16.Future<List<_i12.Transaction>>);
-  @override
-  _i16.Future<String> get currentReceivingAddress => (super.noSuchMethod(
-        Invocation.getter(#currentReceivingAddress),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+  _i11.Future<List<String>> get mnemonic => (super.noSuchMethod(
+        Invocation.getter(#mnemonic),
+        returnValue: _i11.Future<List<String>>.value(<String>[]),
+      ) as _i11.Future<List<String>>);
   @override
-  _i16.Future<String> get currentChangeAddress => (super.noSuchMethod(
-        Invocation.getter(#currentChangeAddress),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+  _i11.Future<String?> get mnemonicString => (super.noSuchMethod(
+        Invocation.getter(#mnemonicString),
+        returnValue: _i11.Future<String?>.value(),
+      ) as _i11.Future<String?>);
   @override
-  _i16.Future<String> get currentChangeAddressP2PKH => (super.noSuchMethod(
-        Invocation.getter(#currentChangeAddressP2PKH),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+  _i11.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+        Invocation.getter(#mnemonicPassphrase),
+        returnValue: _i11.Future<String?>.value(),
+      ) as _i11.Future<String?>);
   @override
-  bool get hasCalledExit => (super.noSuchMethod(
-        Invocation.getter(#hasCalledExit),
-        returnValue: false,
-      ) as bool);
+  _i11.Future<int> get maxFee => (super.noSuchMethod(
+        Invocation.getter(#maxFee),
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
   @override
-  _i16.Future<_i3.FeeObject> get fees => (super.noSuchMethod(
+  _i11.Future<_i3.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i16.Future<_i3.FeeObject>.value(_FakeFeeObject_1(
+        returnValue: _i11.Future<_i3.FeeObject>.value(_FakeFeeObject_1(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i16.Future<_i3.FeeObject>);
-  @override
-  _i16.Future<int> get maxFee => (super.noSuchMethod(
-        Invocation.getter(#maxFee),
-        returnValue: _i16.Future<int>.value(0),
-      ) as _i16.Future<int>);
-  @override
-  _i16.Future<List<String>> get mnemonic => (super.noSuchMethod(
-        Invocation.getter(#mnemonic),
-        returnValue: _i16.Future<List<String>>.value(<String>[]),
-      ) as _i16.Future<List<String>>);
-  @override
-  _i16.Future<String?> get mnemonicString => (super.noSuchMethod(
-        Invocation.getter(#mnemonicString),
-        returnValue: _i16.Future<String?>.value(),
-      ) as _i16.Future<String?>);
-  @override
-  _i16.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
-        Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i16.Future<String?>.value(),
-      ) as _i16.Future<String?>);
-  @override
-  _i16.Future<int> get chainHeight => (super.noSuchMethod(
-        Invocation.getter(#chainHeight),
-        returnValue: _i16.Future<int>.value(0),
-      ) as _i16.Future<int>);
-  @override
-  int get storedChainHeight => (super.noSuchMethod(
-        Invocation.getter(#storedChainHeight),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get shouldAutoSync => (super.noSuchMethod(
-        Invocation.getter(#shouldAutoSync),
-        returnValue: false,
-      ) as bool);
+      ) as _i11.Future<_i3.FeeObject>);
   @override
-  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
-        Invocation.setter(
-          #shouldAutoSync,
-          shouldAutoSync,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isRefreshing => (super.noSuchMethod(
-        Invocation.getter(#isRefreshing),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get isConnected => (super.noSuchMethod(
-        Invocation.getter(#isConnected),
-        returnValue: false,
-      ) as bool);
+  _i11.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+        Invocation.getter(#currentReceivingAddress),
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
+  _i11.Future<String> get currentChangeAddress => (super.noSuchMethod(
+        Invocation.getter(#currentChangeAddress),
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
   String get walletName => (super.noSuchMethod(
         Invocation.getter(#walletName),
@@ -382,6 +269,16 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  bool get isConnected => (super.noSuchMethod(
+        Invocation.getter(#isConnected),
+        returnValue: false,
+      ) as bool);
+  @override
   _i4.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
         returnValue: _FakeElectrumX_2(
@@ -398,6 +295,26 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i5.CachedElectrumX);
   @override
+  bool get isRefreshing => (super.noSuchMethod(
+        Invocation.getter(#isRefreshing),
+        returnValue: false,
+      ) as bool);
+  @override
+  bool get hasCalledExit => (super.noSuchMethod(
+        Invocation.getter(#hasCalledExit),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i11.Future<int> get chainHeight => (super.noSuchMethod(
+        Invocation.getter(#chainHeight),
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
+  @override
+  int get storedChainHeight => (super.noSuchMethod(
+        Invocation.getter(#storedChainHeight),
+        returnValue: 0,
+      ) as int);
+  @override
   _i6.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
         returnValue: _FakeBalance_4(
@@ -406,10 +323,29 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i6.Balance);
   @override
-  _i16.Future<String> get xpub => (super.noSuchMethod(
+  _i6.Balance get balancePrivate => (super.noSuchMethod(
+        Invocation.getter(#balancePrivate),
+        returnValue: _FakeBalance_4(
+          this,
+          Invocation.getter(#balancePrivate),
+        ),
+      ) as _i6.Balance);
+  @override
+  _i11.Future<List<_i13.UTXO>> get utxos => (super.noSuchMethod(
+        Invocation.getter(#utxos),
+        returnValue: _i11.Future<List<_i13.UTXO>>.value(<_i13.UTXO>[]),
+      ) as _i11.Future<List<_i13.UTXO>>);
+  @override
+  _i11.Future<List<_i13.Transaction>> get transactions => (super.noSuchMethod(
+        Invocation.getter(#transactions),
+        returnValue:
+            _i11.Future<List<_i13.Transaction>>.value(<_i13.Transaction>[]),
+      ) as _i11.Future<List<_i13.Transaction>>);
+  @override
+  _i11.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
   set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
       super.noSuchMethod(
@@ -428,95 +364,80 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i7.MainDB);
   @override
-  _i8.NetworkType get networkType => (super.noSuchMethod(
-        Invocation.getter(#networkType),
-        returnValue: _FakeNetworkType_6(
-          this,
-          Invocation.getter(#networkType),
-        ),
-      ) as _i8.NetworkType);
-  @override
-  _i16.Future<void> exit() => (super.noSuchMethod(
+  bool validateAddress(String? address) => (super.noSuchMethod(
         Invocation.method(
-          #exit,
-          [],
+          #validateAddress,
+          [address],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: false,
+      ) as bool);
   @override
-  _i18.DerivePathType addressType({required String? address}) =>
+  _i11.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
       (super.noSuchMethod(
         Invocation.method(
-          #addressType,
-          [],
-          {#address: address},
+          #updateSentCachedTxData,
+          [txData],
         ),
-        returnValue: _i18.DerivePathType.bip44,
-      ) as _i18.DerivePathType);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> recoverFromMnemonic({
-    required String? mnemonic,
-    String? mnemonicPassphrase,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required int? height,
-  }) =>
-      (super.noSuchMethod(
+  _i11.Future<bool> testNetworkConnection() => (super.noSuchMethod(
         Invocation.method(
-          #recoverFromMnemonic,
+          #testNetworkConnection,
           [],
-          {
-            #mnemonic: mnemonic,
-            #mnemonicPassphrase: mnemonicPassphrase,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #height: height,
-          },
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<bool>.value(false),
+      ) as _i11.Future<bool>);
   @override
-  _i16.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
-      (super.noSuchMethod(
+  void startNetworkAlivePinging() => super.noSuchMethod(
         Invocation.method(
-          #getTransactionCacheEarly,
-          [allAddresses],
+          #startNetworkAlivePinging,
+          [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValueForMissingStub: null,
+      );
   @override
-  _i16.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
+  void stopNetworkAlivePinging() => super.noSuchMethod(
         Invocation.method(
-          #refreshIfThereIsNewData,
+          #stopNetworkAlivePinging,
           [],
         ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
+        returnValueForMissingStub: null,
+      );
   @override
-  _i16.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
+  _i11.Future<Map<String, dynamic>> prepareSendPublic({
+    required String? address,
+    required _i8.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #getAllTxsToWatch,
+          #prepareSendPublic,
           [],
+          {
+            #address: address,
+            #amount: amount,
+            #args: args,
+          },
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue:
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<void> refresh() => (super.noSuchMethod(
+  _i11.Future<String> confirmSendPublic({dynamic txData}) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #refresh,
+          #confirmSendPublic,
           [],
+          {#txData: txData},
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  _i16.Future<Map<String, dynamic>> prepareSend({
+  _i11.Future<Map<String, dynamic>> prepareSend({
     required String? address,
-    required _i9.Amount? amount,
+    required _i8.Amount? amount,
     Map<String, dynamic>? args,
   }) =>
       (super.noSuchMethod(
@@ -530,253 +451,373 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+  _i11.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
       (super.noSuchMethod(
         Invocation.method(
           #confirmSend,
           [],
           {#txData: txData},
         ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  _i16.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+  int estimateTxFee({
+    required int? vSize,
+    required int? feeRatePerKB,
+  }) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #testNetworkConnection,
+          #estimateTxFee,
           [],
+          {
+            #vSize: vSize,
+            #feeRatePerKB: feeRatePerKB,
+          },
         ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
+        returnValue: 0,
+      ) as int);
   @override
-  void startNetworkAlivePinging() => super.noSuchMethod(
+  dynamic coinSelection(
+    int? satoshiAmountToSend,
+    int? selectedTxFeeRate,
+    String? _recipientAddress,
+    bool? isSendAll, {
+    int? additionalOutputs = 0,
+    List<_i13.UTXO>? utxos,
+  }) =>
+      super.noSuchMethod(Invocation.method(
+        #coinSelection,
+        [
+          satoshiAmountToSend,
+          selectedTxFeeRate,
+          _recipientAddress,
+          isSendAll,
+        ],
+        {
+          #additionalOutputs: additionalOutputs,
+          #utxos: utxos,
+        },
+      ));
+  @override
+  _i11.Future<List<_i14.SigningData>> fetchBuildTxData(
+          List<_i13.UTXO>? utxosToUse) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #startNetworkAlivePinging,
-          [],
+          #fetchBuildTxData,
+          [utxosToUse],
         ),
-        returnValueForMissingStub: null,
-      );
+        returnValue:
+            _i11.Future<List<_i14.SigningData>>.value(<_i14.SigningData>[]),
+      ) as _i11.Future<List<_i14.SigningData>>);
   @override
-  void stopNetworkAlivePinging() => super.noSuchMethod(
+  _i11.Future<Map<String, dynamic>> buildTransaction({
+    required List<_i14.SigningData>? utxoSigningData,
+    required List<String>? recipients,
+    required List<int>? satoshiAmounts,
+  }) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #stopNetworkAlivePinging,
+          #buildTransaction,
           [],
+          {
+            #utxoSigningData: utxoSigningData,
+            #recipients: recipients,
+            #satoshiAmounts: satoshiAmounts,
+          },
         ),
-        returnValueForMissingStub: null,
-      );
+        returnValue:
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<void> initializeNew() => (super.noSuchMethod(
+  _i11.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+        Invocation.method(
+          #updateNode,
+          [shouldRefresh],
+        ),
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  _i11.Future<void> initializeNew() => (super.noSuchMethod(
         Invocation.method(
           #initializeNew,
           [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> initializeExisting() => (super.noSuchMethod(
+  _i11.Future<void> initializeExisting() => (super.noSuchMethod(
         Invocation.method(
           #initializeExisting,
           [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
-      (super.noSuchMethod(
+  _i11.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
         Invocation.method(
-          #updateSentCachedTxData,
-          [txData],
+          #refreshIfThereIsNewData,
+          [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<bool>.value(false),
+      ) as _i11.Future<bool>);
   @override
-  bool validateAddress(String? address) => (super.noSuchMethod(
+  _i11.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
         Invocation.method(
-          #validateAddress,
-          [address],
+          #getAllTxsToWatch,
+          [],
         ),
-        returnValue: false,
-      ) as bool);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+  _i11.Future<void> refresh() => (super.noSuchMethod(
         Invocation.method(
-          #updateNode,
-          [shouldRefresh],
+          #refresh,
+          [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<_i4.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+  List<Map<dynamic, _i15.LelantusCoin>> getLelantusCoinMap() =>
+      (super.noSuchMethod(
         Invocation.method(
-          #getCurrentNode,
+          #getLelantusCoinMap,
           [],
         ),
-        returnValue: _i16.Future<_i4.ElectrumXNode>.value(_FakeElectrumXNode_7(
-          this,
-          Invocation.method(
-            #getCurrentNode,
-            [],
-          ),
-        )),
-      ) as _i16.Future<_i4.ElectrumXNode>);
+        returnValue: <Map<dynamic, _i15.LelantusCoin>>[],
+      ) as List<Map<dynamic, _i15.LelantusCoin>>);
   @override
-  _i16.Future<List<Map<String, dynamic>>> fastFetch(
-          List<String>? allTxHashes) =>
+  _i11.Future<void> anonymizeAllPublicFunds() => (super.noSuchMethod(
+        Invocation.method(
+          #anonymizeAllPublicFunds,
+          [],
+        ),
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  _i11.Future<List<Map<String, dynamic>>> createMintsFromAmount(int? total) =>
       (super.noSuchMethod(
         Invocation.method(
-          #fastFetch,
-          [allTxHashes],
+          #createMintsFromAmount,
+          [total],
         ),
-        returnValue: _i16.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i16.Future<List<Map<String, dynamic>>>);
+      ) as _i11.Future<List<Map<String, dynamic>>>);
+  @override
+  _i11.Future<String> submitHexToNetwork(String? hex) => (super.noSuchMethod(
+        Invocation.method(
+          #submitHexToNetwork,
+          [hex],
+        ),
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  _i16.Future<int> getTxCount({required String? address}) =>
+  _i11.Future<Map<String, dynamic>> buildMintTransaction(
+    List<_i13.UTXO>? utxosToUse,
+    int? satoshisPerRecipient,
+    List<Map<String, dynamic>>? mintsMap,
+  ) =>
       (super.noSuchMethod(
         Invocation.method(
-          #getTxCount,
-          [],
-          {#address: address},
+          #buildMintTransaction,
+          [
+            utxosToUse,
+            satoshisPerRecipient,
+            mintsMap,
+          ],
         ),
-        returnValue: _i16.Future<int>.value(0),
-      ) as _i16.Future<int>);
+        returnValue:
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<void> checkCurrentReceivingAddressesForTransactions() =>
+  _i11.Future<void> checkReceivingAddressForTransactions() =>
       (super.noSuchMethod(
         Invocation.method(
-          #checkCurrentReceivingAddressesForTransactions,
+          #checkReceivingAddressForTransactions,
           [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<void> checkCurrentChangeAddressesForTransactions() =>
-      (super.noSuchMethod(
+  _i11.Future<void> checkChangeAddressForTransactions() => (super.noSuchMethod(
         Invocation.method(
-          #checkCurrentChangeAddressesForTransactions,
+          #checkChangeAddressForTransactions,
           [],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  int estimateTxFee({
-    required int? vSize,
-    required int? feeRatePerKB,
+  _i11.Future<void> fullRescan(
+    int? maxUnusedAddressGap,
+    int? maxNumberOfIndexesToCheck,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fullRescan,
+          [
+            maxUnusedAddressGap,
+            maxNumberOfIndexesToCheck,
+          ],
+        ),
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  _i11.Future<void> recoverFromMnemonic({
+    required String? mnemonic,
+    String? mnemonicPassphrase,
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+    required int? height,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
-          #estimateTxFee,
+          #recoverFromMnemonic,
           [],
           {
-            #vSize: vSize,
-            #feeRatePerKB: feeRatePerKB,
+            #mnemonic: mnemonic,
+            #mnemonicPassphrase: mnemonicPassphrase,
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+            #height: height,
           },
         ),
-        returnValue: 0,
-      ) as int);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  dynamic coinSelection({
-    required int? satoshiAmountToSend,
-    required int? selectedTxFeeRate,
-    required String? recipientAddress,
-    required bool? coinControl,
-    required bool? isSendAll,
-    int? additionalOutputs = 0,
-    List<_i12.UTXO>? utxos,
-  }) =>
-      super.noSuchMethod(Invocation.method(
-        #coinSelection,
-        [],
-        {
-          #satoshiAmountToSend: satoshiAmountToSend,
-          #selectedTxFeeRate: selectedTxFeeRate,
-          #recipientAddress: recipientAddress,
-          #coinControl: coinControl,
-          #isSendAll: isSendAll,
-          #additionalOutputs: additionalOutputs,
-          #utxos: utxos,
-        },
-      ));
+  _i11.Future<Map<int, dynamic>> getSetDataMap(int? latestSetId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getSetDataMap,
+          [latestSetId],
+        ),
+        returnValue: _i11.Future<Map<int, dynamic>>.value(<int, dynamic>{}),
+      ) as _i11.Future<Map<int, dynamic>>);
   @override
-  _i16.Future<List<_i19.SigningData>> fetchBuildTxData(
-          List<_i12.UTXO>? utxosToUse) =>
+  _i11.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
       (super.noSuchMethod(
         Invocation.method(
-          #fetchBuildTxData,
-          [utxosToUse],
+          #getTransactionCacheEarly,
+          [allAddresses],
         ),
-        returnValue:
-            _i16.Future<List<_i19.SigningData>>.value(<_i19.SigningData>[]),
-      ) as _i16.Future<List<_i19.SigningData>>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i19.SigningData>? utxoSigningData,
-    required List<String>? recipients,
-    required List<int>? satoshiAmounts,
-  }) =>
+  _i11.Future<List<Map<String, dynamic>>> fetchAnonymitySets() =>
       (super.noSuchMethod(
         Invocation.method(
-          #buildTransaction,
+          #fetchAnonymitySets,
           [],
-          {
-            #utxoSigningData: utxoSigningData,
-            #recipients: recipients,
-            #satoshiAmounts: satoshiAmounts,
-          },
         ),
-        returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i11.Future<List<Map<String, dynamic>>>);
+  @override
+  _i11.Future<int> getLatestSetId() => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestSetId,
+          [],
+        ),
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
+  @override
+  _i11.Future<List<String>> getUsedCoinSerials() => (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+        ),
+        returnValue: _i11.Future<List<String>>.value(<String>[]),
+      ) as _i11.Future<List<String>>);
+  @override
+  _i11.Future<void> exit() => (super.noSuchMethod(
+        Invocation.method(
+          #exit,
+          [],
+        ),
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  _i11.Future<dynamic> getCoinsToJoinSplit(int? required) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getCoinsToJoinSplit,
+          [required],
+        ),
+        returnValue: _i11.Future<dynamic>.value(),
+      ) as _i11.Future<dynamic>);
+  @override
+  _i11.Future<int> estimateJoinSplitFee(int? spendAmount) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateJoinSplitFee,
+          [spendAmount],
+        ),
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
   @override
-  _i16.Future<void> fullRescan(
-    int? maxUnusedAddressGap,
-    int? maxNumberOfIndexesToCheck,
+  _i11.Future<_i8.Amount> estimateFeeFor(
+    _i8.Amount? amount,
+    int? feeRate,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
-          #fullRescan,
+          #estimateFeeFor,
           [
-            maxUnusedAddressGap,
-            maxNumberOfIndexesToCheck,
+            amount,
+            feeRate,
           ],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<_i8.Amount>.value(_FakeAmount_6(
+          this,
+          Invocation.method(
+            #estimateFeeFor,
+            [
+              amount,
+              feeRate,
+            ],
+          ),
+        )),
+      ) as _i11.Future<_i8.Amount>);
   @override
-  _i16.Future<_i9.Amount> estimateFeeFor(
-    _i9.Amount? amount,
+  _i11.Future<_i8.Amount> estimateFeeForPublic(
+    _i8.Amount? amount,
     int? feeRate,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
-          #estimateFeeFor,
+          #estimateFeeForPublic,
           [
             amount,
             feeRate,
           ],
         ),
-        returnValue: _i16.Future<_i9.Amount>.value(_FakeAmount_8(
+        returnValue: _i11.Future<_i8.Amount>.value(_FakeAmount_6(
           this,
           Invocation.method(
-            #estimateFeeFor,
+            #estimateFeeForPublic,
             [
               amount,
               feeRate,
             ],
           ),
         )),
-      ) as _i16.Future<_i9.Amount>);
+      ) as _i11.Future<_i8.Amount>);
   @override
-  _i9.Amount roughFeeEstimate(
+  _i8.Amount roughFeeEstimate(
     int? inputCount,
     int? outputCount,
     int? feeRatePerKB,
@@ -790,7 +831,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
             feeRatePerKB,
           ],
         ),
-        returnValue: _FakeAmount_8(
+        returnValue: _FakeAmount_6(
           this,
           Invocation.method(
             #roughFeeEstimate,
@@ -801,33 +842,90 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
             ],
           ),
         ),
-      ) as _i9.Amount);
+      ) as _i8.Amount);
   @override
-  _i16.Future<_i9.Amount> sweepAllEstimate(int? feeRate) => (super.noSuchMethod(
+  _i11.Future<_i8.Amount> sweepAllEstimate(int? feeRate) => (super.noSuchMethod(
         Invocation.method(
           #sweepAllEstimate,
           [feeRate],
         ),
-        returnValue: _i16.Future<_i9.Amount>.value(_FakeAmount_8(
+        returnValue: _i11.Future<_i8.Amount>.value(_FakeAmount_6(
           this,
           Invocation.method(
             #sweepAllEstimate,
             [feeRate],
           ),
         )),
-      ) as _i16.Future<_i9.Amount>);
+      ) as _i11.Future<_i8.Amount>);
+  @override
+  _i11.Future<List<Map<String, dynamic>>> fastFetch(
+          List<String>? allTxHashes) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fastFetch,
+          [allTxHashes],
+        ),
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i11.Future<List<Map<String, dynamic>>>);
+  @override
+  _i11.Future<Map<_i13.Address, _i13.Transaction>> getJMintTransactions(
+    _i5.CachedElectrumX? cachedClient,
+    List<String>? transactions,
+    _i12.Coin? coin,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getJMintTransactions,
+          [
+            cachedClient,
+            transactions,
+            coin,
+          ],
+        ),
+        returnValue: _i11.Future<Map<_i13.Address, _i13.Transaction>>.value(
+            <_i13.Address, _i13.Transaction>{}),
+      ) as _i11.Future<Map<_i13.Address, _i13.Transaction>>);
   @override
-  _i16.Future<bool> generateNewAddress() => (super.noSuchMethod(
+  _i11.Future<bool> generateNewAddress() => (super.noSuchMethod(
         Invocation.method(
           #generateNewAddress,
           [],
         ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
+        returnValue: _i11.Future<bool>.value(false),
+      ) as _i11.Future<bool>);
+  @override
+  _i8.Amount availablePrivateBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #availablePrivateBalance,
+          [],
+        ),
+        returnValue: _FakeAmount_6(
+          this,
+          Invocation.method(
+            #availablePrivateBalance,
+            [],
+          ),
+        ),
+      ) as _i8.Amount);
+  @override
+  _i8.Amount availablePublicBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #availablePublicBalance,
+          [],
+        ),
+        returnValue: _FakeAmount_6(
+          this,
+          Invocation.method(
+            #availablePublicBalance,
+            [],
+          ),
+        ),
+      ) as _i8.Amount);
   @override
   void initCache(
     String? walletId,
-    _i17.Coin? coin,
+    _i12.Coin? coin,
   ) =>
       super.noSuchMethod(
         Invocation.method(
@@ -840,14 +938,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i16.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
+  _i11.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
         Invocation.method(
           #updateCachedId,
           [id],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
   int getCachedChainHeight() => (super.noSuchMethod(
         Invocation.method(
@@ -857,14 +955,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValue: 0,
       ) as int);
   @override
-  _i16.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
+  _i11.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
         Invocation.method(
           #updateCachedChainHeight,
           [height],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
   bool getCachedIsFavorite() => (super.noSuchMethod(
         Invocation.method(
@@ -874,15 +972,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i16.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
+  _i11.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedIsFavorite,
           [isFavorite],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
   _i6.Balance getCachedBalance() => (super.noSuchMethod(
         Invocation.method(
@@ -898,15 +996,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i6.Balance);
   @override
-  _i16.Future<void> updateCachedBalance(_i6.Balance? balance) =>
+  _i11.Future<void> updateCachedBalance(_i6.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalance,
           [balance],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
   _i6.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
         Invocation.method(
@@ -922,510 +1020,88 @@ class MockBitcoinWallet extends _i1.Mock implements _i15.BitcoinWallet {
         ),
       ) as _i6.Balance);
   @override
-  _i16.Future<void> updateCachedBalanceSecondary(_i6.Balance? balance) =>
+  _i11.Future<void> updateCachedBalanceSecondary(_i6.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalanceSecondary,
           [balance],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
         Invocation.method(
-          #initWalletDB,
+          #getWalletTokenContractAddresses,
           [],
-          {#mockableOverride: mockableOverride},
         ),
-        returnValueForMissingStub: null,
-      );
+        returnValue: <String>[],
+      ) as List<String>);
   @override
-  _i16.Future<_i10.Tuple2<_i12.Transaction, _i12.Address>> parseTransaction(
-    Map<String, dynamic>? txData,
-    dynamic electrumxClient,
-    List<_i12.Address>? myAddresses,
-    _i17.Coin? coin,
-    int? minConfirms,
-    String? walletId,
-  ) =>
+  _i11.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
       (super.noSuchMethod(
         Invocation.method(
-          #parseTransaction,
-          [
-            txData,
-            electrumxClient,
-            myAddresses,
-            coin,
-            minConfirms,
-            walletId,
-          ],
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
         ),
-        returnValue:
-            _i16.Future<_i10.Tuple2<_i12.Transaction, _i12.Address>>.value(
-                _FakeTuple2_9<_i12.Transaction, _i12.Address>(
-          this,
-          Invocation.method(
-            #parseTransaction,
-            [
-              txData,
-              electrumxClient,
-              myAddresses,
-              coin,
-              minConfirms,
-              walletId,
-            ],
-          ),
-        )),
-      ) as _i16.Future<_i10.Tuple2<_i12.Transaction, _i12.Address>>);
-  @override
-  void initPaynymWalletInterface({
-    required String? walletId,
-    required String? walletName,
-    required _i8.NetworkType? network,
-    required _i17.Coin? coin,
-    required _i7.MainDB? db,
-    required _i4.ElectrumX? electrumXClient,
-    required _i20.SecureStorageInterface? secureStorage,
-    required int? dustLimit,
-    required int? dustLimitP2PKH,
-    required int? minConfirms,
-    required _i16.Future<String?> Function()? getMnemonicString,
-    required _i16.Future<String?> Function()? getMnemonicPassphrase,
-    required _i16.Future<int> Function()? getChainHeight,
-    required _i16.Future<String> Function()? getCurrentChangeAddress,
-    required int Function({
-      required int feeRatePerKB,
-      required int vSize,
-    })?
-        estimateTxFee,
-    required _i16.Future<Map<String, dynamic>> Function({
-      required String address,
-      required _i9.Amount amount,
-      Map<String, dynamic>? args,
-    })?
-        prepareSend,
-    required _i16.Future<int> Function({required String address})? getTxCount,
-    required _i16.Future<List<_i19.SigningData>> Function(List<_i12.UTXO>)?
-        fetchBuildTxData,
-    required _i16.Future<void> Function()? refresh,
-    required _i16.Future<void> Function()? checkChangeAddressForTransactions,
-  }) =>
-      super.noSuchMethod(
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
+  @override
+  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
-          #initPaynymWalletInterface,
+          #initWalletDB,
           [],
-          {
-            #walletId: walletId,
-            #walletName: walletName,
-            #network: network,
-            #coin: coin,
-            #db: db,
-            #electrumXClient: electrumXClient,
-            #secureStorage: secureStorage,
-            #dustLimit: dustLimit,
-            #dustLimitP2PKH: dustLimitP2PKH,
-            #minConfirms: minConfirms,
-            #getMnemonicString: getMnemonicString,
-            #getMnemonicPassphrase: getMnemonicPassphrase,
-            #getChainHeight: getChainHeight,
-            #getCurrentChangeAddress: getCurrentChangeAddress,
-            #estimateTxFee: estimateTxFee,
-            #prepareSend: prepareSend,
-            #getTxCount: getTxCount,
-            #fetchBuildTxData: fetchBuildTxData,
-            #refresh: refresh,
-            #checkChangeAddressForTransactions:
-                checkChangeAddressForTransactions,
-          },
+          {#mockableOverride: mockableOverride},
         ),
         returnValueForMissingStub: null,
       );
   @override
-  _i16.Future<_i11.BIP32> getBip47BaseNode() => (super.noSuchMethod(
-        Invocation.method(
-          #getBip47BaseNode,
-          [],
-        ),
-        returnValue: _i16.Future<_i11.BIP32>.value(_FakeBIP32_10(
-          this,
-          Invocation.method(
-            #getBip47BaseNode,
-            [],
-          ),
-        )),
-      ) as _i16.Future<_i11.BIP32>);
-  @override
-  _i16.Future<_i21.Uint8List> getPrivateKeyForPaynymReceivingAddress({
-    required String? paymentCodeString,
-    required int? index,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getPrivateKeyForPaynymReceivingAddress,
-          [],
-          {
-            #paymentCodeString: paymentCodeString,
-            #index: index,
-          },
-        ),
-        returnValue: _i16.Future<_i21.Uint8List>.value(_i21.Uint8List(0)),
-      ) as _i16.Future<_i21.Uint8List>);
-  @override
-  _i16.Future<_i12.Address> currentReceivingPaynymAddress({
-    required _i13.PaymentCode? sender,
-    required bool? isSegwit,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #currentReceivingPaynymAddress,
-          [],
-          {
-            #sender: sender,
-            #isSegwit: isSegwit,
-          },
-        ),
-        returnValue: _i16.Future<_i12.Address>.value(_FakeAddress_11(
-          this,
-          Invocation.method(
-            #currentReceivingPaynymAddress,
-            [],
-            {
-              #sender: sender,
-              #isSegwit: isSegwit,
-            },
-          ),
-        )),
-      ) as _i16.Future<_i12.Address>);
-  @override
-  _i16.Future<void> checkCurrentPaynymReceivingAddressForTransactions({
-    required _i13.PaymentCode? sender,
-    required bool? isSegwit,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkCurrentPaynymReceivingAddressForTransactions,
-          [],
-          {
-            #sender: sender,
-            #isSegwit: isSegwit,
-          },
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<void> checkAllCurrentReceivingPaynymAddressesForTransactions() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkAllCurrentReceivingPaynymAddressesForTransactions,
-          [],
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<_i11.BIP32> deriveNotificationBip32Node() => (super.noSuchMethod(
-        Invocation.method(
-          #deriveNotificationBip32Node,
-          [],
-        ),
-        returnValue: _i16.Future<_i11.BIP32>.value(_FakeBIP32_10(
-          this,
-          Invocation.method(
-            #deriveNotificationBip32Node,
-            [],
-          ),
-        )),
-      ) as _i16.Future<_i11.BIP32>);
-  @override
-  _i16.Future<_i13.PaymentCode> getPaymentCode({required bool? isSegwit}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getPaymentCode,
-          [],
-          {#isSegwit: isSegwit},
-        ),
-        returnValue: _i16.Future<_i13.PaymentCode>.value(_FakePaymentCode_12(
-          this,
-          Invocation.method(
-            #getPaymentCode,
-            [],
-            {#isSegwit: isSegwit},
-          ),
-        )),
-      ) as _i16.Future<_i13.PaymentCode>);
-  @override
-  _i16.Future<_i21.Uint8List> signWithNotificationKey(_i21.Uint8List? data) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #signWithNotificationKey,
-          [data],
-        ),
-        returnValue: _i16.Future<_i21.Uint8List>.value(_i21.Uint8List(0)),
-      ) as _i16.Future<_i21.Uint8List>);
-  @override
-  _i16.Future<String> signStringWithNotificationKey(String? data) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #signStringWithNotificationKey,
-          [data],
-        ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
-  @override
-  _i16.Future<Map<String, dynamic>> preparePaymentCodeSend({
-    required _i13.PaymentCode? paymentCode,
-    required bool? isSegwit,
-    required _i9.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #preparePaymentCodeSend,
-          [],
-          {
-            #paymentCode: paymentCode,
-            #isSegwit: isSegwit,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
-  @override
-  _i16.Future<_i12.Address> nextUnusedSendAddressFrom({
-    required _i13.PaymentCode? pCode,
-    required bool? isSegwit,
-    required _i11.BIP32? privateKeyNode,
-    int? startIndex = 0,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #nextUnusedSendAddressFrom,
-          [],
-          {
-            #pCode: pCode,
-            #isSegwit: isSegwit,
-            #privateKeyNode: privateKeyNode,
-            #startIndex: startIndex,
-          },
-        ),
-        returnValue: _i16.Future<_i12.Address>.value(_FakeAddress_11(
-          this,
-          Invocation.method(
-            #nextUnusedSendAddressFrom,
-            [],
-            {
-              #pCode: pCode,
-              #isSegwit: isSegwit,
-              #privateKeyNode: privateKeyNode,
-              #startIndex: startIndex,
-            },
-          ),
-        )),
-      ) as _i16.Future<_i12.Address>);
-  @override
-  _i16.Future<Map<String, dynamic>> prepareNotificationTx({
-    required int? selectedTxFeeRate,
-    required String? targetPaymentCodeString,
-    int? additionalOutputs = 0,
-    List<_i12.UTXO>? utxos,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareNotificationTx,
-          [],
-          {
-            #selectedTxFeeRate: selectedTxFeeRate,
-            #targetPaymentCodeString: targetPaymentCodeString,
-            #additionalOutputs: additionalOutputs,
-            #utxos: utxos,
-          },
-        ),
-        returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
-  @override
-  _i16.Future<String> broadcastNotificationTx(
-          {required Map<String, dynamic>? preparedTx}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #broadcastNotificationTx,
-          [],
-          {#preparedTx: preparedTx},
-        ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
-  @override
-  _i16.Future<bool> hasConnected(String? paymentCodeString) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #hasConnected,
-          [paymentCodeString],
-        ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
-  @override
-  _i16.Future<_i13.PaymentCode?> unBlindedPaymentCodeFromTransaction(
-          {required _i12.Transaction? transaction}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #unBlindedPaymentCodeFromTransaction,
-          [],
-          {#transaction: transaction},
-        ),
-        returnValue: _i16.Future<_i13.PaymentCode?>.value(),
-      ) as _i16.Future<_i13.PaymentCode?>);
-  @override
-  _i16.Future<_i13.PaymentCode?> unBlindedPaymentCodeFromTransactionBad(
-          {required _i12.Transaction? transaction}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #unBlindedPaymentCodeFromTransactionBad,
-          [],
-          {#transaction: transaction},
-        ),
-        returnValue: _i16.Future<_i13.PaymentCode?>.value(),
-      ) as _i16.Future<_i13.PaymentCode?>);
-  @override
-  _i16.Future<List<_i13.PaymentCode>>
-      getAllPaymentCodesFromNotificationTransactions() => (super.noSuchMethod(
-            Invocation.method(
-              #getAllPaymentCodesFromNotificationTransactions,
-              [],
-            ),
-            returnValue:
-                _i16.Future<List<_i13.PaymentCode>>.value(<_i13.PaymentCode>[]),
-          ) as _i16.Future<List<_i13.PaymentCode>>);
-  @override
-  _i16.Future<void> checkForNotificationTransactionsTo(
-          Set<String>? otherCodeStrings) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkForNotificationTransactionsTo,
-          [otherCodeStrings],
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<void> restoreAllHistory({
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required Set<String>? paymentCodeStrings,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #restoreAllHistory,
-          [],
-          {
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #paymentCodeStrings: paymentCodeStrings,
-          },
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<void> restoreHistoryWith({
-    required _i13.PaymentCode? other,
-    required bool? checkSegwitAsWell,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #restoreHistoryWith,
-          [],
-          {
-            #other: other,
-            #checkSegwitAsWell: checkSegwitAsWell,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-          },
-        ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
-  @override
-  _i16.Future<_i12.Address> getMyNotificationAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #getMyNotificationAddress,
-          [],
-        ),
-        returnValue: _i16.Future<_i12.Address>.value(_FakeAddress_11(
-          this,
-          Invocation.method(
-            #getMyNotificationAddress,
-            [],
-          ),
-        )),
-      ) as _i16.Future<_i12.Address>);
-  @override
-  _i16.Future<List<String>> lookupKey(String? paymentCodeString) =>
-      (super.noSuchMethod(
+  void initFiroHive(String? walletId) => super.noSuchMethod(
         Invocation.method(
-          #lookupKey,
-          [paymentCodeString],
+          #initFiroHive,
+          [walletId],
         ),
-        returnValue: _i16.Future<List<String>>.value(<String>[]),
-      ) as _i16.Future<List<String>>);
+        returnValueForMissingStub: null,
+      );
   @override
-  _i16.Future<String?> paymentCodeStringByKey(String? key) =>
+  _i11.Future<void> firoUpdateJIndex(List<dynamic>? jIndex) =>
       (super.noSuchMethod(
         Invocation.method(
-          #paymentCodeStringByKey,
-          [key],
+          #firoUpdateJIndex,
+          [jIndex],
         ),
-        returnValue: _i16.Future<String?>.value(),
-      ) as _i16.Future<String?>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  _i16.Future<String> storeCode(String? paymentCodeString) =>
+  _i11.Future<void> firoUpdateLelantusCoins(List<dynamic>? lelantusCoins) =>
       (super.noSuchMethod(
         Invocation.method(
-          #storeCode,
-          [paymentCodeString],
+          #firoUpdateLelantusCoins,
+          [lelantusCoins],
         ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
   @override
-  void initCoinControlInterface({
-    required String? walletId,
-    required String? walletName,
-    required _i17.Coin? coin,
-    required _i7.MainDB? db,
-    required _i16.Future<int> Function()? getChainHeight,
-    required _i16.Future<void> Function(_i6.Balance)? refreshedBalanceCallback,
-  }) =>
-      super.noSuchMethod(
+  int firoGetMintIndex() => (super.noSuchMethod(
         Invocation.method(
-          #initCoinControlInterface,
+          #firoGetMintIndex,
           [],
-          {
-            #walletId: walletId,
-            #walletName: walletName,
-            #coin: coin,
-            #db: db,
-            #getChainHeight: getChainHeight,
-            #refreshedBalanceCallback: refreshedBalanceCallback,
-          },
         ),
-        returnValueForMissingStub: null,
-      );
+        returnValue: 0,
+      ) as int);
   @override
-  _i16.Future<void> refreshBalance({bool? notify = false}) =>
-      (super.noSuchMethod(
+  _i11.Future<void> firoUpdateMintIndex(int? mintIndex) => (super.noSuchMethod(
         Invocation.method(
-          #refreshBalance,
-          [],
-          {#notify: notify},
+          #firoUpdateMintIndex,
+          [mintIndex],
         ),
-        returnValue: _i16.Future<void>.value(),
-        returnValueForMissingStub: _i16.Future<void>.value(),
-      ) as _i16.Future<void>);
+        returnValue: _i11.Future<void>.value(),
+        returnValueForMissingStub: _i11.Future<void>.value(),
+      ) as _i11.Future<void>);
 }
 
 /// A class which mocks [ElectrumX].
@@ -1473,7 +1149,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
         returnValue: false,
       ) as bool);
   @override
-  _i16.Future<dynamic> request({
+  _i11.Future<dynamic> request({
     required String? command,
     List<dynamic>? args = const [],
     Duration? connectionTimeout = const Duration(seconds: 60),
@@ -1492,10 +1168,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retries: retries,
           },
         ),
-        returnValue: _i16.Future<dynamic>.value(),
-      ) as _i16.Future<dynamic>);
+        returnValue: _i11.Future<dynamic>.value(),
+      ) as _i11.Future<dynamic>);
   @override
-  _i16.Future<List<Map<String, dynamic>>> batchRequest({
+  _i11.Future<List<Map<String, dynamic>>> batchRequest({
     required String? command,
     required Map<String, List<dynamic>>? args,
     Duration? connectionTimeout = const Duration(seconds: 60),
@@ -1512,11 +1188,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retries: retries,
           },
         ),
-        returnValue: _i16.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i16.Future<List<Map<String, dynamic>>>);
+      ) as _i11.Future<List<Map<String, dynamic>>>);
   @override
-  _i16.Future<bool> ping({
+  _i11.Future<bool> ping({
     String? requestID,
     int? retryCount = 1,
   }) =>
@@ -1529,10 +1205,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #retryCount: retryCount,
           },
         ),
-        returnValue: _i16.Future<bool>.value(false),
-      ) as _i16.Future<bool>);
+        returnValue: _i11.Future<bool>.value(false),
+      ) as _i11.Future<bool>);
   @override
-  _i16.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+  _i11.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getBlockHeadTip,
@@ -1540,10 +1216,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+  _i11.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getServerFeatures,
@@ -1551,10 +1227,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<String> broadcastTransaction({
+  _i11.Future<String> broadcastTransaction({
     required String? rawTx,
     String? requestID,
   }) =>
@@ -1567,10 +1243,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i16.Future<String>.value(''),
-      ) as _i16.Future<String>);
+        returnValue: _i11.Future<String>.value(''),
+      ) as _i11.Future<String>);
   @override
-  _i16.Future<Map<String, dynamic>> getBalance({
+  _i11.Future<Map<String, dynamic>> getBalance({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -1584,10 +1260,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<List<Map<String, dynamic>>> getHistory({
+  _i11.Future<List<Map<String, dynamic>>> getHistory({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -1600,11 +1276,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i16.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i16.Future<List<Map<String, dynamic>>>);
+      ) as _i11.Future<List<Map<String, dynamic>>>);
   @override
-  _i16.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+  _i11.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
           {required Map<String, List<dynamic>>? args}) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1612,11 +1288,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           [],
           {#args: args},
         ),
-        returnValue: _i16.Future<Map<String, List<Map<String, dynamic>>>>.value(
+        returnValue: _i11.Future<Map<String, List<Map<String, dynamic>>>>.value(
             <String, List<Map<String, dynamic>>>{}),
-      ) as _i16.Future<Map<String, List<Map<String, dynamic>>>>);
+      ) as _i11.Future<Map<String, List<Map<String, dynamic>>>>);
   @override
-  _i16.Future<List<Map<String, dynamic>>> getUTXOs({
+  _i11.Future<List<Map<String, dynamic>>> getUTXOs({
     required String? scripthash,
     String? requestID,
   }) =>
@@ -1629,11 +1305,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i16.Future<List<Map<String, dynamic>>>.value(
+        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
             <Map<String, dynamic>>[]),
-      ) as _i16.Future<List<Map<String, dynamic>>>);
+      ) as _i11.Future<List<Map<String, dynamic>>>);
   @override
-  _i16.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+  _i11.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
           {required Map<String, List<dynamic>>? args}) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1641,11 +1317,11 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           [],
           {#args: args},
         ),
-        returnValue: _i16.Future<Map<String, List<Map<String, dynamic>>>>.value(
+        returnValue: _i11.Future<Map<String, List<Map<String, dynamic>>>>.value(
             <String, List<Map<String, dynamic>>>{}),
-      ) as _i16.Future<Map<String, List<Map<String, dynamic>>>>);
+      ) as _i11.Future<Map<String, List<Map<String, dynamic>>>>);
   @override
-  _i16.Future<Map<String, dynamic>> getTransaction({
+  _i11.Future<Map<String, dynamic>> getTransaction({
     required String? txHash,
     bool? verbose = true,
     String? requestID,
@@ -1661,10 +1337,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<Map<String, dynamic>> getAnonymitySet({
+  _i11.Future<Map<String, dynamic>> getAnonymitySet({
     String? groupId = r'1',
     String? blockhash = r'',
     String? requestID,
@@ -1680,10 +1356,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<dynamic> getMintData({
+  _i11.Future<dynamic> getMintData({
     dynamic mints,
     String? requestID,
   }) =>
@@ -1696,10 +1372,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #requestID: requestID,
           },
         ),
-        returnValue: _i16.Future<dynamic>.value(),
-      ) as _i16.Future<dynamic>);
+        returnValue: _i11.Future<dynamic>.value(),
+      ) as _i11.Future<dynamic>);
   @override
-  _i16.Future<Map<String, dynamic>> getUsedCoinSerials({
+  _i11.Future<Map<String, dynamic>> getUsedCoinSerials({
     String? requestID,
     required int? startNumber,
   }) =>
@@ -1713,19 +1389,19 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           },
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+  _i11.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
         Invocation.method(
           #getLatestCoinId,
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i16.Future<int>.value(0),
-      ) as _i16.Future<int>);
+        returnValue: _i11.Future<int>.value(0),
+      ) as _i11.Future<int>);
   @override
-  _i16.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+  _i11.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getFeeRate,
@@ -1733,10 +1409,10 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
           {#requestID: requestID},
         ),
         returnValue:
-            _i16.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i16.Future<Map<String, dynamic>>);
+            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i11.Future<Map<String, dynamic>>);
   @override
-  _i16.Future<_i14.Decimal> estimateFee({
+  _i11.Future<_i9.Decimal> estimateFee({
     String? requestID,
     required int? blocks,
   }) =>
@@ -1749,7 +1425,7 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             #blocks: blocks,
           },
         ),
-        returnValue: _i16.Future<_i14.Decimal>.value(_FakeDecimal_13(
+        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_7(
           this,
           Invocation.method(
             #estimateFee,
@@ -1760,16 +1436,15 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             },
           ),
         )),
-      ) as _i16.Future<_i14.Decimal>);
+      ) as _i11.Future<_i9.Decimal>);
   @override
-  _i16.Future<_i14.Decimal> relayFee({String? requestID}) =>
-      (super.noSuchMethod(
+  _i11.Future<_i9.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
         Invocation.method(
           #relayFee,
           [],
           {#requestID: requestID},
         ),
-        returnValue: _i16.Future<_i14.Decimal>.value(_FakeDecimal_13(
+        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_7(
           this,
           Invocation.method(
             #relayFee,
@@ -1777,5 +1452,5 @@ class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
             {#requestID: requestID},
           ),
         )),
-      ) as _i16.Future<_i14.Decimal>);
+      ) as _i11.Future<_i9.Decimal>);
 }
diff --git a/test/services/coins/namecoin/namecoin_wallet_test.mocks.dart b/test/services/coins/namecoin/namecoin_wallet_test.mocks.dart
new file mode 100644
index 000000000..ec242c79c
--- /dev/null
+++ b/test/services/coins/namecoin/namecoin_wallet_test.mocks.dart
@@ -0,0 +1,564 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/namecoin/namecoin_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+  @override
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i6.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i6.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
+  @override
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i7.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
diff --git a/test/services/coins/particl/particl_wallet_test.mocks.dart b/test/services/coins/particl/particl_wallet_test.mocks.dart
new file mode 100644
index 000000000..e4677cc8e
--- /dev/null
+++ b/test/services/coins/particl/particl_wallet_test.mocks.dart
@@ -0,0 +1,564 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/services/coins/particl/particl_wallet_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i4;
+
+import 'package:decimal/decimal.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeDecimal_0 extends _i1.SmartFake implements _i2.Decimal {
+  _FakeDecimal_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_1 extends _i1.SmartFake implements _i3.ElectrumX {
+  _FakeElectrumX_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockElectrumX extends _i1.Mock implements _i3.ElectrumX {
+  MockElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set failovers(List<_i3.ElectrumXNode>? _failovers) => super.noSuchMethod(
+        Invocation.setter(
+          #failovers,
+          _failovers,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentFailoverIndex => (super.noSuchMethod(
+        Invocation.getter(#currentFailoverIndex),
+        returnValue: 0,
+      ) as int);
+  @override
+  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
+        Invocation.setter(
+          #currentFailoverIndex,
+          _currentFailoverIndex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get host => (super.noSuchMethod(
+        Invocation.getter(#host),
+        returnValue: '',
+      ) as String);
+  @override
+  int get port => (super.noSuchMethod(
+        Invocation.getter(#port),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get useSSL => (super.noSuchMethod(
+        Invocation.getter(#useSSL),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<dynamic> request({
+    required String? command,
+    List<dynamic>? args = const [],
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    String? requestID,
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #request,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #requestID: requestID,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> batchRequest({
+    required String? command,
+    required Map<String, List<dynamic>>? args,
+    Duration? connectionTimeout = const Duration(seconds: 60),
+    int? retries = 2,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #batchRequest,
+          [],
+          {
+            #command: command,
+            #args: args,
+            #connectionTimeout: connectionTimeout,
+            #retries: retries,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<bool> ping({
+    String? requestID,
+    int? retryCount = 1,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #ping,
+          [],
+          {
+            #requestID: requestID,
+            #retryCount: retryCount,
+          },
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBlockHeadTip,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getServerFeatures,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<String> broadcastTransaction({
+    required String? rawTx,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastTransaction,
+          [],
+          {
+            #rawTx: rawTx,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
+  @override
+  _i4.Future<Map<String, dynamic>> getBalance({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBalance,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getHistory({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getHistory,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchHistory,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<List<Map<String, dynamic>>> getUTXOs({
+    required String? scripthash,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUTXOs,
+          [],
+          {
+            #scripthash: scripthash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i4.Future<List<Map<String, dynamic>>>);
+  @override
+  _i4.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
+          {required Map<String, List<dynamic>>? args}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getBatchUTXOs,
+          [],
+          {#args: args},
+        ),
+        returnValue: _i4.Future<Map<String, List<Map<String, dynamic>>>>.value(
+            <String, List<Map<String, dynamic>>>{}),
+      ) as _i4.Future<Map<String, List<Map<String, dynamic>>>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    bool? verbose = true,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #verbose: verbose,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    String? groupId = r'1',
+    String? blockhash = r'',
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #requestID: requestID,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<dynamic> getMintData({
+    dynamic mints,
+    String? requestID,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getMintData,
+          [],
+          {
+            #mints: mints,
+            #requestID: requestID,
+          },
+        ),
+        returnValue: _i4.Future<dynamic>.value(),
+      ) as _i4.Future<dynamic>);
+  @override
+  _i4.Future<Map<String, dynamic>> getUsedCoinSerials({
+    String? requestID,
+    required int? startNumber,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #requestID: requestID,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestCoinId,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getFeeRate,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<_i2.Decimal> estimateFee({
+    String? requestID,
+    required int? blocks,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFee,
+          [],
+          {
+            #requestID: requestID,
+            #blocks: blocks,
+          },
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #estimateFee,
+            [],
+            {
+              #requestID: requestID,
+              #blocks: blocks,
+            },
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+  @override
+  _i4.Future<_i2.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
+        Invocation.method(
+          #relayFee,
+          [],
+          {#requestID: requestID},
+        ),
+        returnValue: _i4.Future<_i2.Decimal>.value(_FakeDecimal_0(
+          this,
+          Invocation.method(
+            #relayFee,
+            [],
+            {#requestID: requestID},
+          ),
+        )),
+      ) as _i4.Future<_i2.Decimal>);
+}
+
+/// A class which mocks [CachedElectrumX].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCachedElectrumX extends _i1.Mock implements _i5.CachedElectrumX {
+  MockCachedElectrumX() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i3.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_1(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i3.ElectrumX);
+  @override
+  _i4.Future<Map<String, dynamic>> getAnonymitySet({
+    required String? groupId,
+    String? blockhash = r'',
+    required _i6.Coin? coin,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAnonymitySet,
+          [],
+          {
+            #groupId: groupId,
+            #blockhash: blockhash,
+            #coin: coin,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  String base64ToHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  String base64ToReverseHex(String? source) => (super.noSuchMethod(
+        Invocation.method(
+          #base64ToReverseHex,
+          [source],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  _i4.Future<Map<String, dynamic>> getTransaction({
+    required String? txHash,
+    required _i6.Coin? coin,
+    bool? verbose = true,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransaction,
+          [],
+          {
+            #txHash: txHash,
+            #coin: coin,
+            #verbose: verbose,
+          },
+        ),
+        returnValue:
+            _i4.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i4.Future<Map<String, dynamic>>);
+  @override
+  _i4.Future<List<String>> getUsedCoinSerials({
+    required _i6.Coin? coin,
+    int? startNumber = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+          {
+            #coin: coin,
+            #startNumber: startNumber,
+          },
+        ),
+        returnValue: _i4.Future<List<String>>.value(<String>[]),
+      ) as _i4.Future<List<String>>);
+  @override
+  _i4.Future<void> clearSharedTransactionCache({required _i6.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #clearSharedTransactionCache,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
+
+/// A class which mocks [TransactionNotificationTracker].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockTransactionNotificationTracker extends _i1.Mock
+    implements _i7.TransactionNotificationTracker {
+  MockTransactionNotificationTracker() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  List<String> get pendings => (super.noSuchMethod(
+        Invocation.getter(#pendings),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<String> get confirmeds => (super.noSuchMethod(
+        Invocation.getter(#confirmeds),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  bool wasNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedPending,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedPending(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedPending,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  bool wasNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #wasNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i4.Future<void> addNotifiedConfirmed(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #addNotifiedConfirmed,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> deleteTransaction(String? txid) => (super.noSuchMethod(
+        Invocation.method(
+          #deleteTransaction,
+          [txid],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+}
diff --git a/test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart b/test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart
new file mode 100644
index 000000000..59e02607b
--- /dev/null
+++ b/test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/custom_buttons/favorite_toggle_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/widget_tests/custom_loading_overlay_test.mocks.dart b/test/widget_tests/custom_loading_overlay_test.mocks.dart
new file mode 100644
index 000000000..f192714d8
--- /dev/null
+++ b/test/widget_tests/custom_loading_overlay_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/custom_loading_overlay_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/widget_tests/desktop/desktop_scaffold_test.mocks.dart b/test/widget_tests/desktop/desktop_scaffold_test.mocks.dart
new file mode 100644
index 000000000..5972c21c2
--- /dev/null
+++ b/test/widget_tests/desktop/desktop_scaffold_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/desktop/desktop_scaffold_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/widget_tests/managed_favorite_test.mocks.dart b/test/widget_tests/managed_favorite_test.mocks.dart
index 7b5cab81e..5bd694533 100644
--- a/test/widget_tests/managed_favorite_test.mocks.dart
+++ b/test/widget_tests/managed_favorite_test.mocks.dart
@@ -1,5 +1,5 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/widget_tests/managed_favorite_test.dart.
+// in stackwallet/test/widget_tests/managed_favorite_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
@@ -13,28 +13,31 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i12;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
-import 'package:stackduo/models/balance.dart' as _i11;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/node_model.dart' as _i31;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
-import 'package:stackduo/models/signing_data.dart' as _i28;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i26;
-import 'package:stackduo/services/coins/coin_service.dart' as _i20;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/locale_service.dart' as _i30;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
-import 'package:stackduo/services/wallets.dart' as _i21;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i14;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i27;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
+import 'package:stackwallet/db/isar/main_db.dart' as _i12;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i10;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i9;
+import 'package:stackwallet/models/balance.dart' as _i11;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i31;
+import 'package:stackwallet/models/node_model.dart' as _i33;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i8;
+import 'package:stackwallet/models/signing_data.dart' as _i28;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i26;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i20;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/locale_service.dart' as _i32;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/services/wallets.dart' as _i21;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i30;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i22;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i27;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
     as _i19;
-import 'package:stackduo/utilities/prefs.dart' as _i24;
+import 'package:stackwallet/utilities/prefs.dart' as _i24;
 import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
@@ -1439,6 +1442,25 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i23.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
   void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
@@ -1935,10 +1957,109 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
       ) as _i23.Future<void>);
 }
 
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i30.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i12.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_9(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i12.MainDB);
+  @override
+  List<_i31.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i31.StackTheme>[],
+      ) as List<_i31.StackTheme>);
+  @override
+  void init(_i12.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i23.Future<void> install({required _i29.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<bool>.value(false),
+      ) as _i23.Future<bool>);
+  @override
+  _i23.Future<List<_i30.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i23.Future<List<_i30.StackThemeMetaData>>.value(
+            <_i30.StackThemeMetaData>[]),
+      ) as _i23.Future<List<_i30.StackThemeMetaData>>);
+  @override
+  _i23.Future<_i29.Uint8List> fetchTheme(
+          {required _i30.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
+      ) as _i23.Future<_i29.Uint8List>);
+  @override
+  _i31.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i31.StackTheme?);
+}
+
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i30.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i32.LocaleService {
   MockLocaleService() {
     _i1.throwOnMissingStub(this);
   }
@@ -2010,15 +2131,15 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         ),
       ) as _i19.SecureStorageInterface);
   @override
-  List<_i31.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i33.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i31.NodeModel>[],
-      ) as List<_i31.NodeModel>);
+        returnValue: <_i33.NodeModel>[],
+      ) as List<_i33.NodeModel>);
   @override
-  List<_i31.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i33.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i31.NodeModel>[],
-      ) as List<_i31.NodeModel>);
+        returnValue: <_i33.NodeModel>[],
+      ) as List<_i33.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -2036,7 +2157,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
   @override
   _i23.Future<void> setPrimaryNodeFor({
     required _i22.Coin? coin,
-    required _i31.NodeModel? node,
+    required _i33.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -2053,40 +2174,40 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i31.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
+  _i33.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i31.NodeModel?);
+      )) as _i33.NodeModel?);
   @override
-  List<_i31.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
+  List<_i33.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i31.NodeModel>[],
-      ) as List<_i31.NodeModel>);
+        returnValue: <_i33.NodeModel>[],
+      ) as List<_i33.NodeModel>);
   @override
-  _i31.NodeModel? getNodeById({required String? id}) =>
+  _i33.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i31.NodeModel?);
+      )) as _i33.NodeModel?);
   @override
-  List<_i31.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
+  List<_i33.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i31.NodeModel>[],
-      ) as List<_i31.NodeModel>);
+        returnValue: <_i33.NodeModel>[],
+      ) as List<_i33.NodeModel>);
   @override
   _i23.Future<void> add(
-    _i31.NodeModel? node,
+    _i33.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2138,7 +2259,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
       ) as _i23.Future<void>);
   @override
   _i23.Future<void> edit(
-    _i31.NodeModel? editedNode,
+    _i33.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2349,6 +2470,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
diff --git a/test/widget_tests/table_view/table_view_row_test.mocks.dart b/test/widget_tests/table_view/table_view_row_test.mocks.dart
index 66646e6bc..d86e3d82d 100644
--- a/test/widget_tests/table_view/table_view_row_test.mocks.dart
+++ b/test/widget_tests/table_view/table_view_row_test.mocks.dart
@@ -1,10 +1,10 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/widget_tests/table_view/table_view_row_test.dart.
+// in stackwallet/test/widget_tests/table_view/table_view_row_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i22;
-import 'dart:typed_data' as _i29;
+import 'dart:typed_data' as _i27;
 import 'dart:ui' as _i24;
 
 import 'package:bip32/bip32.dart' as _i16;
@@ -13,26 +13,29 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i12;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
-import 'package:stackduo/models/balance.dart' as _i11;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
-import 'package:stackduo/models/signing_data.dart' as _i27;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i25;
-import 'package:stackduo/services/coins/coin_service.dart' as _i19;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
-import 'package:stackduo/services/wallets.dart' as _i20;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i14;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i21;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i26;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
-    as _i28;
-import 'package:stackduo/utilities/prefs.dart' as _i23;
+import 'package:stackwallet/db/isar/main_db.dart' as _i7;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i11;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i10;
+import 'package:stackwallet/models/balance.dart' as _i12;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i26;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i9;
+import 'package:stackwallet/models/signing_data.dart' as _i30;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i28;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i19;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i8;
+import 'package:stackwallet/services/wallets.dart' as _i20;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i25;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i21;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i29;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
+    as _i31;
+import 'package:stackwallet/utilities/prefs.dart' as _i23;
 import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
@@ -88,9 +91,8 @@ class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
         );
 }
 
-class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
-    implements _i7.TransactionNotificationTracker {
-  _FakeTransactionNotificationTracker_4(
+class _FakeMainDB_4 extends _i1.SmartFake implements _i7.MainDB {
+  _FakeMainDB_4(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -99,8 +101,9 @@ class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
         );
 }
 
-class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
-  _FakeFeeObject_5(
+class _FakeTransactionNotificationTracker_5 extends _i1.SmartFake
+    implements _i8.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_5(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -109,8 +112,8 @@ class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
         );
 }
 
-class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
-  _FakeElectrumX_6(
+class _FakeFeeObject_6 extends _i1.SmartFake implements _i9.FeeObject {
+  _FakeFeeObject_6(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -119,9 +122,8 @@ class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
         );
 }
 
-class _FakeCachedElectrumX_7 extends _i1.SmartFake
-    implements _i10.CachedElectrumX {
-  _FakeCachedElectrumX_7(
+class _FakeElectrumX_7 extends _i1.SmartFake implements _i10.ElectrumX {
+  _FakeElectrumX_7(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -130,8 +132,9 @@ class _FakeCachedElectrumX_7 extends _i1.SmartFake
         );
 }
 
-class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
-  _FakeBalance_8(
+class _FakeCachedElectrumX_8 extends _i1.SmartFake
+    implements _i11.CachedElectrumX {
+  _FakeCachedElectrumX_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -140,8 +143,8 @@ class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
         );
 }
 
-class _FakeMainDB_9 extends _i1.SmartFake implements _i12.MainDB {
-  _FakeMainDB_9(
+class _FakeBalance_9 extends _i1.SmartFake implements _i12.Balance {
+  _FakeBalance_9(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -160,7 +163,8 @@ class _FakeNetworkType_10 extends _i1.SmartFake implements _i13.NetworkType {
         );
 }
 
-class _FakeElectrumXNode_11 extends _i1.SmartFake implements _i9.ElectrumXNode {
+class _FakeElectrumXNode_11 extends _i1.SmartFake
+    implements _i10.ElectrumXNode {
   _FakeElectrumXNode_11(
     Object parent,
     Invocation parentInvocation,
@@ -674,10 +678,109 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
       );
 }
 
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i25.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i7.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_4(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i7.MainDB);
+  @override
+  List<_i26.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i26.StackTheme>[],
+      ) as List<_i26.StackTheme>);
+  @override
+  void init(_i7.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i22.Future<void> install({required _i27.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i22.Future<void>.value(),
+        returnValueForMissingStub: _i22.Future<void>.value(),
+      ) as _i22.Future<void>);
+  @override
+  _i22.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i22.Future<void>.value(),
+        returnValueForMissingStub: _i22.Future<void>.value(),
+      ) as _i22.Future<void>);
+  @override
+  _i22.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i22.Future<void>.value(),
+        returnValueForMissingStub: _i22.Future<void>.value(),
+      ) as _i22.Future<void>);
+  @override
+  _i22.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i22.Future<bool>.value(false),
+      ) as _i22.Future<bool>);
+  @override
+  _i22.Future<List<_i25.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i22.Future<List<_i25.StackThemeMetaData>>.value(
+            <_i25.StackThemeMetaData>[]),
+      ) as _i22.Future<List<_i25.StackThemeMetaData>>);
+  @override
+  _i22.Future<_i27.Uint8List> fetchTheme(
+          {required _i25.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i22.Future<_i27.Uint8List>.value(_i27.Uint8List(0)),
+      ) as _i22.Future<_i27.Uint8List>);
+  @override
+  _i26.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i26.StackTheme?);
+}
+
 /// A class which mocks [BitcoinWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
+class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
   MockBitcoinWallet() {
     _i1.throwOnMissingStub(this);
   }
@@ -691,15 +794,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i7.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+  _i8.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
         Invocation.getter(#txTracker),
-        returnValue: _FakeTransactionNotificationTracker_4(
+        returnValue: _FakeTransactionNotificationTracker_5(
           this,
           Invocation.getter(#txTracker),
         ),
-      ) as _i7.TransactionNotificationTracker);
+      ) as _i8.TransactionNotificationTracker);
   @override
-  set txTracker(_i7.TransactionNotificationTracker? _txTracker) =>
+  set txTracker(_i8.TransactionNotificationTracker? _txTracker) =>
       super.noSuchMethod(
         Invocation.setter(
           #txTracker,
@@ -796,13 +899,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i22.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i22.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i22.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i22.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i22.Future<_i8.FeeObject>);
+      ) as _i22.Future<_i9.FeeObject>);
   @override
   _i22.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -875,29 +978,29 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i9.ElectrumX get electrumXClient => (super.noSuchMethod(
+  _i10.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_6(
+        returnValue: _FakeElectrumX_7(
           this,
           Invocation.getter(#electrumXClient),
         ),
-      ) as _i9.ElectrumX);
+      ) as _i10.ElectrumX);
   @override
-  _i10.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+  _i11.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
         Invocation.getter(#cachedElectrumXClient),
-        returnValue: _FakeCachedElectrumX_7(
+        returnValue: _FakeCachedElectrumX_8(
           this,
           Invocation.getter(#cachedElectrumXClient),
         ),
-      ) as _i10.CachedElectrumX);
+      ) as _i11.CachedElectrumX);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i22.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
@@ -913,13 +1016,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i12.MainDB get db => (super.noSuchMethod(
+  _i7.MainDB get db => (super.noSuchMethod(
         Invocation.getter(#db),
-        returnValue: _FakeMainDB_9(
+        returnValue: _FakeMainDB_4(
           this,
           Invocation.getter(#db),
         ),
-      ) as _i12.MainDB);
+      ) as _i7.MainDB);
   @override
   _i13.NetworkType get networkType => (super.noSuchMethod(
         Invocation.getter(#networkType),
@@ -938,15 +1041,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i26.DerivePathType addressType({required String? address}) =>
+  _i29.DerivePathType addressType({required String? address}) =>
       (super.noSuchMethod(
         Invocation.method(
           #addressType,
           [],
           {#address: address},
         ),
-        returnValue: _i26.DerivePathType.bip44,
-      ) as _i26.DerivePathType);
+        returnValue: _i29.DerivePathType.bip44,
+      ) as _i29.DerivePathType);
   @override
   _i22.Future<void> recoverFromMnemonic({
     required String? mnemonic,
@@ -1105,19 +1208,20 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i22.Future<_i9.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+  _i22.Future<_i10.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
         Invocation.method(
           #getCurrentNode,
           [],
         ),
-        returnValue: _i22.Future<_i9.ElectrumXNode>.value(_FakeElectrumXNode_11(
+        returnValue:
+            _i22.Future<_i10.ElectrumXNode>.value(_FakeElectrumXNode_11(
           this,
           Invocation.method(
             #getCurrentNode,
             [],
           ),
         )),
-      ) as _i22.Future<_i9.ElectrumXNode>);
+      ) as _i22.Future<_i10.ElectrumXNode>);
   @override
   _i22.Future<List<Map<String, dynamic>>> fastFetch(
           List<String>? allTxHashes) =>
@@ -1199,7 +1303,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         },
       ));
   @override
-  _i22.Future<List<_i27.SigningData>> fetchBuildTxData(
+  _i22.Future<List<_i30.SigningData>> fetchBuildTxData(
           List<_i17.UTXO>? utxosToUse) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1207,11 +1311,11 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
           [utxosToUse],
         ),
         returnValue:
-            _i22.Future<List<_i27.SigningData>>.value(<_i27.SigningData>[]),
-      ) as _i22.Future<List<_i27.SigningData>>);
+            _i22.Future<List<_i30.SigningData>>.value(<_i30.SigningData>[]),
+      ) as _i22.Future<List<_i30.SigningData>>);
   @override
   _i22.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i27.SigningData>? utxoSigningData,
+    required List<_i30.SigningData>? utxoSigningData,
     required List<String>? recipients,
     required List<int>? satoshiAmounts,
   }) =>
@@ -1378,21 +1482,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i11.Balance getCachedBalance() => (super.noSuchMethod(
+  _i12.Balance getCachedBalance() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalance,
           [],
         ),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.method(
             #getCachedBalance,
             [],
           ),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
-  _i22.Future<void> updateCachedBalance(_i11.Balance? balance) =>
+  _i22.Future<void> updateCachedBalance(_i12.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalance,
@@ -1402,21 +1506,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i11.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+  _i12.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalanceSecondary,
           [],
         ),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.method(
             #getCachedBalanceSecondary,
             [],
           ),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
-  _i22.Future<void> updateCachedBalanceSecondary(_i11.Balance? balance) =>
+  _i22.Future<void> updateCachedBalanceSecondary(_i12.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalanceSecondary,
@@ -1426,7 +1530,26 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i22.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i22.Future<void>.value(),
+        returnValueForMissingStub: _i22.Future<void>.value(),
+      ) as _i22.Future<void>);
+  @override
+  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
           [],
@@ -1478,9 +1601,9 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
     required String? walletName,
     required _i13.NetworkType? network,
     required _i21.Coin? coin,
-    required _i12.MainDB? db,
-    required _i9.ElectrumX? electrumXClient,
-    required _i28.SecureStorageInterface? secureStorage,
+    required _i7.MainDB? db,
+    required _i10.ElectrumX? electrumXClient,
+    required _i31.SecureStorageInterface? secureStorage,
     required int? dustLimit,
     required int? dustLimitP2PKH,
     required int? minConfirms,
@@ -1500,7 +1623,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
     })?
         prepareSend,
     required _i22.Future<int> Function({required String address})? getTxCount,
-    required _i22.Future<List<_i27.SigningData>> Function(List<_i17.UTXO>)?
+    required _i22.Future<List<_i30.SigningData>> Function(List<_i17.UTXO>)?
         fetchBuildTxData,
     required _i22.Future<void> Function()? refresh,
     required _i22.Future<void> Function()? checkChangeAddressForTransactions,
@@ -1550,7 +1673,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         )),
       ) as _i22.Future<_i16.BIP32>);
   @override
-  _i22.Future<_i29.Uint8List> getPrivateKeyForPaynymReceivingAddress({
+  _i22.Future<_i27.Uint8List> getPrivateKeyForPaynymReceivingAddress({
     required String? paymentCodeString,
     required int? index,
   }) =>
@@ -1563,8 +1686,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
             #index: index,
           },
         ),
-        returnValue: _i22.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i22.Future<_i29.Uint8List>);
+        returnValue: _i22.Future<_i27.Uint8List>.value(_i27.Uint8List(0)),
+      ) as _i22.Future<_i27.Uint8List>);
   @override
   _i22.Future<_i17.Address> currentReceivingPaynymAddress({
     required _i18.PaymentCode? sender,
@@ -1650,14 +1773,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
         )),
       ) as _i22.Future<_i18.PaymentCode>);
   @override
-  _i22.Future<_i29.Uint8List> signWithNotificationKey(_i29.Uint8List? data) =>
+  _i22.Future<_i27.Uint8List> signWithNotificationKey(_i27.Uint8List? data) =>
       (super.noSuchMethod(
         Invocation.method(
           #signWithNotificationKey,
           [data],
         ),
-        returnValue: _i22.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i22.Future<_i29.Uint8List>);
+        returnValue: _i22.Future<_i27.Uint8List>.value(_i27.Uint8List(0)),
+      ) as _i22.Future<_i27.Uint8List>);
   @override
   _i22.Future<String> signStringWithNotificationKey(String? data) =>
       (super.noSuchMethod(
@@ -1890,9 +2013,9 @@ class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
     required String? walletId,
     required String? walletName,
     required _i21.Coin? coin,
-    required _i12.MainDB? db,
+    required _i7.MainDB? db,
     required _i22.Future<int> Function()? getChainHeight,
-    required _i22.Future<void> Function(_i11.Balance)? refreshedBalanceCallback,
+    required _i22.Future<void> Function(_i12.Balance)? refreshedBalanceCallback,
   }) =>
       super.noSuchMethod(
         Invocation.method(
@@ -1989,13 +2112,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i22.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i22.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i22.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i22.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i22.Future<_i8.FeeObject>);
+      ) as _i22.Future<_i9.FeeObject>);
   @override
   _i22.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2007,13 +2130,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: _i22.Future<String>.value(''),
       ) as _i22.Future<String>);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i22.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
@@ -2074,6 +2197,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -2352,13 +2480,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i19.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i22.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i22.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i22.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i22.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i22.Future<_i8.FeeObject>);
+      ) as _i22.Future<_i9.FeeObject>);
   @override
   _i22.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2370,13 +2498,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i19.CoinServiceAPI {
         returnValue: _i22.Future<String>.value(''),
       ) as _i22.Future<String>);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i22.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
diff --git a/test/widget_tests/trade_card_test.mocks.dart b/test/widget_tests/trade_card_test.mocks.dart
new file mode 100644
index 000000000..55895389f
--- /dev/null
+++ b/test/widget_tests/trade_card_test.mocks.dart
@@ -0,0 +1,131 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/trade_card_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:typed_data' as _i6;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i2;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
+import 'package:stackwallet/themes/theme_service.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
+  _FakeMainDB_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i3.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_0(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i2.MainDB);
+  @override
+  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i4.StackTheme>[],
+      ) as List<_i4.StackTheme>);
+  @override
+  void init(_i2.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i5.Future<void>.value(),
+        returnValueForMissingStub: _i5.Future<void>.value(),
+      ) as _i5.Future<void>);
+  @override
+  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i5.Future<bool>.value(false),
+      ) as _i5.Future<bool>);
+  @override
+  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
+            <_i3.StackThemeMetaData>[]),
+      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
+  @override
+  _i5.Future<_i6.Uint8List> fetchTheme(
+          {required _i3.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
+      ) as _i5.Future<_i6.Uint8List>);
+  @override
+  _i4.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i4.StackTheme?);
+}
diff --git a/test/widget_tests/transaction_card_test.dart b/test/widget_tests/transaction_card_test.dart
index 9bbd93dee..d3d16b655 100644
--- a/test/widget_tests/transaction_card_test.dart
+++ b/test/widget_tests/transaction_card_test.dart
@@ -1,3 +1,4 @@
+import 'package:decimal/decimal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -5,33 +6,40 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockingjay/mockingjay.dart' as mockingjay;
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/models/isar/models/blockchain_data/address.dart';
-import 'package:stackduo/models/isar/models/blockchain_data/transaction.dart';
-import 'package:stackduo/pages/wallet_view/transaction_views/transaction_details_view.dart';
-import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/coins/coin_service.dart';
-import 'package:stackduo/services/coins/manager.dart';
-import 'package:stackduo/services/locale_service.dart';
-import 'package:stackduo/services/notes_service.dart';
-import 'package:stackduo/services/price_service.dart';
-import 'package:stackduo/services/wallets.dart';
-import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/prefs.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/utilities/util.dart';
-import 'package:stackduo/widgets/transaction_card.dart';
-
+import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
+import 'package:stackwallet/models/isar/models/blockchain_data/transaction.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart';
+import 'package:stackwallet/providers/providers.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/services/locale_service.dart';
+import 'package:stackwallet/services/notes_service.dart';
+import 'package:stackwallet/services/price_service.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/utilities/prefs.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/widgets/transaction_card.dart';
+import 'package:tuple/tuple.dart';
+
+import '../sample_data/theme_json.dart';
 import 'transaction_card_test.mocks.dart';
 
 @GenerateMocks([
   Wallets,
   Manager,
   CoinServiceAPI,
+  FiroWallet,
   LocaleService,
   Prefs,
   PriceService,
-  NotesService
+  NotesService,
+  ThemeService,
 ], customMocks: [])
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -41,12 +49,17 @@ void main() {
     final wallets = MockWallets();
     final mockPrefs = MockPrefs();
     final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
 
     final tx = Transaction(
       txid: "some txid",
       timestamp: 1648595998,
       type: TransactionType.outgoing,
       amount: 100000000,
+      amountString: Amount(
+        rawValue: BigInt.from(100000000),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
       fee: 3794,
       height: 450123,
       subType: TransactionSubType.none,
@@ -55,10 +68,10 @@ void main() {
       isLelantus: null,
       slateId: '',
       otherData: '',
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: Amount.zero.toJsonString(),
-      nonce: null,
+      numberOfMessages: null,
     )..address.value = Address(
         walletId: "walletId",
         value: "",
@@ -68,10 +81,27 @@ void main() {
         type: AddressType.p2pkh,
         subType: AddressSubType.receiving);
 
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+        applicationThemesDirectoryPath: "test",
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
     when(mockPrefs.currency).thenAnswer((_) => "USD");
     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
 
+    when(wallets.getManager("wallet-id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
     //
     await tester.pumpWidget(
       ProviderScope(
@@ -79,6 +109,7 @@ void main() {
           walletsChangeNotifierProvider.overrideWithValue(wallets),
           localeServiceChangeNotifierProvider
               .overrideWithValue(mockLocaleService),
+          pThemeService.overrideWithValue(mockThemeService),
           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
         ],
@@ -86,7 +117,10 @@ void main() {
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
               ),
             ],
           ),
@@ -118,6 +152,8 @@ void main() {
     verify(mockLocaleService.addListener(any)).called(1);
 
     verify(mockPrefs.currency).called(1);
+    verify(mockPriceService.getPrice(Coin.firo)).called(1);
+    verify(wallet.coin.ticker).called(1);
 
     verify(mockLocaleService.locale).called(1);
 
@@ -131,12 +167,17 @@ void main() {
     final wallets = MockWallets();
     final mockPrefs = MockPrefs();
     final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
 
     final tx = Transaction(
       txid: "some txid",
       timestamp: 1648595998,
       type: TransactionType.outgoing,
       amount: 9659,
+      amountString: Amount(
+        rawValue: BigInt.from(9659),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
       fee: 3794,
       height: 450123,
       subType: TransactionSubType.mint,
@@ -145,10 +186,10 @@ void main() {
       isLelantus: null,
       slateId: '',
       otherData: '',
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: Amount.zero.toJsonString(),
-      nonce: null,
+      numberOfMessages: null,
     )..address.value = Address(
         walletId: "walletId",
         value: "",
@@ -158,10 +199,26 @@ void main() {
         type: AddressType.p2pkh,
         subType: AddressSubType.receiving);
 
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+        applicationThemesDirectoryPath: "test",
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
     when(mockPrefs.currency).thenAnswer((_) => "USD");
     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
 
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+
+    when(wallets.getManager("wallet-id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
     //
     await tester.pumpWidget(
       ProviderScope(
@@ -170,13 +227,17 @@ void main() {
           localeServiceChangeNotifierProvider
               .overrideWithValue(mockLocaleService),
           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
               ),
             ],
           ),
@@ -206,6 +267,8 @@ void main() {
     verify(mockLocaleService.addListener(any)).called(1);
 
     verify(mockPrefs.currency).called(1);
+    verify(mockPriceService.getPrice(Coin.firo)).called(1);
+    verify(wallet.coin.ticker).called(1);
 
     verify(mockLocaleService.locale).called(1);
 
@@ -219,12 +282,17 @@ void main() {
     final wallets = MockWallets();
     final mockPrefs = MockPrefs();
     final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
 
     final tx = Transaction(
       txid: "some txid",
       timestamp: 1648595998,
       type: TransactionType.incoming,
       amount: 100000000,
+      amountString: Amount(
+        rawValue: BigInt.from(100000000),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
       fee: 3794,
       height: 450123,
       subType: TransactionSubType.none,
@@ -233,10 +301,10 @@ void main() {
       isLelantus: null,
       slateId: '',
       otherData: '',
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: Amount.zero.toJsonString(),
-      nonce: null,
+      numberOfMessages: null,
     )..address.value = Address(
         walletId: "walletId",
         value: "",
@@ -246,9 +314,27 @@ void main() {
         type: AddressType.p2pkh,
         subType: AddressSubType.receiving);
 
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+        applicationThemesDirectoryPath: "test",
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
     when(mockPrefs.currency).thenAnswer((_) => "USD");
     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+
+    when(wallets.getManager("wallet-id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
 
     await tester.pumpWidget(
       ProviderScope(
@@ -257,13 +343,17 @@ void main() {
           localeServiceChangeNotifierProvider
               .overrideWithValue(mockLocaleService),
           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
               ),
             ],
           ),
@@ -285,6 +375,8 @@ void main() {
     verify(mockLocaleService.addListener(any)).called(1);
 
     verify(mockPrefs.currency).called(1);
+    verify(mockPriceService.getPrice(Coin.firo)).called(1);
+    verify(wallet.coin.ticker).called(1);
 
     verify(mockLocaleService.locale).called(1);
 
@@ -298,6 +390,7 @@ void main() {
     final wallets = MockWallets();
     final mockPrefs = MockPrefs();
     final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
     final navigator = mockingjay.MockNavigator();
 
     final tx = Transaction(
@@ -305,6 +398,10 @@ void main() {
       timestamp: 1648595998,
       type: TransactionType.outgoing,
       amount: 100000000,
+      amountString: Amount(
+        rawValue: BigInt.from(100000000),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
       fee: 3794,
       height: 450123,
       subType: TransactionSubType.none,
@@ -313,10 +410,10 @@ void main() {
       isLelantus: null,
       slateId: '',
       otherData: '',
+      nonce: null,
       inputs: [],
       outputs: [],
-      amountString: Amount.zero.toJsonString(),
-      nonce: null,
+      numberOfMessages: null,
     )..address.value = Address(
         walletId: "walletId",
         value: "",
@@ -326,9 +423,32 @@ void main() {
         type: AddressType.p2pkh,
         subType: AddressSubType.receiving);
 
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+        applicationThemesDirectoryPath: "test",
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
     when(mockPrefs.currency).thenAnswer((_) => "USD");
     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+
+    when(wallets.getManager("wallet id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+
+    mockingjay
+        .when(() => navigator.pushNamed("/transactionDetails",
+            arguments: Tuple3(tx, Coin.firo, "wallet id")))
+        .thenAnswer((_) async => {});
 
     await tester.pumpWidget(
       ProviderScope(
@@ -337,12 +457,18 @@ void main() {
           localeServiceChangeNotifierProvider
               .overrideWithValue(mockLocaleService),
           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                  applicationThemesDirectoryPath: "test",
+                ),
+              ),
             ],
           ),
           home: mockingjay.MockNavigatorProvider(
@@ -361,16 +487,19 @@ void main() {
 
     verify(mockPrefs.currency).called(2);
     verify(mockLocaleService.locale).called(4);
+    verify(wallet.coin.ticker).called(1);
+    verify(wallet.storedChainHeight).called(2);
 
+    verifyNoMoreInteractions(wallet);
     verifyNoMoreInteractions(mockLocaleService);
 
     if (Util.isDesktop) {
       expect(find.byType(TransactionDetailsView), findsOneWidget);
     } else {
-      // mockingjay
-      //     .verify(() => navigator.pushNamed("/transactionDetails",
-      //         arguments: Tuple3(tx, Coin.firo, "wallet id")))
-      //     .called(1);
+      mockingjay
+          .verify(() => navigator.pushNamed("/transactionDetails",
+              arguments: Tuple3(tx, Coin.firo, "wallet id")))
+          .called(1);
     }
   });
 }
diff --git a/test/widget_tests/transaction_card_test.mocks.dart b/test/widget_tests/transaction_card_test.mocks.dart
index 5e7fa925d..93cc0c9a7 100644
--- a/test/widget_tests/transaction_card_test.mocks.dart
+++ b/test/widget_tests/transaction_card_test.mocks.dart
@@ -1,32 +1,42 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/widget_tests/transaction_card_test.dart.
+// in stackwallet/test/widget_tests/transaction_card_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i14;
-import 'dart:ui' as _i16;
+import 'dart:async' as _i18;
+import 'dart:typed_data' as _i32;
+import 'dart:ui' as _i20;
 
-import 'package:decimal/decimal.dart' as _i22;
+import 'package:decimal/decimal.dart' as _i28;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/models/balance.dart' as _i9;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/models.dart' as _i8;
-import 'package:stackduo/services/coins/coin_service.dart' as _i7;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/locale_service.dart' as _i18;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/notes_service.dart' as _i23;
-import 'package:stackduo/services/price_service.dart' as _i21;
-import 'package:stackduo/services/wallets.dart' as _i12;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i10;
-import 'package:stackduo/utilities/enums/backup_frequency_type.dart' as _i20;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i13;
-import 'package:stackduo/utilities/enums/sync_type_enum.dart' as _i19;
-import 'package:stackduo/utilities/prefs.dart' as _i15;
-import 'package:tuple/tuple.dart' as _i11;
+import 'package:stackwallet/db/isar/main_db.dart' as _i14;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i13;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i12;
+import 'package:stackwallet/models/balance.dart' as _i9;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i21;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i31;
+import 'package:stackwallet/models/models.dart' as _i8;
+import 'package:stackwallet/models/signing_data.dart' as _i23;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i7;
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart' as _i22;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/locale_service.dart' as _i24;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/notes_service.dart' as _i29;
+import 'package:stackwallet/services/price_service.dart' as _i27;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i11;
+import 'package:stackwallet/services/wallets.dart' as _i16;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i30;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i10;
+import 'package:stackwallet/utilities/enums/backup_frequency_type.dart' as _i26;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i17;
+import 'package:stackwallet/utilities/enums/sync_type_enum.dart' as _i25;
+import 'package:stackwallet/utilities/prefs.dart' as _i19;
+import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -122,8 +132,9 @@ class _FakeAmount_7 extends _i1.SmartFake implements _i10.Amount {
         );
 }
 
-class _FakeDuration_8 extends _i1.SmartFake implements Duration {
-  _FakeDuration_8(
+class _FakeTransactionNotificationTracker_8 extends _i1.SmartFake
+    implements _i11.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -132,9 +143,50 @@ class _FakeDuration_8 extends _i1.SmartFake implements Duration {
         );
 }
 
-class _FakeTuple2_9<T1, T2> extends _i1.SmartFake
-    implements _i11.Tuple2<T1, T2> {
-  _FakeTuple2_9(
+class _FakeElectrumX_9 extends _i1.SmartFake implements _i12.ElectrumX {
+  _FakeElectrumX_9(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeCachedElectrumX_10 extends _i1.SmartFake
+    implements _i13.CachedElectrumX {
+  _FakeCachedElectrumX_10(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeMainDB_11 extends _i1.SmartFake implements _i14.MainDB {
+  _FakeMainDB_11(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeDuration_12 extends _i1.SmartFake implements Duration {
+  _FakeDuration_12(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeTuple2_13<T1, T2> extends _i1.SmartFake
+    implements _i15.Tuple2<T1, T2> {
+  _FakeTuple2_13(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -146,7 +198,7 @@ class _FakeTuple2_9<T1, T2> extends _i1.SmartFake
 /// A class which mocks [Wallets].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWallets extends _i1.Mock implements _i12.Wallets {
+class MockWallets extends _i1.Mock implements _i16.Wallets {
   MockWallets() {
     _i1.throwOnMissingStub(this);
   }
@@ -213,7 +265,7 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  List<String> getWalletIdsFor({required _i13.Coin? coin}) =>
+  List<String> getWalletIdsFor({required _i17.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getWalletIdsFor,
@@ -223,21 +275,21 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
         returnValue: <String>[],
       ) as List<String>);
   @override
-  List<_i11.Tuple2<_i13.Coin, List<_i5.ChangeNotifierProvider<_i6.Manager>>>>
+  List<_i15.Tuple2<_i17.Coin, List<_i5.ChangeNotifierProvider<_i6.Manager>>>>
       getManagerProvidersByCoin() => (super.noSuchMethod(
             Invocation.method(
               #getManagerProvidersByCoin,
               [],
             ),
             returnValue: <
-                _i11.Tuple2<_i13.Coin,
+                _i15.Tuple2<_i17.Coin,
                     List<_i5.ChangeNotifierProvider<_i6.Manager>>>>[],
           ) as List<
-              _i11.Tuple2<_i13.Coin,
+              _i15.Tuple2<_i17.Coin,
                   List<_i5.ChangeNotifierProvider<_i6.Manager>>>>);
   @override
   List<_i5.ChangeNotifierProvider<_i6.Manager>> getManagerProvidersForCoin(
-          _i13.Coin? coin) =>
+          _i17.Coin? coin) =>
       (super.noSuchMethod(
         Invocation.method(
           #getManagerProvidersForCoin,
@@ -301,17 +353,17 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  _i14.Future<void> load(_i15.Prefs? prefs) => (super.noSuchMethod(
+  _i18.Future<void> load(_i19.Prefs? prefs) => (super.noSuchMethod(
         Invocation.method(
           #load,
           [prefs],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> loadAfterStackRestore(
-    _i15.Prefs? prefs,
+  _i18.Future<void> loadAfterStackRestore(
+    _i19.Prefs? prefs,
     List<_i6.Manager>? managers,
   ) =>
       (super.noSuchMethod(
@@ -322,11 +374,11 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
             managers,
           ],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -334,7 +386,7 @@ class MockWallets extends _i1.Mock implements _i12.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -386,10 +438,10 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i13.Coin get coin => (super.noSuchMethod(
+  _i17.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i13.Coin.bitcoin,
-      ) as _i13.Coin);
+        returnValue: _i17.Coin.bitcoin,
+      ) as _i17.Coin);
   @override
   bool get isRefreshing => (super.noSuchMethod(
         Invocation.getter(#isRefreshing),
@@ -422,23 +474,23 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i14.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i18.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i14.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i18.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i14.Future<_i8.FeeObject>);
+      ) as _i18.Future<_i8.FeeObject>);
   @override
-  _i14.Future<int> get maxFee => (super.noSuchMethod(
+  _i18.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
-        returnValue: _i14.Future<int>.value(0),
-      ) as _i14.Future<int>);
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
   @override
-  _i14.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+  _i18.Future<String> get currentReceivingAddress => (super.noSuchMethod(
         Invocation.getter(#currentReceivingAddress),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
   _i9.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
@@ -448,16 +500,16 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         ),
       ) as _i9.Balance);
   @override
-  _i14.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
+  _i18.Future<List<_i21.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i14.Future<List<_i17.Transaction>>.value(<_i17.Transaction>[]),
-      ) as _i14.Future<List<_i17.Transaction>>);
+            _i18.Future<List<_i21.Transaction>>.value(<_i21.Transaction>[]),
+      ) as _i18.Future<List<_i21.Transaction>>);
   @override
-  _i14.Future<List<_i17.UTXO>> get utxos => (super.noSuchMethod(
+  _i18.Future<List<_i21.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i14.Future<List<_i17.UTXO>>.value(<_i17.UTXO>[]),
-      ) as _i14.Future<List<_i17.UTXO>>);
+        returnValue: _i18.Future<List<_i21.UTXO>>.value(<_i21.UTXO>[]),
+      ) as _i18.Future<List<_i21.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -477,15 +529,15 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: '',
       ) as String);
   @override
-  _i14.Future<List<String>> get mnemonic => (super.noSuchMethod(
+  _i18.Future<List<String>> get mnemonic => (super.noSuchMethod(
         Invocation.getter(#mnemonic),
-        returnValue: _i14.Future<List<String>>.value(<String>[]),
-      ) as _i14.Future<List<String>>);
+        returnValue: _i18.Future<List<String>>.value(<String>[]),
+      ) as _i18.Future<List<String>>);
   @override
-  _i14.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+  _i18.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
         Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i14.Future<String?>.value(),
-      ) as _i14.Future<String?>);
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
   @override
   bool get isConnected => (super.noSuchMethod(
         Invocation.getter(#isConnected),
@@ -507,6 +559,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -522,24 +579,24 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<String> get xpub => (super.noSuchMethod(
+  _i18.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+  _i18.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
         Invocation.method(
           #updateNode,
           [shouldRefresh],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
   void dispose() => super.noSuchMethod(
         Invocation.method(
@@ -549,7 +606,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i14.Future<Map<String, dynamic>> prepareSend({
+  _i18.Future<Map<String, dynamic>> prepareSend({
     required String? address,
     required _i10.Amount? amount,
     Map<String, dynamic>? args,
@@ -565,27 +622,27 @@ class MockManager extends _i1.Mock implements _i6.Manager {
           },
         ),
         returnValue:
-            _i14.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i14.Future<Map<String, dynamic>>);
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
   @override
-  _i14.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+  _i18.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
       (super.noSuchMethod(
         Invocation.method(
           #confirmSend,
           [],
           {#txData: txData},
         ),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
-  _i14.Future<void> refresh() => (super.noSuchMethod(
+  _i18.Future<void> refresh() => (super.noSuchMethod(
         Invocation.method(
           #refresh,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
   bool validateAddress(String? address) => (super.noSuchMethod(
         Invocation.method(
@@ -595,33 +652,33 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+  _i18.Future<bool> testNetworkConnection() => (super.noSuchMethod(
         Invocation.method(
           #testNetworkConnection,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> initializeNew() => (super.noSuchMethod(
+  _i18.Future<void> initializeNew() => (super.noSuchMethod(
         Invocation.method(
           #initializeNew,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> initializeExisting() => (super.noSuchMethod(
+  _i18.Future<void> initializeExisting() => (super.noSuchMethod(
         Invocation.method(
           #initializeExisting,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> recoverFromMnemonic({
+  _i18.Future<void> recoverFromMnemonic({
     required String? mnemonic,
     String? mnemonicPassphrase,
     required int? maxUnusedAddressGap,
@@ -640,20 +697,20 @@ class MockManager extends _i1.Mock implements _i6.Manager {
             #height: height,
           },
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> exitCurrentWallet() => (super.noSuchMethod(
+  _i18.Future<void> exitCurrentWallet() => (super.noSuchMethod(
         Invocation.method(
           #exitCurrentWallet,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> fullRescan(
+  _i18.Future<void> fullRescan(
     int? maxUnusedAddressGap,
     int? maxNumberOfIndexesToCheck,
   ) =>
@@ -665,11 +722,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
             maxNumberOfIndexesToCheck,
           ],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<_i10.Amount> estimateFeeFor(
+  _i18.Future<_i10.Amount> estimateFeeFor(
     _i10.Amount? amount,
     int? feeRate,
   ) =>
@@ -681,7 +738,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
             feeRate,
           ],
         ),
-        returnValue: _i14.Future<_i10.Amount>.value(_FakeAmount_7(
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
           this,
           Invocation.method(
             #estimateFeeFor,
@@ -691,26 +748,26 @@ class MockManager extends _i1.Mock implements _i6.Manager {
             ],
           ),
         )),
-      ) as _i14.Future<_i10.Amount>);
+      ) as _i18.Future<_i10.Amount>);
   @override
-  _i14.Future<bool> generateNewAddress() => (super.noSuchMethod(
+  _i18.Future<bool> generateNewAddress() => (super.noSuchMethod(
         Invocation.method(
           #generateNewAddress,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
+  _i18.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
         Invocation.method(
           #resetRescanOnOpen,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -718,7 +775,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -753,10 +810,10 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i13.Coin get coin => (super.noSuchMethod(
+  _i17.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i13.Coin.bitcoin,
-      ) as _i13.Coin);
+        returnValue: _i17.Coin.bitcoin,
+      ) as _i17.Coin);
   @override
   bool get isRefreshing => (super.noSuchMethod(
         Invocation.getter(#isRefreshing),
@@ -789,23 +846,23 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i14.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i18.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i14.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i18.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i14.Future<_i8.FeeObject>);
+      ) as _i18.Future<_i8.FeeObject>);
   @override
-  _i14.Future<int> get maxFee => (super.noSuchMethod(
+  _i18.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
-        returnValue: _i14.Future<int>.value(0),
-      ) as _i14.Future<int>);
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
   @override
-  _i14.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+  _i18.Future<String> get currentReceivingAddress => (super.noSuchMethod(
         Invocation.getter(#currentReceivingAddress),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
   _i9.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
@@ -815,16 +872,16 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         ),
       ) as _i9.Balance);
   @override
-  _i14.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
+  _i18.Future<List<_i21.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i14.Future<List<_i17.Transaction>>.value(<_i17.Transaction>[]),
-      ) as _i14.Future<List<_i17.Transaction>>);
+            _i18.Future<List<_i21.Transaction>>.value(<_i21.Transaction>[]),
+      ) as _i18.Future<List<_i21.Transaction>>);
   @override
-  _i14.Future<List<_i17.UTXO>> get utxos => (super.noSuchMethod(
+  _i18.Future<List<_i21.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i14.Future<List<_i17.UTXO>>.value(<_i17.UTXO>[]),
-      ) as _i14.Future<List<_i17.UTXO>>);
+        returnValue: _i18.Future<List<_i21.UTXO>>.value(<_i21.UTXO>[]),
+      ) as _i18.Future<List<_i21.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -844,20 +901,20 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValue: '',
       ) as String);
   @override
-  _i14.Future<List<String>> get mnemonic => (super.noSuchMethod(
+  _i18.Future<List<String>> get mnemonic => (super.noSuchMethod(
         Invocation.getter(#mnemonic),
-        returnValue: _i14.Future<List<String>>.value(<String>[]),
-      ) as _i14.Future<List<String>>);
+        returnValue: _i18.Future<List<String>>.value(<String>[]),
+      ) as _i18.Future<List<String>>);
   @override
-  _i14.Future<String?> get mnemonicString => (super.noSuchMethod(
+  _i18.Future<String?> get mnemonicString => (super.noSuchMethod(
         Invocation.getter(#mnemonicString),
-        returnValue: _i14.Future<String?>.value(),
-      ) as _i14.Future<String?>);
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
   @override
-  _i14.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+  _i18.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
         Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i14.Future<String?>.value(),
-      ) as _i14.Future<String?>);
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
   @override
   bool get hasCalledExit => (super.noSuchMethod(
         Invocation.getter(#hasCalledExit),
@@ -874,7 +931,7 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValue: 0,
       ) as int);
   @override
-  _i14.Future<Map<String, dynamic>> prepareSend({
+  _i18.Future<Map<String, dynamic>> prepareSend({
     required String? address,
     required _i10.Amount? amount,
     Map<String, dynamic>? args,
@@ -890,36 +947,36 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
           },
         ),
         returnValue:
-            _i14.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i14.Future<Map<String, dynamic>>);
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
   @override
-  _i14.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+  _i18.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
       (super.noSuchMethod(
         Invocation.method(
           #confirmSend,
           [],
           {#txData: txData},
         ),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
-  _i14.Future<void> refresh() => (super.noSuchMethod(
+  _i18.Future<void> refresh() => (super.noSuchMethod(
         Invocation.method(
           #refresh,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+  _i18.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
         Invocation.method(
           #updateNode,
           [shouldRefresh],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
   bool validateAddress(String? address) => (super.noSuchMethod(
         Invocation.method(
@@ -929,15 +986,15 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+  _i18.Future<bool> testNetworkConnection() => (super.noSuchMethod(
         Invocation.method(
           #testNetworkConnection,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> recoverFromMnemonic({
+  _i18.Future<void> recoverFromMnemonic({
     required String? mnemonic,
     String? mnemonicPassphrase,
     required int? maxUnusedAddressGap,
@@ -956,38 +1013,38 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
             #height: height,
           },
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> initializeNew() => (super.noSuchMethod(
+  _i18.Future<void> initializeNew() => (super.noSuchMethod(
         Invocation.method(
           #initializeNew,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> initializeExisting() => (super.noSuchMethod(
+  _i18.Future<void> initializeExisting() => (super.noSuchMethod(
         Invocation.method(
           #initializeExisting,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> exit() => (super.noSuchMethod(
+  _i18.Future<void> exit() => (super.noSuchMethod(
         Invocation.method(
           #exit,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> fullRescan(
+  _i18.Future<void> fullRescan(
     int? maxUnusedAddressGap,
     int? maxNumberOfIndexesToCheck,
   ) =>
@@ -999,11 +1056,11 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
             maxNumberOfIndexesToCheck,
           ],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<_i10.Amount> estimateFeeFor(
+  _i18.Future<_i10.Amount> estimateFeeFor(
     _i10.Amount? amount,
     int? feeRate,
   ) =>
@@ -1015,7 +1072,7 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
             feeRate,
           ],
         ),
-        returnValue: _i14.Future<_i10.Amount>.value(_FakeAmount_7(
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
           this,
           Invocation.method(
             #estimateFeeFor,
@@ -1025,276 +1082,1267 @@ class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
             ],
           ),
         )),
-      ) as _i14.Future<_i10.Amount>);
+      ) as _i18.Future<_i10.Amount>);
   @override
-  _i14.Future<bool> generateNewAddress() => (super.noSuchMethod(
+  _i18.Future<bool> generateNewAddress() => (super.noSuchMethod(
         Invocation.method(
           #generateNewAddress,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
+  _i18.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateSentCachedTxData,
           [txData],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
 }
 
-/// A class which mocks [LocaleService].
+/// A class which mocks [FiroWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i18.LocaleService {
-  MockLocaleService() {
+class MockFiroWallet extends _i1.Mock implements _i22.FiroWallet {
+  MockFiroWallet() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  String get locale => (super.noSuchMethod(
-        Invocation.getter(#locale),
-        returnValue: '',
-      ) as String);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i14.Future<void> loadLocale({bool? notify = true}) => (super.noSuchMethod(
-        Invocation.method(
-          #loadLocale,
-          [],
-          {#notify: notify},
-        ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
-  @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
+  set timer(_i18.Timer? _timer) => super.noSuchMethod(
+        Invocation.setter(
+          #timer,
+          _timer,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
+  _i11.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+        Invocation.getter(#txTracker),
+        returnValue: _FakeTransactionNotificationTracker_8(
+          this,
+          Invocation.getter(#txTracker),
         ),
-        returnValueForMissingStub: null,
-      );
+      ) as _i11.TransactionNotificationTracker);
   @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
+  set txTracker(_i11.TransactionNotificationTracker? _txTracker) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #txTracker,
+          _txTracker,
         ),
         returnValueForMissingStub: null,
       );
-}
-
-/// A class which mocks [Prefs].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockPrefs extends _i1.Mock implements _i15.Prefs {
-  MockPrefs() {
-    _i1.throwOnMissingStub(this);
-  }
-
   @override
-  bool get isInitialized => (super.noSuchMethod(
-        Invocation.getter(#isInitialized),
+  bool get refreshMutex => (super.noSuchMethod(
+        Invocation.getter(#refreshMutex),
         returnValue: false,
       ) as bool);
   @override
-  int get lastUnlockedTimeout => (super.noSuchMethod(
-        Invocation.getter(#lastUnlockedTimeout),
-        returnValue: 0,
-      ) as int);
-  @override
-  set lastUnlockedTimeout(int? lastUnlockedTimeout) => super.noSuchMethod(
+  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
         Invocation.setter(
-          #lastUnlockedTimeout,
-          lastUnlockedTimeout,
+          #refreshMutex,
+          _refreshMutex,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  int get lastUnlocked => (super.noSuchMethod(
-        Invocation.getter(#lastUnlocked),
-        returnValue: 0,
-      ) as int);
+  bool get longMutex => (super.noSuchMethod(
+        Invocation.getter(#longMutex),
+        returnValue: false,
+      ) as bool);
   @override
-  set lastUnlocked(int? lastUnlocked) => super.noSuchMethod(
+  set longMutex(bool? _longMutex) => super.noSuchMethod(
         Invocation.setter(
-          #lastUnlocked,
-          lastUnlocked,
+          #longMutex,
+          _longMutex,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  int get currentNotificationId => (super.noSuchMethod(
-        Invocation.getter(#currentNotificationId),
-        returnValue: 0,
-      ) as int);
-  @override
-  List<String> get walletIdsSyncOnStartup => (super.noSuchMethod(
-        Invocation.getter(#walletIdsSyncOnStartup),
-        returnValue: <String>[],
-      ) as List<String>);
+  bool get isActive => (super.noSuchMethod(
+        Invocation.getter(#isActive),
+        returnValue: false,
+      ) as bool);
   @override
-  set walletIdsSyncOnStartup(List<String>? walletIdsSyncOnStartup) =>
-      super.noSuchMethod(
+  set isActive(bool? _isActive) => super.noSuchMethod(
         Invocation.setter(
-          #walletIdsSyncOnStartup,
-          walletIdsSyncOnStartup,
+          #isActive,
+          _isActive,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  _i19.SyncingType get syncType => (super.noSuchMethod(
-        Invocation.getter(#syncType),
-        returnValue: _i19.SyncingType.currentWalletOnly,
-      ) as _i19.SyncingType);
+  bool get shouldAutoSync => (super.noSuchMethod(
+        Invocation.getter(#shouldAutoSync),
+        returnValue: false,
+      ) as bool);
   @override
-  set syncType(_i19.SyncingType? syncType) => super.noSuchMethod(
+  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
         Invocation.setter(
-          #syncType,
-          syncType,
+          #shouldAutoSync,
+          shouldAutoSync,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  bool get wifiOnly => (super.noSuchMethod(
-        Invocation.getter(#wifiOnly),
-        returnValue: false,
-      ) as bool);
-  @override
-  set wifiOnly(bool? wifiOnly) => super.noSuchMethod(
+  set isFavorite(bool? markFavorite) => super.noSuchMethod(
         Invocation.setter(
-          #wifiOnly,
-          wifiOnly,
+          #isFavorite,
+          markFavorite,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  bool get showFavoriteWallets => (super.noSuchMethod(
-        Invocation.getter(#showFavoriteWallets),
+  bool get isFavorite => (super.noSuchMethod(
+        Invocation.getter(#isFavorite),
         returnValue: false,
       ) as bool);
   @override
-  set showFavoriteWallets(bool? showFavoriteWallets) => super.noSuchMethod(
-        Invocation.setter(
-          #showFavoriteWallets,
-          showFavoriteWallets,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i17.Coin get coin => (super.noSuchMethod(
+        Invocation.getter(#coin),
+        returnValue: _i17.Coin.bitcoin,
+      ) as _i17.Coin);
   @override
-  String get language => (super.noSuchMethod(
-        Invocation.getter(#language),
+  _i18.Future<List<String>> get mnemonic => (super.noSuchMethod(
+        Invocation.getter(#mnemonic),
+        returnValue: _i18.Future<List<String>>.value(<String>[]),
+      ) as _i18.Future<List<String>>);
+  @override
+  _i18.Future<String?> get mnemonicString => (super.noSuchMethod(
+        Invocation.getter(#mnemonicString),
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
+  @override
+  _i18.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+        Invocation.getter(#mnemonicPassphrase),
+        returnValue: _i18.Future<String?>.value(),
+      ) as _i18.Future<String?>);
+  @override
+  _i18.Future<int> get maxFee => (super.noSuchMethod(
+        Invocation.getter(#maxFee),
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
+  @override
+  _i18.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+        Invocation.getter(#fees),
+        returnValue: _i18.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+          this,
+          Invocation.getter(#fees),
+        )),
+      ) as _i18.Future<_i8.FeeObject>);
+  @override
+  _i18.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+        Invocation.getter(#currentReceivingAddress),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  _i18.Future<String> get currentChangeAddress => (super.noSuchMethod(
+        Invocation.getter(#currentChangeAddress),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  String get walletName => (super.noSuchMethod(
+        Invocation.getter(#walletName),
         returnValue: '',
       ) as String);
   @override
-  set language(String? newLanguage) => super.noSuchMethod(
+  set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
-          #language,
-          newLanguage,
+          #walletName,
+          newName,
         ),
         returnValueForMissingStub: null,
       );
   @override
-  String get currency => (super.noSuchMethod(
-        Invocation.getter(#currency),
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
         returnValue: '',
       ) as String);
   @override
-  set currency(String? newCurrency) => super.noSuchMethod(
-        Invocation.setter(
-          #currency,
-          newCurrency,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get randomizePIN => (super.noSuchMethod(
-        Invocation.getter(#randomizePIN),
+  bool get isConnected => (super.noSuchMethod(
+        Invocation.getter(#isConnected),
         returnValue: false,
       ) as bool);
   @override
-  set randomizePIN(bool? randomizePIN) => super.noSuchMethod(
-        Invocation.setter(
-          #randomizePIN,
-          randomizePIN,
+  _i12.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_9(
+          this,
+          Invocation.getter(#electrumXClient),
         ),
-        returnValueForMissingStub: null,
-      );
+      ) as _i12.ElectrumX);
   @override
-  bool get useBiometrics => (super.noSuchMethod(
-        Invocation.getter(#useBiometrics),
+  _i13.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+        Invocation.getter(#cachedElectrumXClient),
+        returnValue: _FakeCachedElectrumX_10(
+          this,
+          Invocation.getter(#cachedElectrumXClient),
+        ),
+      ) as _i13.CachedElectrumX);
+  @override
+  bool get isRefreshing => (super.noSuchMethod(
+        Invocation.getter(#isRefreshing),
         returnValue: false,
       ) as bool);
   @override
-  set useBiometrics(bool? useBiometrics) => super.noSuchMethod(
-        Invocation.setter(
-          #useBiometrics,
-          useBiometrics,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasPin => (super.noSuchMethod(
-        Invocation.getter(#hasPin),
+  bool get hasCalledExit => (super.noSuchMethod(
+        Invocation.getter(#hasCalledExit),
         returnValue: false,
       ) as bool);
   @override
-  set hasPin(bool? hasPin) => super.noSuchMethod(
-        Invocation.setter(
-          #hasPin,
-          hasPin,
-        ),
-        returnValueForMissingStub: null,
-      );
+  _i18.Future<int> get chainHeight => (super.noSuchMethod(
+        Invocation.getter(#chainHeight),
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
   @override
-  int get familiarity => (super.noSuchMethod(
-        Invocation.getter(#familiarity),
+  int get storedChainHeight => (super.noSuchMethod(
+        Invocation.getter(#storedChainHeight),
         returnValue: 0,
       ) as int);
   @override
-  set familiarity(int? familiarity) => super.noSuchMethod(
-        Invocation.setter(
-          #familiarity,
-          familiarity,
+  _i9.Balance get balance => (super.noSuchMethod(
+        Invocation.getter(#balance),
+        returnValue: _FakeBalance_6(
+          this,
+          Invocation.getter(#balance),
         ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get showTestNetCoins => (super.noSuchMethod(
-        Invocation.getter(#showTestNetCoins),
-        returnValue: false,
-      ) as bool);
+      ) as _i9.Balance);
   @override
-  set showTestNetCoins(bool? showTestNetCoins) => super.noSuchMethod(
-        Invocation.setter(
-          #showTestNetCoins,
-          showTestNetCoins,
+  _i9.Balance get balancePrivate => (super.noSuchMethod(
+        Invocation.getter(#balancePrivate),
+        returnValue: _FakeBalance_6(
+          this,
+          Invocation.getter(#balancePrivate),
         ),
-        returnValueForMissingStub: null,
+      ) as _i9.Balance);
+  @override
+  _i18.Future<List<_i21.UTXO>> get utxos => (super.noSuchMethod(
+        Invocation.getter(#utxos),
+        returnValue: _i18.Future<List<_i21.UTXO>>.value(<_i21.UTXO>[]),
+      ) as _i18.Future<List<_i21.UTXO>>);
+  @override
+  _i18.Future<List<_i21.Transaction>> get transactions => (super.noSuchMethod(
+        Invocation.getter(#transactions),
+        returnValue:
+            _i18.Future<List<_i21.Transaction>>.value(<_i21.Transaction>[]),
+      ) as _i18.Future<List<_i21.Transaction>>);
+  @override
+  _i18.Future<String> get xpub => (super.noSuchMethod(
+        Invocation.getter(#xpub),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #onIsActiveWalletChanged,
+          _onIsActiveWalletChanged,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i14.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_11(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i14.MainDB);
+  @override
+  bool validateAddress(String? address) => (super.noSuchMethod(
+        Invocation.method(
+          #validateAddress,
+          [address],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i18.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateSentCachedTxData,
+          [txData],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+        Invocation.method(
+          #testNetworkConnection,
+          [],
+        ),
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
+  @override
+  void startNetworkAlivePinging() => super.noSuchMethod(
+        Invocation.method(
+          #startNetworkAlivePinging,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void stopNetworkAlivePinging() => super.noSuchMethod(
+        Invocation.method(
+          #stopNetworkAlivePinging,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i18.Future<Map<String, dynamic>> prepareSendPublic({
+    required String? address,
+    required _i10.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #prepareSendPublic,
+          [],
+          {
+            #address: address,
+            #amount: amount,
+            #args: args,
+          },
+        ),
+        returnValue:
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
+  @override
+  _i18.Future<String> confirmSendPublic({dynamic txData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #confirmSendPublic,
+          [],
+          {#txData: txData},
+        ),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  _i18.Future<Map<String, dynamic>> prepareSend({
+    required String? address,
+    required _i10.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #prepareSend,
+          [],
+          {
+            #address: address,
+            #amount: amount,
+            #args: args,
+          },
+        ),
+        returnValue:
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
+  @override
+  _i18.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #confirmSend,
+          [],
+          {#txData: txData},
+        ),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  int estimateTxFee({
+    required int? vSize,
+    required int? feeRatePerKB,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateTxFee,
+          [],
+          {
+            #vSize: vSize,
+            #feeRatePerKB: feeRatePerKB,
+          },
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  dynamic coinSelection(
+    int? satoshiAmountToSend,
+    int? selectedTxFeeRate,
+    String? _recipientAddress,
+    bool? isSendAll, {
+    int? additionalOutputs = 0,
+    List<_i21.UTXO>? utxos,
+  }) =>
+      super.noSuchMethod(Invocation.method(
+        #coinSelection,
+        [
+          satoshiAmountToSend,
+          selectedTxFeeRate,
+          _recipientAddress,
+          isSendAll,
+        ],
+        {
+          #additionalOutputs: additionalOutputs,
+          #utxos: utxos,
+        },
+      ));
+  @override
+  _i18.Future<List<_i23.SigningData>> fetchBuildTxData(
+          List<_i21.UTXO>? utxosToUse) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchBuildTxData,
+          [utxosToUse],
+        ),
+        returnValue:
+            _i18.Future<List<_i23.SigningData>>.value(<_i23.SigningData>[]),
+      ) as _i18.Future<List<_i23.SigningData>>);
+  @override
+  _i18.Future<Map<String, dynamic>> buildTransaction({
+    required List<_i23.SigningData>? utxoSigningData,
+    required List<String>? recipients,
+    required List<int>? satoshiAmounts,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #buildTransaction,
+          [],
+          {
+            #utxoSigningData: utxoSigningData,
+            #recipients: recipients,
+            #satoshiAmounts: satoshiAmounts,
+          },
+        ),
+        returnValue:
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
+  @override
+  _i18.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+        Invocation.method(
+          #updateNode,
+          [shouldRefresh],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> initializeNew() => (super.noSuchMethod(
+        Invocation.method(
+          #initializeNew,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> initializeExisting() => (super.noSuchMethod(
+        Invocation.method(
+          #initializeExisting,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
+        Invocation.method(
+          #refreshIfThereIsNewData,
+          [],
+        ),
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
+  @override
+  _i18.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
+        Invocation.method(
+          #getAllTxsToWatch,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> refresh() => (super.noSuchMethod(
+        Invocation.method(
+          #refresh,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  List<Map<dynamic, _i8.LelantusCoin>> getLelantusCoinMap() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getLelantusCoinMap,
+          [],
+        ),
+        returnValue: <Map<dynamic, _i8.LelantusCoin>>[],
+      ) as List<Map<dynamic, _i8.LelantusCoin>>);
+  @override
+  _i18.Future<void> anonymizeAllPublicFunds() => (super.noSuchMethod(
+        Invocation.method(
+          #anonymizeAllPublicFunds,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<List<Map<String, dynamic>>> createMintsFromAmount(int? total) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #createMintsFromAmount,
+          [total],
+        ),
+        returnValue: _i18.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i18.Future<List<Map<String, dynamic>>>);
+  @override
+  _i18.Future<String> submitHexToNetwork(String? hex) => (super.noSuchMethod(
+        Invocation.method(
+          #submitHexToNetwork,
+          [hex],
+        ),
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
+  @override
+  _i18.Future<Map<String, dynamic>> buildMintTransaction(
+    List<_i21.UTXO>? utxosToUse,
+    int? satoshisPerRecipient,
+    List<Map<String, dynamic>>? mintsMap,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #buildMintTransaction,
+          [
+            utxosToUse,
+            satoshisPerRecipient,
+            mintsMap,
+          ],
+        ),
+        returnValue:
+            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i18.Future<Map<String, dynamic>>);
+  @override
+  _i18.Future<void> checkReceivingAddressForTransactions() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkReceivingAddressForTransactions,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> checkChangeAddressForTransactions() => (super.noSuchMethod(
+        Invocation.method(
+          #checkChangeAddressForTransactions,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> fullRescan(
+    int? maxUnusedAddressGap,
+    int? maxNumberOfIndexesToCheck,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fullRescan,
+          [
+            maxUnusedAddressGap,
+            maxNumberOfIndexesToCheck,
+          ],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> recoverFromMnemonic({
+    required String? mnemonic,
+    String? mnemonicPassphrase,
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+    required int? height,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #recoverFromMnemonic,
+          [],
+          {
+            #mnemonic: mnemonic,
+            #mnemonicPassphrase: mnemonicPassphrase,
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+            #height: height,
+          },
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<Map<int, dynamic>> getSetDataMap(int? latestSetId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getSetDataMap,
+          [latestSetId],
+        ),
+        returnValue: _i18.Future<Map<int, dynamic>>.value(<int, dynamic>{}),
+      ) as _i18.Future<Map<int, dynamic>>);
+  @override
+  _i18.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransactionCacheEarly,
+          [allAddresses],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<List<Map<String, dynamic>>> fetchAnonymitySets() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchAnonymitySets,
+          [],
+        ),
+        returnValue: _i18.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i18.Future<List<Map<String, dynamic>>>);
+  @override
+  _i18.Future<int> getLatestSetId() => (super.noSuchMethod(
+        Invocation.method(
+          #getLatestSetId,
+          [],
+        ),
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
+  @override
+  _i18.Future<List<String>> getUsedCoinSerials() => (super.noSuchMethod(
+        Invocation.method(
+          #getUsedCoinSerials,
+          [],
+        ),
+        returnValue: _i18.Future<List<String>>.value(<String>[]),
+      ) as _i18.Future<List<String>>);
+  @override
+  _i18.Future<void> exit() => (super.noSuchMethod(
+        Invocation.method(
+          #exit,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<dynamic> getCoinsToJoinSplit(int? required) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getCoinsToJoinSplit,
+          [required],
+        ),
+        returnValue: _i18.Future<dynamic>.value(),
+      ) as _i18.Future<dynamic>);
+  @override
+  _i18.Future<int> estimateJoinSplitFee(int? spendAmount) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateJoinSplitFee,
+          [spendAmount],
+        ),
+        returnValue: _i18.Future<int>.value(0),
+      ) as _i18.Future<int>);
+  @override
+  _i18.Future<_i10.Amount> estimateFeeFor(
+    _i10.Amount? amount,
+    int? feeRate,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFeeFor,
+          [
+            amount,
+            feeRate,
+          ],
+        ),
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
+          this,
+          Invocation.method(
+            #estimateFeeFor,
+            [
+              amount,
+              feeRate,
+            ],
+          ),
+        )),
+      ) as _i18.Future<_i10.Amount>);
+  @override
+  _i18.Future<_i10.Amount> estimateFeeForPublic(
+    _i10.Amount? amount,
+    int? feeRate,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFeeForPublic,
+          [
+            amount,
+            feeRate,
+          ],
+        ),
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
+          this,
+          Invocation.method(
+            #estimateFeeForPublic,
+            [
+              amount,
+              feeRate,
+            ],
+          ),
+        )),
+      ) as _i18.Future<_i10.Amount>);
+  @override
+  _i10.Amount roughFeeEstimate(
+    int? inputCount,
+    int? outputCount,
+    int? feeRatePerKB,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #roughFeeEstimate,
+          [
+            inputCount,
+            outputCount,
+            feeRatePerKB,
+          ],
+        ),
+        returnValue: _FakeAmount_7(
+          this,
+          Invocation.method(
+            #roughFeeEstimate,
+            [
+              inputCount,
+              outputCount,
+              feeRatePerKB,
+            ],
+          ),
+        ),
+      ) as _i10.Amount);
+  @override
+  _i18.Future<_i10.Amount> sweepAllEstimate(int? feeRate) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #sweepAllEstimate,
+          [feeRate],
+        ),
+        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
+          this,
+          Invocation.method(
+            #sweepAllEstimate,
+            [feeRate],
+          ),
+        )),
+      ) as _i18.Future<_i10.Amount>);
+  @override
+  _i18.Future<List<Map<String, dynamic>>> fastFetch(
+          List<String>? allTxHashes) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fastFetch,
+          [allTxHashes],
+        ),
+        returnValue: _i18.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i18.Future<List<Map<String, dynamic>>>);
+  @override
+  _i18.Future<Map<_i21.Address, _i21.Transaction>> getJMintTransactions(
+    _i13.CachedElectrumX? cachedClient,
+    List<String>? transactions,
+    _i17.Coin? coin,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getJMintTransactions,
+          [
+            cachedClient,
+            transactions,
+            coin,
+          ],
+        ),
+        returnValue: _i18.Future<Map<_i21.Address, _i21.Transaction>>.value(
+            <_i21.Address, _i21.Transaction>{}),
+      ) as _i18.Future<Map<_i21.Address, _i21.Transaction>>);
+  @override
+  _i18.Future<bool> generateNewAddress() => (super.noSuchMethod(
+        Invocation.method(
+          #generateNewAddress,
+          [],
+        ),
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
+  @override
+  _i10.Amount availablePrivateBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #availablePrivateBalance,
+          [],
+        ),
+        returnValue: _FakeAmount_7(
+          this,
+          Invocation.method(
+            #availablePrivateBalance,
+            [],
+          ),
+        ),
+      ) as _i10.Amount);
+  @override
+  _i10.Amount availablePublicBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #availablePublicBalance,
+          [],
+        ),
+        returnValue: _FakeAmount_7(
+          this,
+          Invocation.method(
+            #availablePublicBalance,
+            [],
+          ),
+        ),
+      ) as _i10.Amount);
+  @override
+  void initCache(
+    String? walletId,
+    _i17.Coin? coin,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #initCache,
+          [
+            walletId,
+            coin,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i18.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedId,
+          [id],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  int getCachedChainHeight() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedChainHeight,
+          [],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  _i18.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedChainHeight,
+          [height],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  bool getCachedIsFavorite() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedIsFavorite,
+          [],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i18.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedIsFavorite,
+          [isFavorite],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i9.Balance getCachedBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedBalance,
+          [],
+        ),
+        returnValue: _FakeBalance_6(
+          this,
+          Invocation.method(
+            #getCachedBalance,
+            [],
+          ),
+        ),
+      ) as _i9.Balance);
+  @override
+  _i18.Future<void> updateCachedBalance(_i9.Balance? balance) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedBalance,
+          [balance],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i9.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedBalanceSecondary,
+          [],
+        ),
+        returnValue: _FakeBalance_6(
+          this,
+          Invocation.method(
+            #getCachedBalanceSecondary,
+            [],
+          ),
+        ),
+      ) as _i9.Balance);
+  @override
+  _i18.Future<void> updateCachedBalanceSecondary(_i9.Balance? balance) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedBalanceSecondary,
+          [balance],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i18.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  void initWalletDB({_i14.MainDB? mockableOverride}) => super.noSuchMethod(
+        Invocation.method(
+          #initWalletDB,
+          [],
+          {#mockableOverride: mockableOverride},
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void initFiroHive(String? walletId) => super.noSuchMethod(
+        Invocation.method(
+          #initFiroHive,
+          [walletId],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i18.Future<void> firoUpdateJIndex(List<dynamic>? jIndex) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #firoUpdateJIndex,
+          [jIndex],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> firoUpdateLelantusCoins(List<dynamic>? lelantusCoins) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #firoUpdateLelantusCoins,
+          [lelantusCoins],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  int firoGetMintIndex() => (super.noSuchMethod(
+        Invocation.method(
+          #firoGetMintIndex,
+          [],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  _i18.Future<void> firoUpdateMintIndex(int? mintIndex) => (super.noSuchMethod(
+        Invocation.method(
+          #firoUpdateMintIndex,
+          [mintIndex],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+}
+
+/// A class which mocks [LocaleService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockLocaleService extends _i1.Mock implements _i24.LocaleService {
+  MockLocaleService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get locale => (super.noSuchMethod(
+        Invocation.getter(#locale),
+        returnValue: '',
+      ) as String);
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i18.Future<void> loadLocale({bool? notify = true}) => (super.noSuchMethod(
+        Invocation.method(
+          #loadLocale,
+          [],
+          {#notify: notify},
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [Prefs].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockPrefs extends _i1.Mock implements _i19.Prefs {
+  MockPrefs() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  bool get isInitialized => (super.noSuchMethod(
+        Invocation.getter(#isInitialized),
+        returnValue: false,
+      ) as bool);
+  @override
+  int get lastUnlockedTimeout => (super.noSuchMethod(
+        Invocation.getter(#lastUnlockedTimeout),
+        returnValue: 0,
+      ) as int);
+  @override
+  set lastUnlockedTimeout(int? lastUnlockedTimeout) => super.noSuchMethod(
+        Invocation.setter(
+          #lastUnlockedTimeout,
+          lastUnlockedTimeout,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get lastUnlocked => (super.noSuchMethod(
+        Invocation.getter(#lastUnlocked),
+        returnValue: 0,
+      ) as int);
+  @override
+  set lastUnlocked(int? lastUnlocked) => super.noSuchMethod(
+        Invocation.setter(
+          #lastUnlocked,
+          lastUnlocked,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get currentNotificationId => (super.noSuchMethod(
+        Invocation.getter(#currentNotificationId),
+        returnValue: 0,
+      ) as int);
+  @override
+  List<String> get walletIdsSyncOnStartup => (super.noSuchMethod(
+        Invocation.getter(#walletIdsSyncOnStartup),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  set walletIdsSyncOnStartup(List<String>? walletIdsSyncOnStartup) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #walletIdsSyncOnStartup,
+          walletIdsSyncOnStartup,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i25.SyncingType get syncType => (super.noSuchMethod(
+        Invocation.getter(#syncType),
+        returnValue: _i25.SyncingType.currentWalletOnly,
+      ) as _i25.SyncingType);
+  @override
+  set syncType(_i25.SyncingType? syncType) => super.noSuchMethod(
+        Invocation.setter(
+          #syncType,
+          syncType,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get wifiOnly => (super.noSuchMethod(
+        Invocation.getter(#wifiOnly),
+        returnValue: false,
+      ) as bool);
+  @override
+  set wifiOnly(bool? wifiOnly) => super.noSuchMethod(
+        Invocation.setter(
+          #wifiOnly,
+          wifiOnly,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get showFavoriteWallets => (super.noSuchMethod(
+        Invocation.getter(#showFavoriteWallets),
+        returnValue: false,
+      ) as bool);
+  @override
+  set showFavoriteWallets(bool? showFavoriteWallets) => super.noSuchMethod(
+        Invocation.setter(
+          #showFavoriteWallets,
+          showFavoriteWallets,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get language => (super.noSuchMethod(
+        Invocation.getter(#language),
+        returnValue: '',
+      ) as String);
+  @override
+  set language(String? newLanguage) => super.noSuchMethod(
+        Invocation.setter(
+          #language,
+          newLanguage,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String get currency => (super.noSuchMethod(
+        Invocation.getter(#currency),
+        returnValue: '',
+      ) as String);
+  @override
+  set currency(String? newCurrency) => super.noSuchMethod(
+        Invocation.setter(
+          #currency,
+          newCurrency,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get randomizePIN => (super.noSuchMethod(
+        Invocation.getter(#randomizePIN),
+        returnValue: false,
+      ) as bool);
+  @override
+  set randomizePIN(bool? randomizePIN) => super.noSuchMethod(
+        Invocation.setter(
+          #randomizePIN,
+          randomizePIN,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get useBiometrics => (super.noSuchMethod(
+        Invocation.getter(#useBiometrics),
+        returnValue: false,
+      ) as bool);
+  @override
+  set useBiometrics(bool? useBiometrics) => super.noSuchMethod(
+        Invocation.setter(
+          #useBiometrics,
+          useBiometrics,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get hasPin => (super.noSuchMethod(
+        Invocation.getter(#hasPin),
+        returnValue: false,
+      ) as bool);
+  @override
+  set hasPin(bool? hasPin) => super.noSuchMethod(
+        Invocation.setter(
+          #hasPin,
+          hasPin,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int get familiarity => (super.noSuchMethod(
+        Invocation.getter(#familiarity),
+        returnValue: 0,
+      ) as int);
+  @override
+  set familiarity(int? familiarity) => super.noSuchMethod(
+        Invocation.setter(
+          #familiarity,
+          familiarity,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get showTestNetCoins => (super.noSuchMethod(
+        Invocation.getter(#showTestNetCoins),
+        returnValue: false,
+      ) as bool);
+  @override
+  set showTestNetCoins(bool? showTestNetCoins) => super.noSuchMethod(
+        Invocation.setter(
+          #showTestNetCoins,
+          showTestNetCoins,
+        ),
+        returnValueForMissingStub: null,
       );
   @override
   bool get isAutoBackupEnabled => (super.noSuchMethod(
@@ -1318,12 +2366,12 @@ class MockPrefs extends _i1.Mock implements _i15.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  _i20.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
+  _i26.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
         Invocation.getter(#backupFrequencyType),
-        returnValue: _i20.BackupFrequencyType.everyTenMinutes,
-      ) as _i20.BackupFrequencyType);
+        returnValue: _i26.BackupFrequencyType.everyTenMinutes,
+      ) as _i26.BackupFrequencyType);
   @override
-  set backupFrequencyType(_i20.BackupFrequencyType? backupFrequencyType) =>
+  set backupFrequencyType(_i26.BackupFrequencyType? backupFrequencyType) =>
       super.noSuchMethod(
         Invocation.setter(
           #backupFrequencyType,
@@ -1461,51 +2509,51 @@ class MockPrefs extends _i1.Mock implements _i15.Prefs {
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<void> init() => (super.noSuchMethod(
+  _i18.Future<void> init() => (super.noSuchMethod(
         Invocation.method(
           #init,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> incrementCurrentNotificationIndex() => (super.noSuchMethod(
+  _i18.Future<void> incrementCurrentNotificationIndex() => (super.noSuchMethod(
         Invocation.method(
           #incrementCurrentNotificationIndex,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<bool> isExternalCallsSet() => (super.noSuchMethod(
+  _i18.Future<bool> isExternalCallsSet() => (super.noSuchMethod(
         Invocation.method(
           #isExternalCallsSet,
           [],
         ),
-        returnValue: _i14.Future<bool>.value(false),
-      ) as _i14.Future<bool>);
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
   @override
-  _i14.Future<void> saveUserID(String? userId) => (super.noSuchMethod(
+  _i18.Future<void> saveUserID(String? userId) => (super.noSuchMethod(
         Invocation.method(
           #saveUserID,
           [userId],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> saveSignupEpoch(int? signupEpoch) => (super.noSuchMethod(
+  _i18.Future<void> saveSignupEpoch(int? signupEpoch) => (super.noSuchMethod(
         Invocation.method(
           #saveSignupEpoch,
           [signupEpoch],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -1513,7 +2561,7 @@ class MockPrefs extends _i1.Mock implements _i15.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -1541,7 +2589,7 @@ class MockPrefs extends _i1.Mock implements _i15.Prefs {
 /// A class which mocks [PriceService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockPriceService extends _i1.Mock implements _i21.PriceService {
+class MockPriceService extends _i1.Mock implements _i27.PriceService {
   MockPriceService() {
     _i1.throwOnMissingStub(this);
   }
@@ -1560,9 +2608,14 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
         returnValueForMissingStub: null,
       );
   @override
+  Set<String> get tokenContractAddressesToCheck => (super.noSuchMethod(
+        Invocation.getter(#tokenContractAddressesToCheck),
+        returnValue: <String>{},
+      ) as Set<String>);
+  @override
   Duration get updateInterval => (super.noSuchMethod(
         Invocation.getter(#updateInterval),
-        returnValue: _FakeDuration_8(
+        returnValue: _FakeDuration_12(
           this,
           Invocation.getter(#updateInterval),
         ),
@@ -1573,29 +2626,44 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
         returnValue: false,
       ) as bool);
   @override
-  _i11.Tuple2<_i22.Decimal, double> getPrice(_i13.Coin? coin) =>
+  _i15.Tuple2<_i28.Decimal, double> getPrice(_i17.Coin? coin) =>
       (super.noSuchMethod(
         Invocation.method(
           #getPrice,
           [coin],
         ),
-        returnValue: _FakeTuple2_9<_i22.Decimal, double>(
+        returnValue: _FakeTuple2_13<_i28.Decimal, double>(
           this,
           Invocation.method(
             #getPrice,
             [coin],
           ),
         ),
-      ) as _i11.Tuple2<_i22.Decimal, double>);
+      ) as _i15.Tuple2<_i28.Decimal, double>);
+  @override
+  _i15.Tuple2<_i28.Decimal, double> getTokenPrice(String? contractAddress) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTokenPrice,
+          [contractAddress],
+        ),
+        returnValue: _FakeTuple2_13<_i28.Decimal, double>(
+          this,
+          Invocation.method(
+            #getTokenPrice,
+            [contractAddress],
+          ),
+        ),
+      ) as _i15.Tuple2<_i28.Decimal, double>);
   @override
-  _i14.Future<void> updatePrice() => (super.noSuchMethod(
+  _i18.Future<void> updatePrice() => (super.noSuchMethod(
         Invocation.method(
           #updatePrice,
           [],
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
   void cancel() => super.noSuchMethod(
         Invocation.method(
@@ -1621,7 +2689,7 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
         returnValueForMissingStub: null,
       );
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -1629,7 +2697,7 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -1649,7 +2717,7 @@ class MockPriceService extends _i1.Mock implements _i21.PriceService {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i23.NotesService {
+class MockNotesService extends _i1.Mock implements _i29.NotesService {
   MockNotesService() {
     _i1.throwOnMissingStub(this);
   }
@@ -1665,35 +2733,35 @@ class MockNotesService extends _i1.Mock implements _i23.NotesService {
         returnValue: <String, String>{},
       ) as Map<String, String>);
   @override
-  _i14.Future<Map<String, String>> get notes => (super.noSuchMethod(
+  _i18.Future<Map<String, String>> get notes => (super.noSuchMethod(
         Invocation.getter(#notes),
-        returnValue: _i14.Future<Map<String, String>>.value(<String, String>{}),
-      ) as _i14.Future<Map<String, String>>);
+        returnValue: _i18.Future<Map<String, String>>.value(<String, String>{}),
+      ) as _i18.Future<Map<String, String>>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
   @override
-  _i14.Future<Map<String, String>> search(String? text) => (super.noSuchMethod(
+  _i18.Future<Map<String, String>> search(String? text) => (super.noSuchMethod(
         Invocation.method(
           #search,
           [text],
         ),
-        returnValue: _i14.Future<Map<String, String>>.value(<String, String>{}),
-      ) as _i14.Future<Map<String, String>>);
+        returnValue: _i18.Future<Map<String, String>>.value(<String, String>{}),
+      ) as _i18.Future<Map<String, String>>);
   @override
-  _i14.Future<String> getNoteFor({required String? txid}) =>
+  _i18.Future<String> getNoteFor({required String? txid}) =>
       (super.noSuchMethod(
         Invocation.method(
           #getNoteFor,
           [],
           {#txid: txid},
         ),
-        returnValue: _i14.Future<String>.value(''),
-      ) as _i14.Future<String>);
+        returnValue: _i18.Future<String>.value(''),
+      ) as _i18.Future<String>);
   @override
-  _i14.Future<void> editOrAddNote({
+  _i18.Future<void> editOrAddNote({
     required String? txid,
     required String? note,
   }) =>
@@ -1706,21 +2774,21 @@ class MockNotesService extends _i1.Mock implements _i23.NotesService {
             #note: note,
           },
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  _i14.Future<void> deleteNote({required String? txid}) => (super.noSuchMethod(
+  _i18.Future<void> deleteNote({required String? txid}) => (super.noSuchMethod(
         Invocation.method(
           #deleteNote,
           [],
           {#txid: txid},
         ),
-        returnValue: _i14.Future<void>.value(),
-        returnValueForMissingStub: _i14.Future<void>.value(),
-      ) as _i14.Future<void>);
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
   @override
-  void addListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -1728,7 +2796,7 @@ class MockNotesService extends _i1.Mock implements _i23.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i16.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -1752,3 +2820,102 @@ class MockNotesService extends _i1.Mock implements _i23.NotesService {
         returnValueForMissingStub: null,
       );
 }
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i30.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i14.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_11(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i14.MainDB);
+  @override
+  List<_i31.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i31.StackTheme>[],
+      ) as List<_i31.StackTheme>);
+  @override
+  void init(_i14.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i18.Future<void> install({required _i32.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i18.Future<void>.value(),
+        returnValueForMissingStub: _i18.Future<void>.value(),
+      ) as _i18.Future<void>);
+  @override
+  _i18.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i18.Future<bool>.value(false),
+      ) as _i18.Future<bool>);
+  @override
+  _i18.Future<List<_i30.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i18.Future<List<_i30.StackThemeMetaData>>.value(
+            <_i30.StackThemeMetaData>[]),
+      ) as _i18.Future<List<_i30.StackThemeMetaData>>);
+  @override
+  _i18.Future<_i32.Uint8List> fetchTheme(
+          {required _i30.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i18.Future<_i32.Uint8List>.value(_i32.Uint8List(0)),
+      ) as _i18.Future<_i32.Uint8List>);
+  @override
+  _i31.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i31.StackTheme?);
+}
diff --git a/test/widget_tests/wallet_card_test.mocks.dart b/test/widget_tests/wallet_card_test.mocks.dart
new file mode 100644
index 000000000..af955c477
--- /dev/null
+++ b/test/widget_tests/wallet_card_test.mocks.dart
@@ -0,0 +1,1861 @@
+// Mocks generated by Mockito 5.3.2 from annotations
+// in stackwallet/test/widget_tests/wallet_card_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i21;
+import 'dart:typed_data' as _i28;
+import 'dart:ui' as _i23;
+
+import 'package:bip32/bip32.dart' as _i16;
+import 'package:bip47/bip47.dart' as _i18;
+import 'package:bitcoindart/bitcoindart.dart' as _i13;
+import 'package:flutter/foundation.dart' as _i4;
+import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:stackwallet/db/isar/main_db.dart' as _i12;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i10;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i9;
+import 'package:stackwallet/models/balance.dart' as _i11;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i31;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i8;
+import 'package:stackwallet/models/signing_data.dart' as _i26;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i24;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/locale_service.dart' as _i29;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i7;
+import 'package:stackwallet/services/wallets.dart' as _i19;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i30;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i20;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i25;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
+    as _i27;
+import 'package:stackwallet/utilities/prefs.dart' as _i22;
+import 'package:tuple/tuple.dart' as _i15;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeWalletsService_0 extends _i1.SmartFake
+    implements _i2.WalletsService {
+  _FakeWalletsService_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeNodeService_1 extends _i1.SmartFake implements _i3.NodeService {
+  _FakeNodeService_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeChangeNotifierProvider_2<Notifier extends _i4.ChangeNotifier?>
+    extends _i1.SmartFake implements _i5.ChangeNotifierProvider<Notifier> {
+  _FakeChangeNotifierProvider_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
+  _FakeManager_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
+    implements _i7.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_4(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
+  _FakeFeeObject_5(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
+  _FakeElectrumX_6(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeCachedElectrumX_7 extends _i1.SmartFake
+    implements _i10.CachedElectrumX {
+  _FakeCachedElectrumX_7(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
+  _FakeBalance_8(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeMainDB_9 extends _i1.SmartFake implements _i12.MainDB {
+  _FakeMainDB_9(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeNetworkType_10 extends _i1.SmartFake implements _i13.NetworkType {
+  _FakeNetworkType_10(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeElectrumXNode_11 extends _i1.SmartFake implements _i9.ElectrumXNode {
+  _FakeElectrumXNode_11(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeAmount_12 extends _i1.SmartFake implements _i14.Amount {
+  _FakeAmount_12(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeTuple2_13<T1, T2> extends _i1.SmartFake
+    implements _i15.Tuple2<T1, T2> {
+  _FakeTuple2_13(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeBIP32_14 extends _i1.SmartFake implements _i16.BIP32 {
+  _FakeBIP32_14(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeAddress_15 extends _i1.SmartFake implements _i17.Address {
+  _FakeAddress_15(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakePaymentCode_16 extends _i1.SmartFake implements _i18.PaymentCode {
+  _FakePaymentCode_16(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [Wallets].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockWallets extends _i1.Mock implements _i19.Wallets {
+  MockWallets() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i2.WalletsService get walletsService => (super.noSuchMethod(
+        Invocation.getter(#walletsService),
+        returnValue: _FakeWalletsService_0(
+          this,
+          Invocation.getter(#walletsService),
+        ),
+      ) as _i2.WalletsService);
+  @override
+  set walletsService(_i2.WalletsService? _walletsService) => super.noSuchMethod(
+        Invocation.setter(
+          #walletsService,
+          _walletsService,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i3.NodeService get nodeService => (super.noSuchMethod(
+        Invocation.getter(#nodeService),
+        returnValue: _FakeNodeService_1(
+          this,
+          Invocation.getter(#nodeService),
+        ),
+      ) as _i3.NodeService);
+  @override
+  set nodeService(_i3.NodeService? _nodeService) => super.noSuchMethod(
+        Invocation.setter(
+          #nodeService,
+          _nodeService,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get hasWallets => (super.noSuchMethod(
+        Invocation.getter(#hasWallets),
+        returnValue: false,
+      ) as bool);
+  @override
+  List<_i5.ChangeNotifierProvider<_i6.Manager>> get managerProviders =>
+      (super.noSuchMethod(
+        Invocation.getter(#managerProviders),
+        returnValue: <_i5.ChangeNotifierProvider<_i6.Manager>>[],
+      ) as List<_i5.ChangeNotifierProvider<_i6.Manager>>);
+  @override
+  List<_i6.Manager> get managers => (super.noSuchMethod(
+        Invocation.getter(#managers),
+        returnValue: <_i6.Manager>[],
+      ) as List<_i6.Manager>);
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+      ) as bool);
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  List<String> getWalletIdsFor({required _i20.Coin? coin}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getWalletIdsFor,
+          [],
+          {#coin: coin},
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  List<_i15.Tuple2<_i20.Coin, List<_i5.ChangeNotifierProvider<_i6.Manager>>>>
+      getManagerProvidersByCoin() => (super.noSuchMethod(
+            Invocation.method(
+              #getManagerProvidersByCoin,
+              [],
+            ),
+            returnValue: <
+                _i15.Tuple2<_i20.Coin,
+                    List<_i5.ChangeNotifierProvider<_i6.Manager>>>>[],
+          ) as List<
+              _i15.Tuple2<_i20.Coin,
+                  List<_i5.ChangeNotifierProvider<_i6.Manager>>>>);
+  @override
+  List<_i5.ChangeNotifierProvider<_i6.Manager>> getManagerProvidersForCoin(
+          _i20.Coin? coin) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getManagerProvidersForCoin,
+          [coin],
+        ),
+        returnValue: <_i5.ChangeNotifierProvider<_i6.Manager>>[],
+      ) as List<_i5.ChangeNotifierProvider<_i6.Manager>>);
+  @override
+  _i5.ChangeNotifierProvider<_i6.Manager> getManagerProvider(
+          String? walletId) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getManagerProvider,
+          [walletId],
+        ),
+        returnValue: _FakeChangeNotifierProvider_2<_i6.Manager>(
+          this,
+          Invocation.method(
+            #getManagerProvider,
+            [walletId],
+          ),
+        ),
+      ) as _i5.ChangeNotifierProvider<_i6.Manager>);
+  @override
+  _i6.Manager getManager(String? walletId) => (super.noSuchMethod(
+        Invocation.method(
+          #getManager,
+          [walletId],
+        ),
+        returnValue: _FakeManager_3(
+          this,
+          Invocation.method(
+            #getManager,
+            [walletId],
+          ),
+        ),
+      ) as _i6.Manager);
+  @override
+  void addWallet({
+    required String? walletId,
+    required _i6.Manager? manager,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #addWallet,
+          [],
+          {
+            #walletId: walletId,
+            #manager: manager,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void removeWallet({required String? walletId}) => super.noSuchMethod(
+        Invocation.method(
+          #removeWallet,
+          [],
+          {#walletId: walletId},
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> load(_i22.Prefs? prefs) => (super.noSuchMethod(
+        Invocation.method(
+          #load,
+          [prefs],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> loadAfterStackRestore(
+    _i22.Prefs? prefs,
+    List<_i6.Manager>? managers,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #loadAfterStackRestore,
+          [
+            prefs,
+            managers,
+          ],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  void addListener(_i23.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void removeListener(_i23.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [BitcoinWallet].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockBitcoinWallet extends _i1.Mock implements _i24.BitcoinWallet {
+  MockBitcoinWallet() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  set timer(_i21.Timer? _timer) => super.noSuchMethod(
+        Invocation.setter(
+          #timer,
+          _timer,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i7.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+        Invocation.getter(#txTracker),
+        returnValue: _FakeTransactionNotificationTracker_4(
+          this,
+          Invocation.getter(#txTracker),
+        ),
+      ) as _i7.TransactionNotificationTracker);
+  @override
+  set txTracker(_i7.TransactionNotificationTracker? _txTracker) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #txTracker,
+          _txTracker,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get longMutex => (super.noSuchMethod(
+        Invocation.getter(#longMutex),
+        returnValue: false,
+      ) as bool);
+  @override
+  set longMutex(bool? _longMutex) => super.noSuchMethod(
+        Invocation.setter(
+          #longMutex,
+          _longMutex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get refreshMutex => (super.noSuchMethod(
+        Invocation.getter(#refreshMutex),
+        returnValue: false,
+      ) as bool);
+  @override
+  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
+        Invocation.setter(
+          #refreshMutex,
+          _refreshMutex,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get isActive => (super.noSuchMethod(
+        Invocation.getter(#isActive),
+        returnValue: false,
+      ) as bool);
+  @override
+  set isActive(bool? _isActive) => super.noSuchMethod(
+        Invocation.setter(
+          #isActive,
+          _isActive,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  set isFavorite(bool? markFavorite) => super.noSuchMethod(
+        Invocation.setter(
+          #isFavorite,
+          markFavorite,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get isFavorite => (super.noSuchMethod(
+        Invocation.getter(#isFavorite),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i20.Coin get coin => (super.noSuchMethod(
+        Invocation.getter(#coin),
+        returnValue: _i20.Coin.bitcoin,
+      ) as _i20.Coin);
+  @override
+  _i21.Future<List<_i17.UTXO>> get utxos => (super.noSuchMethod(
+        Invocation.getter(#utxos),
+        returnValue: _i21.Future<List<_i17.UTXO>>.value(<_i17.UTXO>[]),
+      ) as _i21.Future<List<_i17.UTXO>>);
+  @override
+  _i21.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
+        Invocation.getter(#transactions),
+        returnValue:
+            _i21.Future<List<_i17.Transaction>>.value(<_i17.Transaction>[]),
+      ) as _i21.Future<List<_i17.Transaction>>);
+  @override
+  _i21.Future<String> get currentReceivingAddress => (super.noSuchMethod(
+        Invocation.getter(#currentReceivingAddress),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<String> get currentChangeAddress => (super.noSuchMethod(
+        Invocation.getter(#currentChangeAddress),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<String> get currentChangeAddressP2PKH => (super.noSuchMethod(
+        Invocation.getter(#currentChangeAddressP2PKH),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  bool get hasCalledExit => (super.noSuchMethod(
+        Invocation.getter(#hasCalledExit),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i21.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+        Invocation.getter(#fees),
+        returnValue: _i21.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+          this,
+          Invocation.getter(#fees),
+        )),
+      ) as _i21.Future<_i8.FeeObject>);
+  @override
+  _i21.Future<int> get maxFee => (super.noSuchMethod(
+        Invocation.getter(#maxFee),
+        returnValue: _i21.Future<int>.value(0),
+      ) as _i21.Future<int>);
+  @override
+  _i21.Future<List<String>> get mnemonic => (super.noSuchMethod(
+        Invocation.getter(#mnemonic),
+        returnValue: _i21.Future<List<String>>.value(<String>[]),
+      ) as _i21.Future<List<String>>);
+  @override
+  _i21.Future<String?> get mnemonicString => (super.noSuchMethod(
+        Invocation.getter(#mnemonicString),
+        returnValue: _i21.Future<String?>.value(),
+      ) as _i21.Future<String?>);
+  @override
+  _i21.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
+        Invocation.getter(#mnemonicPassphrase),
+        returnValue: _i21.Future<String?>.value(),
+      ) as _i21.Future<String?>);
+  @override
+  _i21.Future<int> get chainHeight => (super.noSuchMethod(
+        Invocation.getter(#chainHeight),
+        returnValue: _i21.Future<int>.value(0),
+      ) as _i21.Future<int>);
+  @override
+  int get storedChainHeight => (super.noSuchMethod(
+        Invocation.getter(#storedChainHeight),
+        returnValue: 0,
+      ) as int);
+  @override
+  bool get shouldAutoSync => (super.noSuchMethod(
+        Invocation.getter(#shouldAutoSync),
+        returnValue: false,
+      ) as bool);
+  @override
+  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
+        Invocation.setter(
+          #shouldAutoSync,
+          shouldAutoSync,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get isRefreshing => (super.noSuchMethod(
+        Invocation.getter(#isRefreshing),
+        returnValue: false,
+      ) as bool);
+  @override
+  bool get isConnected => (super.noSuchMethod(
+        Invocation.getter(#isConnected),
+        returnValue: false,
+      ) as bool);
+  @override
+  String get walletId => (super.noSuchMethod(
+        Invocation.getter(#walletId),
+        returnValue: '',
+      ) as String);
+  @override
+  String get walletName => (super.noSuchMethod(
+        Invocation.getter(#walletName),
+        returnValue: '',
+      ) as String);
+  @override
+  set walletName(String? newName) => super.noSuchMethod(
+        Invocation.setter(
+          #walletName,
+          newName,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i9.ElectrumX get electrumXClient => (super.noSuchMethod(
+        Invocation.getter(#electrumXClient),
+        returnValue: _FakeElectrumX_6(
+          this,
+          Invocation.getter(#electrumXClient),
+        ),
+      ) as _i9.ElectrumX);
+  @override
+  _i10.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+        Invocation.getter(#cachedElectrumXClient),
+        returnValue: _FakeCachedElectrumX_7(
+          this,
+          Invocation.getter(#cachedElectrumXClient),
+        ),
+      ) as _i10.CachedElectrumX);
+  @override
+  _i11.Balance get balance => (super.noSuchMethod(
+        Invocation.getter(#balance),
+        returnValue: _FakeBalance_8(
+          this,
+          Invocation.getter(#balance),
+        ),
+      ) as _i11.Balance);
+  @override
+  _i21.Future<String> get xpub => (super.noSuchMethod(
+        Invocation.getter(#xpub),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #onIsActiveWalletChanged,
+          _onIsActiveWalletChanged,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i12.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_9(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i12.MainDB);
+  @override
+  _i13.NetworkType get networkType => (super.noSuchMethod(
+        Invocation.getter(#networkType),
+        returnValue: _FakeNetworkType_10(
+          this,
+          Invocation.getter(#networkType),
+        ),
+      ) as _i13.NetworkType);
+  @override
+  _i21.Future<void> exit() => (super.noSuchMethod(
+        Invocation.method(
+          #exit,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i25.DerivePathType addressType({required String? address}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #addressType,
+          [],
+          {#address: address},
+        ),
+        returnValue: _i25.DerivePathType.bip44,
+      ) as _i25.DerivePathType);
+  @override
+  _i21.Future<void> recoverFromMnemonic({
+    required String? mnemonic,
+    String? mnemonicPassphrase,
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+    required int? height,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #recoverFromMnemonic,
+          [],
+          {
+            #mnemonic: mnemonic,
+            #mnemonicPassphrase: mnemonicPassphrase,
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+            #height: height,
+          },
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTransactionCacheEarly,
+          [allAddresses],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
+        Invocation.method(
+          #refreshIfThereIsNewData,
+          [],
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  _i21.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
+        Invocation.method(
+          #getAllTxsToWatch,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> refresh() => (super.noSuchMethod(
+        Invocation.method(
+          #refresh,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<Map<String, dynamic>> prepareSend({
+    required String? address,
+    required _i14.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #prepareSend,
+          [],
+          {
+            #address: address,
+            #amount: amount,
+            #args: args,
+          },
+        ),
+        returnValue:
+            _i21.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i21.Future<Map<String, dynamic>>);
+  @override
+  _i21.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #confirmSend,
+          [],
+          {#txData: txData},
+        ),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<bool> testNetworkConnection() => (super.noSuchMethod(
+        Invocation.method(
+          #testNetworkConnection,
+          [],
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  void startNetworkAlivePinging() => super.noSuchMethod(
+        Invocation.method(
+          #startNetworkAlivePinging,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void stopNetworkAlivePinging() => super.noSuchMethod(
+        Invocation.method(
+          #stopNetworkAlivePinging,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> initializeNew() => (super.noSuchMethod(
+        Invocation.method(
+          #initializeNew,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> initializeExisting() => (super.noSuchMethod(
+        Invocation.method(
+          #initializeExisting,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateSentCachedTxData,
+          [txData],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  bool validateAddress(String? address) => (super.noSuchMethod(
+        Invocation.method(
+          #validateAddress,
+          [address],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i21.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
+        Invocation.method(
+          #updateNode,
+          [shouldRefresh],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<_i9.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+        Invocation.method(
+          #getCurrentNode,
+          [],
+        ),
+        returnValue: _i21.Future<_i9.ElectrumXNode>.value(_FakeElectrumXNode_11(
+          this,
+          Invocation.method(
+            #getCurrentNode,
+            [],
+          ),
+        )),
+      ) as _i21.Future<_i9.ElectrumXNode>);
+  @override
+  _i21.Future<List<Map<String, dynamic>>> fastFetch(
+          List<String>? allTxHashes) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fastFetch,
+          [allTxHashes],
+        ),
+        returnValue: _i21.Future<List<Map<String, dynamic>>>.value(
+            <Map<String, dynamic>>[]),
+      ) as _i21.Future<List<Map<String, dynamic>>>);
+  @override
+  _i21.Future<int> getTxCount({required String? address}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getTxCount,
+          [],
+          {#address: address},
+        ),
+        returnValue: _i21.Future<int>.value(0),
+      ) as _i21.Future<int>);
+  @override
+  _i21.Future<void> checkCurrentReceivingAddressesForTransactions() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkCurrentReceivingAddressesForTransactions,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> checkCurrentChangeAddressesForTransactions() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkCurrentChangeAddressesForTransactions,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  int estimateTxFee({
+    required int? vSize,
+    required int? feeRatePerKB,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateTxFee,
+          [],
+          {
+            #vSize: vSize,
+            #feeRatePerKB: feeRatePerKB,
+          },
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  dynamic coinSelection({
+    required int? satoshiAmountToSend,
+    required int? selectedTxFeeRate,
+    required String? recipientAddress,
+    required bool? coinControl,
+    required bool? isSendAll,
+    int? additionalOutputs = 0,
+    List<_i17.UTXO>? utxos,
+  }) =>
+      super.noSuchMethod(Invocation.method(
+        #coinSelection,
+        [],
+        {
+          #satoshiAmountToSend: satoshiAmountToSend,
+          #selectedTxFeeRate: selectedTxFeeRate,
+          #recipientAddress: recipientAddress,
+          #coinControl: coinControl,
+          #isSendAll: isSendAll,
+          #additionalOutputs: additionalOutputs,
+          #utxos: utxos,
+        },
+      ));
+  @override
+  _i21.Future<List<_i26.SigningData>> fetchBuildTxData(
+          List<_i17.UTXO>? utxosToUse) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchBuildTxData,
+          [utxosToUse],
+        ),
+        returnValue:
+            _i21.Future<List<_i26.SigningData>>.value(<_i26.SigningData>[]),
+      ) as _i21.Future<List<_i26.SigningData>>);
+  @override
+  _i21.Future<Map<String, dynamic>> buildTransaction({
+    required List<_i26.SigningData>? utxoSigningData,
+    required List<String>? recipients,
+    required List<int>? satoshiAmounts,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #buildTransaction,
+          [],
+          {
+            #utxoSigningData: utxoSigningData,
+            #recipients: recipients,
+            #satoshiAmounts: satoshiAmounts,
+          },
+        ),
+        returnValue:
+            _i21.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i21.Future<Map<String, dynamic>>);
+  @override
+  _i21.Future<void> fullRescan(
+    int? maxUnusedAddressGap,
+    int? maxNumberOfIndexesToCheck,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fullRescan,
+          [
+            maxUnusedAddressGap,
+            maxNumberOfIndexesToCheck,
+          ],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<_i14.Amount> estimateFeeFor(
+    _i14.Amount? amount,
+    int? feeRate,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #estimateFeeFor,
+          [
+            amount,
+            feeRate,
+          ],
+        ),
+        returnValue: _i21.Future<_i14.Amount>.value(_FakeAmount_12(
+          this,
+          Invocation.method(
+            #estimateFeeFor,
+            [
+              amount,
+              feeRate,
+            ],
+          ),
+        )),
+      ) as _i21.Future<_i14.Amount>);
+  @override
+  _i14.Amount roughFeeEstimate(
+    int? inputCount,
+    int? outputCount,
+    int? feeRatePerKB,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #roughFeeEstimate,
+          [
+            inputCount,
+            outputCount,
+            feeRatePerKB,
+          ],
+        ),
+        returnValue: _FakeAmount_12(
+          this,
+          Invocation.method(
+            #roughFeeEstimate,
+            [
+              inputCount,
+              outputCount,
+              feeRatePerKB,
+            ],
+          ),
+        ),
+      ) as _i14.Amount);
+  @override
+  _i21.Future<_i14.Amount> sweepAllEstimate(int? feeRate) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #sweepAllEstimate,
+          [feeRate],
+        ),
+        returnValue: _i21.Future<_i14.Amount>.value(_FakeAmount_12(
+          this,
+          Invocation.method(
+            #sweepAllEstimate,
+            [feeRate],
+          ),
+        )),
+      ) as _i21.Future<_i14.Amount>);
+  @override
+  _i21.Future<bool> generateNewAddress() => (super.noSuchMethod(
+        Invocation.method(
+          #generateNewAddress,
+          [],
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  void initCache(
+    String? walletId,
+    _i20.Coin? coin,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #initCache,
+          [
+            walletId,
+            coin,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedId,
+          [id],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  int getCachedChainHeight() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedChainHeight,
+          [],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  _i21.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedChainHeight,
+          [height],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  bool getCachedIsFavorite() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedIsFavorite,
+          [],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i21.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedIsFavorite,
+          [isFavorite],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i11.Balance getCachedBalance() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedBalance,
+          [],
+        ),
+        returnValue: _FakeBalance_8(
+          this,
+          Invocation.method(
+            #getCachedBalance,
+            [],
+          ),
+        ),
+      ) as _i11.Balance);
+  @override
+  _i21.Future<void> updateCachedBalance(_i11.Balance? balance) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedBalance,
+          [balance],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i11.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+        Invocation.method(
+          #getCachedBalanceSecondary,
+          [],
+        ),
+        returnValue: _FakeBalance_8(
+          this,
+          Invocation.method(
+            #getCachedBalanceSecondary,
+            [],
+          ),
+        ),
+      ) as _i11.Balance);
+  @override
+  _i21.Future<void> updateCachedBalanceSecondary(_i11.Balance? balance) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateCachedBalanceSecondary,
+          [balance],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i21.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
+        Invocation.method(
+          #initWalletDB,
+          [],
+          {#mockableOverride: mockableOverride},
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<_i15.Tuple2<_i17.Transaction, _i17.Address>> parseTransaction(
+    Map<String, dynamic>? txData,
+    dynamic electrumxClient,
+    List<_i17.Address>? myAddresses,
+    _i20.Coin? coin,
+    int? minConfirms,
+    String? walletId,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #parseTransaction,
+          [
+            txData,
+            electrumxClient,
+            myAddresses,
+            coin,
+            minConfirms,
+            walletId,
+          ],
+        ),
+        returnValue:
+            _i21.Future<_i15.Tuple2<_i17.Transaction, _i17.Address>>.value(
+                _FakeTuple2_13<_i17.Transaction, _i17.Address>(
+          this,
+          Invocation.method(
+            #parseTransaction,
+            [
+              txData,
+              electrumxClient,
+              myAddresses,
+              coin,
+              minConfirms,
+              walletId,
+            ],
+          ),
+        )),
+      ) as _i21.Future<_i15.Tuple2<_i17.Transaction, _i17.Address>>);
+  @override
+  void initPaynymWalletInterface({
+    required String? walletId,
+    required String? walletName,
+    required _i13.NetworkType? network,
+    required _i20.Coin? coin,
+    required _i12.MainDB? db,
+    required _i9.ElectrumX? electrumXClient,
+    required _i27.SecureStorageInterface? secureStorage,
+    required int? dustLimit,
+    required int? dustLimitP2PKH,
+    required int? minConfirms,
+    required _i21.Future<String?> Function()? getMnemonicString,
+    required _i21.Future<String?> Function()? getMnemonicPassphrase,
+    required _i21.Future<int> Function()? getChainHeight,
+    required _i21.Future<String> Function()? getCurrentChangeAddress,
+    required int Function({
+      required int feeRatePerKB,
+      required int vSize,
+    })?
+        estimateTxFee,
+    required _i21.Future<Map<String, dynamic>> Function({
+      required String address,
+      required _i14.Amount amount,
+      Map<String, dynamic>? args,
+    })?
+        prepareSend,
+    required _i21.Future<int> Function({required String address})? getTxCount,
+    required _i21.Future<List<_i26.SigningData>> Function(List<_i17.UTXO>)?
+        fetchBuildTxData,
+    required _i21.Future<void> Function()? refresh,
+    required _i21.Future<void> Function()? checkChangeAddressForTransactions,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #initPaynymWalletInterface,
+          [],
+          {
+            #walletId: walletId,
+            #walletName: walletName,
+            #network: network,
+            #coin: coin,
+            #db: db,
+            #electrumXClient: electrumXClient,
+            #secureStorage: secureStorage,
+            #dustLimit: dustLimit,
+            #dustLimitP2PKH: dustLimitP2PKH,
+            #minConfirms: minConfirms,
+            #getMnemonicString: getMnemonicString,
+            #getMnemonicPassphrase: getMnemonicPassphrase,
+            #getChainHeight: getChainHeight,
+            #getCurrentChangeAddress: getCurrentChangeAddress,
+            #estimateTxFee: estimateTxFee,
+            #prepareSend: prepareSend,
+            #getTxCount: getTxCount,
+            #fetchBuildTxData: fetchBuildTxData,
+            #refresh: refresh,
+            #checkChangeAddressForTransactions:
+                checkChangeAddressForTransactions,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<_i16.BIP32> getBip47BaseNode() => (super.noSuchMethod(
+        Invocation.method(
+          #getBip47BaseNode,
+          [],
+        ),
+        returnValue: _i21.Future<_i16.BIP32>.value(_FakeBIP32_14(
+          this,
+          Invocation.method(
+            #getBip47BaseNode,
+            [],
+          ),
+        )),
+      ) as _i21.Future<_i16.BIP32>);
+  @override
+  _i21.Future<_i28.Uint8List> getPrivateKeyForPaynymReceivingAddress({
+    required String? paymentCodeString,
+    required int? index,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getPrivateKeyForPaynymReceivingAddress,
+          [],
+          {
+            #paymentCodeString: paymentCodeString,
+            #index: index,
+          },
+        ),
+        returnValue: _i21.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i21.Future<_i28.Uint8List>);
+  @override
+  _i21.Future<_i17.Address> currentReceivingPaynymAddress({
+    required _i18.PaymentCode? sender,
+    required bool? isSegwit,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #currentReceivingPaynymAddress,
+          [],
+          {
+            #sender: sender,
+            #isSegwit: isSegwit,
+          },
+        ),
+        returnValue: _i21.Future<_i17.Address>.value(_FakeAddress_15(
+          this,
+          Invocation.method(
+            #currentReceivingPaynymAddress,
+            [],
+            {
+              #sender: sender,
+              #isSegwit: isSegwit,
+            },
+          ),
+        )),
+      ) as _i21.Future<_i17.Address>);
+  @override
+  _i21.Future<void> checkCurrentPaynymReceivingAddressForTransactions({
+    required _i18.PaymentCode? sender,
+    required bool? isSegwit,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkCurrentPaynymReceivingAddressForTransactions,
+          [],
+          {
+            #sender: sender,
+            #isSegwit: isSegwit,
+          },
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> checkAllCurrentReceivingPaynymAddressesForTransactions() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkAllCurrentReceivingPaynymAddressesForTransactions,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<_i16.BIP32> deriveNotificationBip32Node() => (super.noSuchMethod(
+        Invocation.method(
+          #deriveNotificationBip32Node,
+          [],
+        ),
+        returnValue: _i21.Future<_i16.BIP32>.value(_FakeBIP32_14(
+          this,
+          Invocation.method(
+            #deriveNotificationBip32Node,
+            [],
+          ),
+        )),
+      ) as _i21.Future<_i16.BIP32>);
+  @override
+  _i21.Future<_i18.PaymentCode> getPaymentCode({required bool? isSegwit}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getPaymentCode,
+          [],
+          {#isSegwit: isSegwit},
+        ),
+        returnValue: _i21.Future<_i18.PaymentCode>.value(_FakePaymentCode_16(
+          this,
+          Invocation.method(
+            #getPaymentCode,
+            [],
+            {#isSegwit: isSegwit},
+          ),
+        )),
+      ) as _i21.Future<_i18.PaymentCode>);
+  @override
+  _i21.Future<_i28.Uint8List> signWithNotificationKey(_i28.Uint8List? data) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #signWithNotificationKey,
+          [data],
+        ),
+        returnValue: _i21.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i21.Future<_i28.Uint8List>);
+  @override
+  _i21.Future<String> signStringWithNotificationKey(String? data) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #signStringWithNotificationKey,
+          [data],
+        ),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<Map<String, dynamic>> preparePaymentCodeSend({
+    required _i18.PaymentCode? paymentCode,
+    required bool? isSegwit,
+    required _i14.Amount? amount,
+    Map<String, dynamic>? args,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #preparePaymentCodeSend,
+          [],
+          {
+            #paymentCode: paymentCode,
+            #isSegwit: isSegwit,
+            #amount: amount,
+            #args: args,
+          },
+        ),
+        returnValue:
+            _i21.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i21.Future<Map<String, dynamic>>);
+  @override
+  _i21.Future<_i17.Address> nextUnusedSendAddressFrom({
+    required _i18.PaymentCode? pCode,
+    required bool? isSegwit,
+    required _i16.BIP32? privateKeyNode,
+    int? startIndex = 0,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #nextUnusedSendAddressFrom,
+          [],
+          {
+            #pCode: pCode,
+            #isSegwit: isSegwit,
+            #privateKeyNode: privateKeyNode,
+            #startIndex: startIndex,
+          },
+        ),
+        returnValue: _i21.Future<_i17.Address>.value(_FakeAddress_15(
+          this,
+          Invocation.method(
+            #nextUnusedSendAddressFrom,
+            [],
+            {
+              #pCode: pCode,
+              #isSegwit: isSegwit,
+              #privateKeyNode: privateKeyNode,
+              #startIndex: startIndex,
+            },
+          ),
+        )),
+      ) as _i21.Future<_i17.Address>);
+  @override
+  _i21.Future<Map<String, dynamic>> prepareNotificationTx({
+    required int? selectedTxFeeRate,
+    required String? targetPaymentCodeString,
+    int? additionalOutputs = 0,
+    List<_i17.UTXO>? utxos,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #prepareNotificationTx,
+          [],
+          {
+            #selectedTxFeeRate: selectedTxFeeRate,
+            #targetPaymentCodeString: targetPaymentCodeString,
+            #additionalOutputs: additionalOutputs,
+            #utxos: utxos,
+          },
+        ),
+        returnValue:
+            _i21.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
+      ) as _i21.Future<Map<String, dynamic>>);
+  @override
+  _i21.Future<String> broadcastNotificationTx(
+          {required Map<String, dynamic>? preparedTx}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #broadcastNotificationTx,
+          [],
+          {#preparedTx: preparedTx},
+        ),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  _i21.Future<bool> hasConnected(String? paymentCodeString) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #hasConnected,
+          [paymentCodeString],
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  _i21.Future<_i18.PaymentCode?> unBlindedPaymentCodeFromTransaction(
+          {required _i17.Transaction? transaction}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #unBlindedPaymentCodeFromTransaction,
+          [],
+          {#transaction: transaction},
+        ),
+        returnValue: _i21.Future<_i18.PaymentCode?>.value(),
+      ) as _i21.Future<_i18.PaymentCode?>);
+  @override
+  _i21.Future<_i18.PaymentCode?> unBlindedPaymentCodeFromTransactionBad(
+          {required _i17.Transaction? transaction}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #unBlindedPaymentCodeFromTransactionBad,
+          [],
+          {#transaction: transaction},
+        ),
+        returnValue: _i21.Future<_i18.PaymentCode?>.value(),
+      ) as _i21.Future<_i18.PaymentCode?>);
+  @override
+  _i21.Future<List<_i18.PaymentCode>>
+      getAllPaymentCodesFromNotificationTransactions() => (super.noSuchMethod(
+            Invocation.method(
+              #getAllPaymentCodesFromNotificationTransactions,
+              [],
+            ),
+            returnValue:
+                _i21.Future<List<_i18.PaymentCode>>.value(<_i18.PaymentCode>[]),
+          ) as _i21.Future<List<_i18.PaymentCode>>);
+  @override
+  _i21.Future<void> checkForNotificationTransactionsTo(
+          Set<String>? otherCodeStrings) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #checkForNotificationTransactionsTo,
+          [otherCodeStrings],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> restoreAllHistory({
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+    required Set<String>? paymentCodeStrings,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #restoreAllHistory,
+          [],
+          {
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+            #paymentCodeStrings: paymentCodeStrings,
+          },
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> restoreHistoryWith({
+    required _i18.PaymentCode? other,
+    required bool? checkSegwitAsWell,
+    required int? maxUnusedAddressGap,
+    required int? maxNumberOfIndexesToCheck,
+  }) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #restoreHistoryWith,
+          [],
+          {
+            #other: other,
+            #checkSegwitAsWell: checkSegwitAsWell,
+            #maxUnusedAddressGap: maxUnusedAddressGap,
+            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
+          },
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<_i17.Address> getMyNotificationAddress() => (super.noSuchMethod(
+        Invocation.method(
+          #getMyNotificationAddress,
+          [],
+        ),
+        returnValue: _i21.Future<_i17.Address>.value(_FakeAddress_15(
+          this,
+          Invocation.method(
+            #getMyNotificationAddress,
+            [],
+          ),
+        )),
+      ) as _i21.Future<_i17.Address>);
+  @override
+  _i21.Future<List<String>> lookupKey(String? paymentCodeString) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #lookupKey,
+          [paymentCodeString],
+        ),
+        returnValue: _i21.Future<List<String>>.value(<String>[]),
+      ) as _i21.Future<List<String>>);
+  @override
+  _i21.Future<String?> paymentCodeStringByKey(String? key) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #paymentCodeStringByKey,
+          [key],
+        ),
+        returnValue: _i21.Future<String?>.value(),
+      ) as _i21.Future<String?>);
+  @override
+  _i21.Future<String> storeCode(String? paymentCodeString) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #storeCode,
+          [paymentCodeString],
+        ),
+        returnValue: _i21.Future<String>.value(''),
+      ) as _i21.Future<String>);
+  @override
+  void initCoinControlInterface({
+    required String? walletId,
+    required String? walletName,
+    required _i20.Coin? coin,
+    required _i12.MainDB? db,
+    required _i21.Future<int> Function()? getChainHeight,
+    required _i21.Future<void> Function(_i11.Balance)? refreshedBalanceCallback,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #initCoinControlInterface,
+          [],
+          {
+            #walletId: walletId,
+            #walletName: walletName,
+            #coin: coin,
+            #db: db,
+            #getChainHeight: getChainHeight,
+            #refreshedBalanceCallback: refreshedBalanceCallback,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> refreshBalance({bool? notify = false}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #refreshBalance,
+          [],
+          {#notify: notify},
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+}
+
+/// A class which mocks [LocaleService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockLocaleService extends _i1.Mock implements _i29.LocaleService {
+  MockLocaleService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  String get locale => (super.noSuchMethod(
+        Invocation.getter(#locale),
+        returnValue: '',
+      ) as String);
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i21.Future<void> loadLocale({bool? notify = true}) => (super.noSuchMethod(
+        Invocation.method(
+          #loadLocale,
+          [],
+          {#notify: notify},
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  void addListener(_i23.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void removeListener(_i23.VoidCallback? listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i30.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i12.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_9(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i12.MainDB);
+  @override
+  List<_i31.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i31.StackTheme>[],
+      ) as List<_i31.StackTheme>);
+  @override
+  void init(_i12.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i21.Future<void> install({required _i28.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i21.Future<void>.value(),
+        returnValueForMissingStub: _i21.Future<void>.value(),
+      ) as _i21.Future<void>);
+  @override
+  _i21.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i21.Future<bool>.value(false),
+      ) as _i21.Future<bool>);
+  @override
+  _i21.Future<List<_i30.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i21.Future<List<_i30.StackThemeMetaData>>.value(
+            <_i30.StackThemeMetaData>[]),
+      ) as _i21.Future<List<_i30.StackThemeMetaData>>);
+  @override
+  _i21.Future<_i28.Uint8List> fetchTheme(
+          {required _i30.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i21.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i21.Future<_i28.Uint8List>);
+  @override
+  _i31.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i31.StackTheme?);
+}
diff --git a/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart b/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
index 1cfa90f00..f76a04c74 100644
--- a/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
+++ b/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
@@ -1,10 +1,10 @@
 // Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/widget_tests/wallet_info_row/wallet_info_row_test.dart.
+// in stackwallet/test/widget_tests/wallet_info_row/wallet_info_row_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i23;
-import 'dart:typed_data' as _i29;
+import 'dart:typed_data' as _i28;
 import 'dart:ui' as _i25;
 
 import 'package:bip32/bip32.dart' as _i16;
@@ -13,27 +13,30 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i12;
-import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
-import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
-import 'package:stackduo/models/balance.dart' as _i11;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/node_model.dart' as _i30;
-import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
-import 'package:stackduo/models/signing_data.dart' as _i28;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i26;
-import 'package:stackduo/services/coins/coin_service.dart' as _i20;
-import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/node_service.dart' as _i3;
-import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
-import 'package:stackduo/services/wallets.dart' as _i21;
-import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/amount/amount.dart' as _i14;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i27;
-import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
+import 'package:stackwallet/db/isar/main_db.dart' as _i7;
+import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i11;
+import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i10;
+import 'package:stackwallet/models/balance.dart' as _i12;
+import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackwallet/models/isar/stack_theme.dart' as _i27;
+import 'package:stackwallet/models/node_model.dart' as _i32;
+import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i9;
+import 'package:stackwallet/models/signing_data.dart' as _i31;
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i29;
+import 'package:stackwallet/services/coins/coin_service.dart' as _i20;
+import 'package:stackwallet/services/coins/manager.dart' as _i6;
+import 'package:stackwallet/services/node_service.dart' as _i3;
+import 'package:stackwallet/services/transaction_notification_tracker.dart'
+    as _i8;
+import 'package:stackwallet/services/wallets.dart' as _i21;
+import 'package:stackwallet/services/wallets_service.dart' as _i2;
+import 'package:stackwallet/themes/theme_service.dart' as _i26;
+import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
+import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i22;
+import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i30;
+import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
     as _i19;
-import 'package:stackduo/utilities/prefs.dart' as _i24;
+import 'package:stackwallet/utilities/prefs.dart' as _i24;
 import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
@@ -89,9 +92,8 @@ class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
         );
 }
 
-class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
-    implements _i7.TransactionNotificationTracker {
-  _FakeTransactionNotificationTracker_4(
+class _FakeMainDB_4 extends _i1.SmartFake implements _i7.MainDB {
+  _FakeMainDB_4(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -100,8 +102,9 @@ class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
         );
 }
 
-class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
-  _FakeFeeObject_5(
+class _FakeTransactionNotificationTracker_5 extends _i1.SmartFake
+    implements _i8.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_5(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -110,8 +113,8 @@ class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
         );
 }
 
-class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
-  _FakeElectrumX_6(
+class _FakeFeeObject_6 extends _i1.SmartFake implements _i9.FeeObject {
+  _FakeFeeObject_6(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -120,9 +123,8 @@ class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
         );
 }
 
-class _FakeCachedElectrumX_7 extends _i1.SmartFake
-    implements _i10.CachedElectrumX {
-  _FakeCachedElectrumX_7(
+class _FakeElectrumX_7 extends _i1.SmartFake implements _i10.ElectrumX {
+  _FakeElectrumX_7(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -131,8 +133,9 @@ class _FakeCachedElectrumX_7 extends _i1.SmartFake
         );
 }
 
-class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
-  _FakeBalance_8(
+class _FakeCachedElectrumX_8 extends _i1.SmartFake
+    implements _i11.CachedElectrumX {
+  _FakeCachedElectrumX_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -141,8 +144,8 @@ class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
         );
 }
 
-class _FakeMainDB_9 extends _i1.SmartFake implements _i12.MainDB {
-  _FakeMainDB_9(
+class _FakeBalance_9 extends _i1.SmartFake implements _i12.Balance {
+  _FakeBalance_9(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -161,7 +164,8 @@ class _FakeNetworkType_10 extends _i1.SmartFake implements _i13.NetworkType {
         );
 }
 
-class _FakeElectrumXNode_11 extends _i1.SmartFake implements _i9.ElectrumXNode {
+class _FakeElectrumXNode_11 extends _i1.SmartFake
+    implements _i10.ElectrumXNode {
   _FakeElectrumXNode_11(
     Object parent,
     Invocation parentInvocation,
@@ -686,10 +690,109 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
       );
 }
 
+/// A class which mocks [ThemeService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockThemeService extends _i1.Mock implements _i26.ThemeService {
+  MockThemeService() {
+    _i1.throwOnMissingStub(this);
+  }
+
+  @override
+  _i7.MainDB get db => (super.noSuchMethod(
+        Invocation.getter(#db),
+        returnValue: _FakeMainDB_4(
+          this,
+          Invocation.getter(#db),
+        ),
+      ) as _i7.MainDB);
+  @override
+  List<_i27.StackTheme> get installedThemes => (super.noSuchMethod(
+        Invocation.getter(#installedThemes),
+        returnValue: <_i27.StackTheme>[],
+      ) as List<_i27.StackTheme>);
+  @override
+  void init(_i7.MainDB? db) => super.noSuchMethod(
+        Invocation.method(
+          #init,
+          [db],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  _i23.Future<void> install({required _i28.Uint8List? themeArchiveData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #install,
+          [],
+          {#themeArchiveData: themeArchiveData},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
+        Invocation.method(
+          #remove,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
+        Invocation.method(
+          #checkDefaultThemesOnStartup,
+          [],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  _i23.Future<bool> verifyInstalled({required String? themeId}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #verifyInstalled,
+          [],
+          {#themeId: themeId},
+        ),
+        returnValue: _i23.Future<bool>.value(false),
+      ) as _i23.Future<bool>);
+  @override
+  _i23.Future<List<_i26.StackThemeMetaData>> fetchThemes() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchThemes,
+          [],
+        ),
+        returnValue: _i23.Future<List<_i26.StackThemeMetaData>>.value(
+            <_i26.StackThemeMetaData>[]),
+      ) as _i23.Future<List<_i26.StackThemeMetaData>>);
+  @override
+  _i23.Future<_i28.Uint8List> fetchTheme(
+          {required _i26.StackThemeMetaData? themeMetaData}) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #fetchTheme,
+          [],
+          {#themeMetaData: themeMetaData},
+        ),
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
+  @override
+  _i27.StackTheme? getTheme({required String? themeId}) =>
+      (super.noSuchMethod(Invocation.method(
+        #getTheme,
+        [],
+        {#themeId: themeId},
+      )) as _i27.StackTheme?);
+}
+
 /// A class which mocks [BitcoinWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
+class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
   MockBitcoinWallet() {
     _i1.throwOnMissingStub(this);
   }
@@ -703,15 +806,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i7.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+  _i8.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
         Invocation.getter(#txTracker),
-        returnValue: _FakeTransactionNotificationTracker_4(
+        returnValue: _FakeTransactionNotificationTracker_5(
           this,
           Invocation.getter(#txTracker),
         ),
-      ) as _i7.TransactionNotificationTracker);
+      ) as _i8.TransactionNotificationTracker);
   @override
-  set txTracker(_i7.TransactionNotificationTracker? _txTracker) =>
+  set txTracker(_i8.TransactionNotificationTracker? _txTracker) =>
       super.noSuchMethod(
         Invocation.setter(
           #txTracker,
@@ -808,13 +911,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i23.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i23.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i23.Future<_i8.FeeObject>);
+      ) as _i23.Future<_i9.FeeObject>);
   @override
   _i23.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -887,29 +990,29 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i9.ElectrumX get electrumXClient => (super.noSuchMethod(
+  _i10.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_6(
+        returnValue: _FakeElectrumX_7(
           this,
           Invocation.getter(#electrumXClient),
         ),
-      ) as _i9.ElectrumX);
+      ) as _i10.ElectrumX);
   @override
-  _i10.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+  _i11.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
         Invocation.getter(#cachedElectrumXClient),
-        returnValue: _FakeCachedElectrumX_7(
+        returnValue: _FakeCachedElectrumX_8(
           this,
           Invocation.getter(#cachedElectrumXClient),
         ),
-      ) as _i10.CachedElectrumX);
+      ) as _i11.CachedElectrumX);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i23.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
@@ -925,13 +1028,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i12.MainDB get db => (super.noSuchMethod(
+  _i7.MainDB get db => (super.noSuchMethod(
         Invocation.getter(#db),
-        returnValue: _FakeMainDB_9(
+        returnValue: _FakeMainDB_4(
           this,
           Invocation.getter(#db),
         ),
-      ) as _i12.MainDB);
+      ) as _i7.MainDB);
   @override
   _i13.NetworkType get networkType => (super.noSuchMethod(
         Invocation.getter(#networkType),
@@ -950,15 +1053,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i27.DerivePathType addressType({required String? address}) =>
+  _i30.DerivePathType addressType({required String? address}) =>
       (super.noSuchMethod(
         Invocation.method(
           #addressType,
           [],
           {#address: address},
         ),
-        returnValue: _i27.DerivePathType.bip44,
-      ) as _i27.DerivePathType);
+        returnValue: _i30.DerivePathType.bip44,
+      ) as _i30.DerivePathType);
   @override
   _i23.Future<void> recoverFromMnemonic({
     required String? mnemonic,
@@ -1117,19 +1220,20 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i23.Future<_i9.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+  _i23.Future<_i10.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
         Invocation.method(
           #getCurrentNode,
           [],
         ),
-        returnValue: _i23.Future<_i9.ElectrumXNode>.value(_FakeElectrumXNode_11(
+        returnValue:
+            _i23.Future<_i10.ElectrumXNode>.value(_FakeElectrumXNode_11(
           this,
           Invocation.method(
             #getCurrentNode,
             [],
           ),
         )),
-      ) as _i23.Future<_i9.ElectrumXNode>);
+      ) as _i23.Future<_i10.ElectrumXNode>);
   @override
   _i23.Future<List<Map<String, dynamic>>> fastFetch(
           List<String>? allTxHashes) =>
@@ -1211,7 +1315,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         },
       ));
   @override
-  _i23.Future<List<_i28.SigningData>> fetchBuildTxData(
+  _i23.Future<List<_i31.SigningData>> fetchBuildTxData(
           List<_i17.UTXO>? utxosToUse) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1219,11 +1323,11 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
           [utxosToUse],
         ),
         returnValue:
-            _i23.Future<List<_i28.SigningData>>.value(<_i28.SigningData>[]),
-      ) as _i23.Future<List<_i28.SigningData>>);
+            _i23.Future<List<_i31.SigningData>>.value(<_i31.SigningData>[]),
+      ) as _i23.Future<List<_i31.SigningData>>);
   @override
   _i23.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i28.SigningData>? utxoSigningData,
+    required List<_i31.SigningData>? utxoSigningData,
     required List<String>? recipients,
     required List<int>? satoshiAmounts,
   }) =>
@@ -1390,21 +1494,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i11.Balance getCachedBalance() => (super.noSuchMethod(
+  _i12.Balance getCachedBalance() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalance,
           [],
         ),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.method(
             #getCachedBalance,
             [],
           ),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
-  _i23.Future<void> updateCachedBalance(_i11.Balance? balance) =>
+  _i23.Future<void> updateCachedBalance(_i12.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalance,
@@ -1414,21 +1518,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i11.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+  _i12.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalanceSecondary,
           [],
         ),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.method(
             #getCachedBalanceSecondary,
             [],
           ),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
-  _i23.Future<void> updateCachedBalanceSecondary(_i11.Balance? balance) =>
+  _i23.Future<void> updateCachedBalanceSecondary(_i12.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalanceSecondary,
@@ -1438,7 +1542,26 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
+  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
+        Invocation.method(
+          #getWalletTokenContractAddresses,
+          [],
+        ),
+        returnValue: <String>[],
+      ) as List<String>);
+  @override
+  _i23.Future<void> updateWalletTokenContractAddresses(
+          List<String>? contractAddresses) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #updateWalletTokenContractAddresses,
+          [contractAddresses],
+        ),
+        returnValue: _i23.Future<void>.value(),
+        returnValueForMissingStub: _i23.Future<void>.value(),
+      ) as _i23.Future<void>);
+  @override
+  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
           [],
@@ -1490,8 +1613,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     required String? walletName,
     required _i13.NetworkType? network,
     required _i22.Coin? coin,
-    required _i12.MainDB? db,
-    required _i9.ElectrumX? electrumXClient,
+    required _i7.MainDB? db,
+    required _i10.ElectrumX? electrumXClient,
     required _i19.SecureStorageInterface? secureStorage,
     required int? dustLimit,
     required int? dustLimitP2PKH,
@@ -1512,7 +1635,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     })?
         prepareSend,
     required _i23.Future<int> Function({required String address})? getTxCount,
-    required _i23.Future<List<_i28.SigningData>> Function(List<_i17.UTXO>)?
+    required _i23.Future<List<_i31.SigningData>> Function(List<_i17.UTXO>)?
         fetchBuildTxData,
     required _i23.Future<void> Function()? refresh,
     required _i23.Future<void> Function()? checkChangeAddressForTransactions,
@@ -1562,7 +1685,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         )),
       ) as _i23.Future<_i16.BIP32>);
   @override
-  _i23.Future<_i29.Uint8List> getPrivateKeyForPaynymReceivingAddress({
+  _i23.Future<_i28.Uint8List> getPrivateKeyForPaynymReceivingAddress({
     required String? paymentCodeString,
     required int? index,
   }) =>
@@ -1575,8 +1698,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
             #index: index,
           },
         ),
-        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i23.Future<_i29.Uint8List>);
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
   @override
   _i23.Future<_i17.Address> currentReceivingPaynymAddress({
     required _i18.PaymentCode? sender,
@@ -1662,14 +1785,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         )),
       ) as _i23.Future<_i18.PaymentCode>);
   @override
-  _i23.Future<_i29.Uint8List> signWithNotificationKey(_i29.Uint8List? data) =>
+  _i23.Future<_i28.Uint8List> signWithNotificationKey(_i28.Uint8List? data) =>
       (super.noSuchMethod(
         Invocation.method(
           #signWithNotificationKey,
           [data],
         ),
-        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i23.Future<_i29.Uint8List>);
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
   @override
   _i23.Future<String> signStringWithNotificationKey(String? data) =>
       (super.noSuchMethod(
@@ -1902,9 +2025,9 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     required String? walletId,
     required String? walletName,
     required _i22.Coin? coin,
-    required _i12.MainDB? db,
+    required _i7.MainDB? db,
     required _i23.Future<int> Function()? getChainHeight,
-    required _i23.Future<void> Function(_i11.Balance)? refreshedBalanceCallback,
+    required _i23.Future<void> Function(_i12.Balance)? refreshedBalanceCallback,
   }) =>
       super.noSuchMethod(
         Invocation.method(
@@ -1947,15 +2070,15 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         ),
       ) as _i19.SecureStorageInterface);
   @override
-  List<_i30.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i32.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i32.NodeModel>[],
+      ) as List<_i32.NodeModel>);
   @override
-  List<_i30.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i32.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i32.NodeModel>[],
+      ) as List<_i32.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -1973,7 +2096,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
   @override
   _i23.Future<void> setPrimaryNodeFor({
     required _i22.Coin? coin,
-    required _i30.NodeModel? node,
+    required _i32.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -1990,40 +2113,40 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i30.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
+  _i32.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i30.NodeModel?);
+      )) as _i32.NodeModel?);
   @override
-  List<_i30.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
+  List<_i32.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i32.NodeModel>[],
+      ) as List<_i32.NodeModel>);
   @override
-  _i30.NodeModel? getNodeById({required String? id}) =>
+  _i32.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i30.NodeModel?);
+      )) as _i32.NodeModel?);
   @override
-  List<_i30.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
+  List<_i32.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i32.NodeModel>[],
+      ) as List<_i32.NodeModel>);
   @override
   _i23.Future<void> add(
-    _i30.NodeModel? node,
+    _i32.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2075,7 +2198,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
       ) as _i23.Future<void>);
   @override
   _i23.Future<void> edit(
-    _i30.NodeModel? editedNode,
+    _i32.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2201,13 +2324,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i23.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i23.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i23.Future<_i8.FeeObject>);
+      ) as _i23.Future<_i9.FeeObject>);
   @override
   _i23.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2219,13 +2342,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: _i23.Future<String>.value(''),
       ) as _i23.Future<String>);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i23.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
@@ -2286,6 +2409,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -2564,13 +2692,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i20.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i23.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
+  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i23.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
+        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i23.Future<_i8.FeeObject>);
+      ) as _i23.Future<_i9.FeeObject>);
   @override
   _i23.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2582,13 +2710,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i20.CoinServiceAPI {
         returnValue: _i23.Future<String>.value(''),
       ) as _i23.Future<String>);
   @override
-  _i11.Balance get balance => (super.noSuchMethod(
+  _i12.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_8(
+        returnValue: _FakeBalance_9(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i11.Balance);
+      ) as _i12.Balance);
   @override
   _i23.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),

From 3e9b3a96327759eafe921b8df632811972265173 Mon Sep 17 00:00:00 2001
From: Diego Salazar <diego@cypherstack.com>
Date: Mon, 29 May 2023 17:39:22 -0600
Subject: [PATCH 62/87] Bump version (1.0.7, build 12)

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 45a583ea5..86ba2bf3c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Stack Duo
 # 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.0.7+11
+version: 1.0.7+12
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

From 81da7e38aecf30947bc195ee6269541d4ea881ee Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 29 May 2023 17:13:45 -0600
Subject: [PATCH 63/87] quick theme fix

---
 assets/default_themes/dark.zip   | Bin 567322 -> 604359 bytes
 assets/default_themes/light.zip  | Bin 514498 -> 563892 bytes
 lib/main.dart                    |  21 +++++++++++++++++++++
 lib/models/isar/stack_theme.dart |   2 +-
 lib/themes/theme_service.dart    |  29 +++++++++++++++++++++--------
 5 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/assets/default_themes/dark.zip b/assets/default_themes/dark.zip
index e2291ba2b8ca8dfc1c3414a827c3607f46da25e1..9823262a9dd969947e9e4cf662341f62d3e38160 100644
GIT binary patch
delta 41676
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
Wq;CMP^d2MsEC>MrF=`B?^nU;r;Bck@

delta 4297
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
ZmO(}8AP=)5Oc8d469zkfo$%U({SPY$KV<*_

diff --git a/assets/default_themes/light.zip b/assets/default_themes/light.zip
index c9579152d8dbac814dc77e65efa1736918ef7adf..649716126f9496f38223a870c1ab1045e502827b 100644
GIT binary patch
delta 55387
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
PSqak7nS?_b0^NTA;4OE`

delta 5747
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
HbDsPU0+z^Y

diff --git a/lib/main.dart b/lib/main.dart
index d2ef627f8..2af01e602 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -189,6 +189,27 @@ void main() async {
   // check and update or install default themes
   await ThemeService.instance.checkDefaultThemesOnStartup();
 
+  // verify current user preference theme and revert to default
+  // if problems are found to prevent app being unusable
+  if (!(await ThemeService.instance
+      .verifyInstalled(themeId: Prefs.instance.themeId))) {
+    Prefs.instance.themeId = "light";
+  }
+
+  // verify current user preference light brightness theme and revert to default
+  // if problems are found to prevent app being unusable
+  if (!(await ThemeService.instance
+      .verifyInstalled(themeId: Prefs.instance.systemBrightnessLightThemeId))) {
+    Prefs.instance.systemBrightnessLightThemeId = "light";
+  }
+
+  // verify current user preference dark brightness theme and revert to default
+  // if problems are found to prevent app being unusable
+  if (!(await ThemeService.instance
+      .verifyInstalled(themeId: Prefs.instance.systemBrightnessDarkThemeId))) {
+    Prefs.instance.systemBrightnessDarkThemeId = "dark";
+  }
+
   runApp(const ProviderScope(child: MyApp()));
 }
 
diff --git a/lib/models/isar/stack_theme.dart b/lib/models/isar/stack_theme.dart
index f072feb02..a76be7ad9 100644
--- a/lib/models/isar/stack_theme.dart
+++ b/lib/models/isar/stack_theme.dart
@@ -1507,7 +1507,7 @@ class StackTheme {
               themeId: json["id"] as String,
             )
           : null
-      ..assetsV2 = version == 2
+      ..assetsV2 = version >= 2
           ? ThemeAssetsV2.fromJson(
               json: Map<String, dynamic>.from(json["assets"] as Map),
               applicationThemesDirectoryPath: applicationThemesDirectoryPath,
diff --git a/lib/themes/theme_service.dart b/lib/themes/theme_service.dart
index ee831af83..db5b851e1 100644
--- a/lib/themes/theme_service.dart
+++ b/lib/themes/theme_service.dart
@@ -17,7 +17,7 @@ final pThemeService = Provider<ThemeService>((ref) {
 });
 
 class ThemeService {
-  static const _currentDefaultThemeVersion = 2;
+  static const _currentDefaultThemeVersion = 3;
   ThemeService._();
   static ThemeService? _instance;
   static ThemeService get instance => _instance ??= ThemeService._();
@@ -40,9 +40,7 @@ class ThemeService {
       throw Exception("Invalid theme archive: Missing theme.json");
     }
 
-    final OutputStream os = OutputStream();
-    themeJsonFiles.first.decompress(os);
-    final String jsonString = utf8.decode(os.getBytes());
+    final jsonString = utf8.decode(themeJsonFiles.first.content as List<int>);
     final json = jsonDecode(jsonString) as Map;
 
     final theme = StackTheme.fromJson(
@@ -50,6 +48,12 @@ class ThemeService {
       applicationThemesDirectoryPath: themesDir.path,
     );
 
+    try {
+      theme.assets;
+    } catch (_) {
+      throw Exception("Invalid theme: Failed to create assets object");
+    }
+
     final String assetsPath = "${themesDir.path}/${theme.themeId}";
 
     for (final file in archive.files) {
@@ -84,7 +88,10 @@ class ThemeService {
       await db.isar.writeTxn(() async {
         await db.isar.stackThemes.delete(isarId);
       });
-      await Directory("${themesDir.path}/$themeId").delete(recursive: true);
+      final dir = Directory("${themesDir.path}/$themeId");
+      if (dir.existsSync()) {
+        await dir.delete(recursive: true);
+      }
     } else {
       Logging.instance.log(
         "Failed to delete theme $themeId",
@@ -159,9 +166,15 @@ class ThemeService {
 
   // TODO more thorough check/verification of theme
   Future<bool> verifyInstalled({required String themeId}) async {
-    final dbHasTheme =
-        await db.isar.stackThemes.where().themeIdEqualTo(themeId).count() > 0;
-    if (dbHasTheme) {
+    final theme =
+        await db.isar.stackThemes.where().themeIdEqualTo(themeId).findFirst();
+    if (theme != null) {
+      try {
+        theme.assets;
+      } catch (_) {
+        return false;
+      }
+
       final themesDir = await StackFileSystem.applicationThemesDirectory();
       final jsonFileExists =
           await File("${themesDir.path}/$themeId/theme.json").exists();

From 4cb9084788014731463b71fb167881c11c4c4e34 Mon Sep 17 00:00:00 2001
From: julian-CStack <97684800+julian-CStack@users.noreply.github.com>
Date: Sat, 10 Jun 2023 07:37:55 -0600
Subject: [PATCH 64/87] themes bandaid (#37)

* untested protected rpc version

* update tests

* cleaned up electrumx rpc

* fix: bug in setting _isConnected as well as adding call to refresh on reconnection established

* fix: update electrumx tests

* fix: update fiat price on fiat currency selection changed

* Fix failing tests

* fix: rpc test

* quick theme fix

---------

Co-authored-by: likho <likhojiba@gmail.com>
---
 assets/default_themes/dark.zip   | Bin 567322 -> 604359 bytes
 assets/default_themes/light.zip  | Bin 514498 -> 563892 bytes
 lib/main.dart                    |  21 +++++++++++++++++++++
 lib/models/isar/stack_theme.dart |   2 +-
 lib/themes/theme_service.dart    |  29 +++++++++++++++++++++--------
 5 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/assets/default_themes/dark.zip b/assets/default_themes/dark.zip
index e2291ba2b8ca8dfc1c3414a827c3607f46da25e1..9823262a9dd969947e9e4cf662341f62d3e38160 100644
GIT binary patch
delta 41676
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
Wq;CMP^d2MsEC>MrF=`B?^nU;r;Bck@

delta 4297
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
ZmO(}8AP=)5Oc8d469zkfo$%U({SPY$KV<*_

diff --git a/assets/default_themes/light.zip b/assets/default_themes/light.zip
index c9579152d8dbac814dc77e65efa1736918ef7adf..649716126f9496f38223a870c1ab1045e502827b 100644
GIT binary patch
delta 55387
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
PSqak7nS?_b0^NTA;4OE`

delta 5747
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
HbDsPU0+z^Y

diff --git a/lib/main.dart b/lib/main.dart
index d2ef627f8..2af01e602 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -189,6 +189,27 @@ void main() async {
   // check and update or install default themes
   await ThemeService.instance.checkDefaultThemesOnStartup();
 
+  // verify current user preference theme and revert to default
+  // if problems are found to prevent app being unusable
+  if (!(await ThemeService.instance
+      .verifyInstalled(themeId: Prefs.instance.themeId))) {
+    Prefs.instance.themeId = "light";
+  }
+
+  // verify current user preference light brightness theme and revert to default
+  // if problems are found to prevent app being unusable
+  if (!(await ThemeService.instance
+      .verifyInstalled(themeId: Prefs.instance.systemBrightnessLightThemeId))) {
+    Prefs.instance.systemBrightnessLightThemeId = "light";
+  }
+
+  // verify current user preference dark brightness theme and revert to default
+  // if problems are found to prevent app being unusable
+  if (!(await ThemeService.instance
+      .verifyInstalled(themeId: Prefs.instance.systemBrightnessDarkThemeId))) {
+    Prefs.instance.systemBrightnessDarkThemeId = "dark";
+  }
+
   runApp(const ProviderScope(child: MyApp()));
 }
 
diff --git a/lib/models/isar/stack_theme.dart b/lib/models/isar/stack_theme.dart
index f072feb02..a76be7ad9 100644
--- a/lib/models/isar/stack_theme.dart
+++ b/lib/models/isar/stack_theme.dart
@@ -1507,7 +1507,7 @@ class StackTheme {
               themeId: json["id"] as String,
             )
           : null
-      ..assetsV2 = version == 2
+      ..assetsV2 = version >= 2
           ? ThemeAssetsV2.fromJson(
               json: Map<String, dynamic>.from(json["assets"] as Map),
               applicationThemesDirectoryPath: applicationThemesDirectoryPath,
diff --git a/lib/themes/theme_service.dart b/lib/themes/theme_service.dart
index ee831af83..db5b851e1 100644
--- a/lib/themes/theme_service.dart
+++ b/lib/themes/theme_service.dart
@@ -17,7 +17,7 @@ final pThemeService = Provider<ThemeService>((ref) {
 });
 
 class ThemeService {
-  static const _currentDefaultThemeVersion = 2;
+  static const _currentDefaultThemeVersion = 3;
   ThemeService._();
   static ThemeService? _instance;
   static ThemeService get instance => _instance ??= ThemeService._();
@@ -40,9 +40,7 @@ class ThemeService {
       throw Exception("Invalid theme archive: Missing theme.json");
     }
 
-    final OutputStream os = OutputStream();
-    themeJsonFiles.first.decompress(os);
-    final String jsonString = utf8.decode(os.getBytes());
+    final jsonString = utf8.decode(themeJsonFiles.first.content as List<int>);
     final json = jsonDecode(jsonString) as Map;
 
     final theme = StackTheme.fromJson(
@@ -50,6 +48,12 @@ class ThemeService {
       applicationThemesDirectoryPath: themesDir.path,
     );
 
+    try {
+      theme.assets;
+    } catch (_) {
+      throw Exception("Invalid theme: Failed to create assets object");
+    }
+
     final String assetsPath = "${themesDir.path}/${theme.themeId}";
 
     for (final file in archive.files) {
@@ -84,7 +88,10 @@ class ThemeService {
       await db.isar.writeTxn(() async {
         await db.isar.stackThemes.delete(isarId);
       });
-      await Directory("${themesDir.path}/$themeId").delete(recursive: true);
+      final dir = Directory("${themesDir.path}/$themeId");
+      if (dir.existsSync()) {
+        await dir.delete(recursive: true);
+      }
     } else {
       Logging.instance.log(
         "Failed to delete theme $themeId",
@@ -159,9 +166,15 @@ class ThemeService {
 
   // TODO more thorough check/verification of theme
   Future<bool> verifyInstalled({required String themeId}) async {
-    final dbHasTheme =
-        await db.isar.stackThemes.where().themeIdEqualTo(themeId).count() > 0;
-    if (dbHasTheme) {
+    final theme =
+        await db.isar.stackThemes.where().themeIdEqualTo(themeId).findFirst();
+    if (theme != null) {
+      try {
+        theme.assets;
+      } catch (_) {
+        return false;
+      }
+
       final themesDir = await StackFileSystem.applicationThemesDirectory();
       final jsonFileExists =
           await File("${themesDir.path}/$themeId/theme.json").exists();

From b10dc4e3212f76dbdd5aed5eda9077a786e1249e Mon Sep 17 00:00:00 2001
From: Diego Salazar <diego@cypherstack.com>
Date: Sat, 10 Jun 2023 07:45:35 -0600
Subject: [PATCH 65/87] Bump version (v1.0.8, build 13)

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 86ba2bf3c..1c236f939 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Stack Duo
 # 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.0.7+12
+version: 1.0.8+13
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

From 8526f4c1972bb65fca920d07e2dc83422275f07e Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 29 May 2023 17:13:45 -0600
Subject: [PATCH 66/87] many things from stack wallet

---
 android/build.gradle                          |    8 +-
 .../gradle/wrapper/gradle-wrapper.properties  |    2 +-
 crypto_plugins/flutter_libmonero              |    2 +-
 lib/{ => db}/hive/db.dart                     |    0
 lib/db/{ => isar}/main_db.dart                |    2 +-
 lib/db/queries/queries.dart                   |    2 +-
 lib/electrumx_rpc/cached_electrumx.dart       |    7 +-
 lib/electrumx_rpc/electrumx.dart              |    9 +-
 lib/exceptions/sw_exception.dart              |    2 +-
 lib/main.dart                                 |   16 +-
 .../add_wallet_list_entity.dart               |   18 +
 .../sub_classes/coin_entity.dart              |   30 +
 .../isar/models/blockchain_data/address.dart  |   11 +-
 .../models/blockchain_data/address.g.dart     |    6 +
 .../models/blockchain_data/transaction.dart   |   11 +-
 .../models/blockchain_data/transaction.g.dart |  186 +-
 lib/models/isar/stack_theme.dart              |  275 +-
 lib/models/isar/stack_theme.g.dart            | 4349 ++++++++++++++++-
 lib/models/paymint/transactions_model.dart    |    8 +-
 .../add_wallet_view/add_wallet_view.dart      |  342 +-
 .../sub_widgets/add_wallet_entity_list.dart   |   48 +
 .../sub_widgets/coin_select_item.dart         |   62 +-
 .../sub_widgets/expanding_sub_list_item.dart  |  133 +
 .../sub_widgets/mobile_coin_list.dart         |   38 -
 .../sub_widgets/next_button.dart              |   14 +-
 .../sub_widgets/searchable_coin_list.dart     |   57 -
 .../create_or_restore_wallet_view.dart        |   18 +-
 .../name_your_wallet_view.dart                |   18 +-
 ...w_wallet_recovery_phrase_warning_view.dart |   18 +-
 .../restore_options_view.dart                 |   46 +-
 .../subviews/add_address_book_entry_view.dart |    2 +-
 .../new_contact_address_entry_form.dart       |   50 +-
 lib/pages/coin_control/coin_control_view.dart |   28 +-
 lib/pages/coin_control/utxo_card.dart         |   18 +-
 lib/pages/coin_control/utxo_details_view.dart |   16 +-
 .../confirm_change_now_send.dart              |  103 +-
 .../exchange_currency_selection_view.dart     |   35 +-
 .../exchange_step_views/step_4_view.dart      |    2 +-
 lib/pages/exchange_view/exchange_view.dart    |    4 +-
 lib/pages/exchange_view/send_from_view.dart   |   28 +-
 .../sub_widgets/exchange_provider_option.dart |   37 +-
 .../exchange_view/trade_details_view.dart     |   13 +-
 .../confirm_paynym_connect_dialog.dart        |   16 +-
 .../paynym/dialogs/paynym_details_popup.dart  |    5 +-
 lib/pages/paynym/dialogs/paynym_qr_popup.dart |    2 +-
 .../subwidgets/desktop_paynym_details.dart    |    2 +-
 .../receive_view/addresses/address_card.dart  |    2 +-
 .../addresses/address_details_view.dart       |    6 +-
 .../addresses/address_qr_popup.dart           |    2 +-
 .../addresses/edit_address_label_view.dart    |    2 +-
 .../addresses/wallet_addresses_view.dart      |    4 +-
 .../generate_receiving_uri_qr_code_view.dart  |    7 +-
 lib/pages/receive_view/receive_view.dart      |   14 +-
 .../send_view/confirm_transaction_view.dart   |  344 +-
 lib/pages/send_view/send_view.dart            |  302 +-
 .../sub_widgets/openalias_sheet.dart          |  151 +
 .../transaction_fee_selection_sheet.dart      |  214 +-
 .../advanced_settings_view.dart               |   47 +-
 .../manage_coin_units/choose_unit_sheet.dart  |  144 +
 .../edit_coin_units_view.dart                 |  343 ++
 .../manage_coin_units_view.dart               |  177 +
 .../edit_auto_backup_view.dart                |   45 +-
 .../helpers/restore_create_backup.dart        |    2 +-
 .../wallet_syncing_options_view.dart          |   18 +-
 .../global_settings_view/xpub_view.dart       |    2 +-
 .../wallet_backup_view.dart                   |    4 +-
 lib/pages/stack_privacy_calls.dart            |    2 +-
 .../wallet_balance_toggle_sheet.dart          |   11 +-
 .../sub_widgets/wallet_refresh_button.dart    |   13 +-
 .../sub_widgets/wallet_summary.dart           |   97 +-
 .../sub_widgets/wallet_summary_info.dart      |    8 +-
 .../all_transactions_view.dart                |    7 +-
 .../transaction_details_view.dart             |  335 +-
 .../transaction_search_filter_view.dart       |   34 +-
 lib/pages/wallet_view/wallet_view.dart        |    8 +-
 .../sub_widgets/favorite_card.dart            |   79 +-
 .../sub_widgets/wallet_list_item.dart         |   12 +-
 lib/pages/wallets_view/wallets_overview.dart  |   73 +-
 .../subwidgets/desktop_contact_details.dart   |    2 +-
 .../desktop_coin_control_use_dialog.dart      |    2 +-
 .../desktop_coin_control_view.dart            |    2 +-
 .../coin_control/freeze_button.dart           |    2 +-
 .../coin_control/utxo_row.dart                |   34 +-
 .../desktop_all_trades_view.dart              |    2 +-
 .../exchange_steps/step_scaffold.dart         |    2 +-
 .../subwidgets/desktop_choose_from_stack.dart |    8 +-
 .../subwidgets/desktop_trade_history.dart     |    6 +-
 .../paynym/desktop_paynym_send_dialog.dart    |   38 +-
 .../my_stack_view/wallet_summary_table.dart   |    3 +-
 .../sub_widgets/desktop_fee_dropdown.dart     |  201 +-
 .../sub_widgets/desktop_receive.dart          |   14 +-
 .../wallet_view/sub_widgets/desktop_send.dart |  344 +-
 .../sub_widgets/desktop_wallet_features.dart  |    7 +-
 .../sub_widgets/desktop_wallet_summary.dart   |   65 +-
 .../wallet_view/sub_widgets/my_wallet.dart    |   57 +-
 .../qr_code_desktop_popup_content.dart        |    6 +-
 .../delete_password_warning_view.dart         |   15 +-
 .../password/desktop_login_view.dart          |    2 +-
 ...forgotten_passphrase_restore_from_swb.dart |    2 +-
 .../stack_privacy_dialog.dart                 |    2 +-
 .../appearance_settings.dart                  |    2 +-
 .../create_auto_backup.dart                   |   48 +-
 lib/providers/db/main_db_provider.dart        |    2 +-
 .../ui/add_wallet_selected_coin_provider.dart |   15 +-
 lib/route_generator.dart                      |   61 +-
 lib/services/address_book_service.dart        |    2 +-
 .../coins/bitcoin/bitcoin_wallet.dart         |  110 +-
 lib/services/coins/manager.dart               |    4 +-
 lib/services/coins/monero/monero_wallet.dart  |   11 +-
 lib/services/debug_service.dart               |    2 +-
 .../exchange/change_now/change_now_api.dart   |   83 +
 .../change_now/change_now_exchange.dart       |    9 +-
 .../exchange_data_loading_service.dart        |    2 +-
 .../mixins/coin_control_interface.dart        |    2 +-
 lib/services/mixins/electrum_x_parsing.dart   |    1 +
 .../mixins/paynym_wallet_interface.dart       |    2 +-
 lib/services/mixins/wallet_cache.dart         |    2 +-
 lib/services/mixins/wallet_db.dart            |    2 +-
 lib/services/node_service.dart                |    2 +-
 lib/services/notes_service.dart               |    2 +-
 lib/services/notifications_service.dart       |    2 +-
 lib/services/price.dart                       |    2 +-
 lib/services/trade_notes_service.dart         |    2 +-
 .../trade_sent_from_stack_service.dart        |    2 +-
 lib/services/trade_service.dart               |    2 +-
 .../transaction_notification_tracker.dart     |    2 +-
 lib/services/wallets.dart                     |    2 +-
 lib/services/wallets_service.dart             |    4 +-
 lib/themes/coin_card_provider.dart            |   24 +
 lib/themes/coin_icon_provider.dart            |    4 +-
 lib/themes/coin_image_provider.dart           |   11 +-
 lib/themes/theme_service.dart                 |    2 +-
 lib/utilities/amount/amount.dart              |   84 +-
 lib/utilities/amount/amount_formatter.dart    |   72 +
 .../amount/amount_input_formatter.dart        |   93 +
 lib/utilities/amount/amount_unit.dart         |  215 +-
 lib/utilities/block_explorers.dart            |    3 +-
 lib/utilities/clipboard_interface.dart        |    4 +-
 lib/utilities/constants.dart                  |   27 +-
 lib/utilities/db_version_migration.dart       |    4 +-
 lib/utilities/delete_everything.dart          |    2 +-
 lib/utilities/desktop_password_service.dart   |    2 +-
 lib/utilities/enums/fee_rate_type_enum.dart   |    4 +-
 lib/utilities/prefs.dart                      |   65 +-
 lib/widgets/address_book_card.dart            |   34 +-
 .../animated_widgets/rotating_arrows.dart     |    3 +
 lib/widgets/coin_card.dart                    |  126 +
 .../custom_buttons/app_bar_icon_button.dart   |   56 +-
 .../custom_page_view/custom_page_view.dart    |   10 +-
 lib/widgets/desktop/desktop_fee_dialog.dart   |  381 ++
 lib/widgets/fee_slider.dart                   |   56 +
 lib/widgets/gradient_card.dart                |   44 +
 lib/widgets/managed_favorite.dart             |   28 +-
 .../textfields/exchange_textfield.dart        |   29 +-
 lib/widgets/transaction_card.dart             |   13 +-
 lib/widgets/wallet_card.dart                  |    3 +
 .../sub_widgets/wallet_info_row_balance.dart  |   33 +-
 .../wallet_info_row_coin_icon.dart            |   43 +-
 .../wallet_info_row/wallet_info_row.dart      |   72 +-
 macos/Flutter/GeneratedPluginRegistrant.swift |    6 +-
 pubspec.lock                                  |  384 +-
 pubspec.yaml                                  |   88 +-
 test/cached_electrumx_test.mocks.dart         |   57 +-
 test/electrumx_test.dart                      | 2606 +++++-----
 test/electrumx_test.mocks.dart                |  543 --
 ...r_secure_storage_interface_test.mocks.dart |    2 +-
 test/hive/db_test.dart                        |    2 +-
 .../lelantus_coin_adapter_test.mocks.dart     |    2 +-
 ...transactions_model_adapter_test.mocks.dart |    2 +-
 .../utxo_model_adapter_test.mocks.dart        |    2 +-
 .../notifications/notification_card_test.dart |   92 +-
 .../notification_card_test.mocks.dart         |  131 -
 test/pages/send_view/send_view_test.dart      |  328 +-
 .../pages/send_view/send_view_test.mocks.dart | 3449 -------------
 test/price_test.dart                          |    2 +-
 test/price_test.mocks.dart                    |    2 +-
 .../address_book_view_screen_test.mocks.dart  |    7 +-
 ...d_address_book_view_screen_test.mocks.dart |   42 +-
 ..._entry_details_view_screen_test.mocks.dart |   58 +-
 ...ess_book_entry_view_screen_test.mocks.dart |   42 +-
 .../exchange/exchange_view_test.mocks.dart    |  244 +-
 .../lockscreen_view_screen_test.mocks.dart    |   82 +-
 .../main_view_screen_testA_test.mocks.dart    |   50 +-
 .../main_view_screen_testB_test.mocks.dart    |   50 +-
 .../main_view_screen_testC_test.mocks.dart    |   50 +-
 .../backup_key_view_screen_test.mocks.dart    |   12 +-
 ...up_key_warning_view_screen_test.mocks.dart |   34 +-
 .../create_pin_view_screen_test.mocks.dart    |   82 +-
 ...me_your_wallet_view_screen_test.mocks.dart |    7 +-
 ...restore_wallet_view_screen_test.mocks.dart |   82 +-
 ...ify_backup_key_view_screen_test.mocks.dart |   12 +-
 .../currency_view_screen_test.mocks.dart      |   12 +-
 ...dd_custom_node_view_screen_test.mocks.dart |   34 +-
 .../node_details_view_screen_test.mocks.dart  |   34 +-
 ...twork_settings_view_screen_test.mocks.dart |    7 +-
 .../wallet_backup_view_screen_test.mocks.dart |   12 +-
 .../change_pin_view_screen_test.mocks.dart    |    7 +-
 .../rename_wallet_view_screen_test.mocks.dart |    7 +-
 ...rescan_warning_view_screen_test.mocks.dart |   12 +-
 ...elete_mnemonic_view_screen_test.mocks.dart |   34 +-
 ...allet_settings_view_screen_test.mocks.dart |   49 +-
 .../settings_view_screen_test.mocks.dart      |   34 +-
 ...action_details_view_screen_test.mocks.dart |   23 +-
 ...search_results_view_screen_test.mocks.dart |   28 +-
 ...saction_search_view_screen_test.mocks.dart |   15 +-
 .../confirm_send_view_screen_test.mocks.dart  |   20 +-
 .../receive_view_screen_test.mocks.dart       |   12 +-
 .../send_view_screen_test.mocks.dart          |   20 +-
 .../wallet_view_screen_test.mocks.dart        |   28 +-
 .../change_now/change_now_test.mocks.dart     |    2 +-
 .../bitcoin/bitcoin_wallet_test.mocks.dart    |   13 +-
 test/services/coins/manager_test.dart         |  704 +--
 test/services/coins/manager_test.mocks.dart   | 1456 ------
 test/services/node_service_test.dart          |    2 +-
 test/services/wallets_service_test.dart       |    2 +-
 test/services/wallets_service_test.mocks.dart |    2 +-
 .../address_book_card_test.mocks.dart         |    7 +-
 .../favorite_toggle_test.mocks.dart           |  131 -
 .../custom_loading_overlay_test.mocks.dart    |  131 -
 .../desktop/desktop_scaffold_test.mocks.dart  |  131 -
 .../managed_favorite_test.mocks.dart          |  262 +-
 test/widget_tests/node_card_test.mocks.dart   |    7 +-
 .../node_options_sheet_test.mocks.dart        |   84 +-
 .../table_view/table_view_row_test.mocks.dart |  340 +-
 test/widget_tests/trade_card_test.mocks.dart  |  131 -
 test/widget_tests/transaction_card_test.dart  | 1010 ++--
 .../transaction_card_test.mocks.dart          | 2921 -----------
 ...et_info_row_balance_future_test.mocks.dart |  106 +-
 .../wallet_info_row_test.mocks.dart           |  366 +-
 .../flutter/generated_plugin_registrant.cc    |    2 +-
 windows/flutter/generated_plugins.cmake       |    2 +-
 231 files changed, 13482 insertions(+), 14623 deletions(-)
 rename lib/{ => db}/hive/db.dart (100%)
 rename lib/db/{ => isar}/main_db.dart (99%)
 create mode 100644 lib/models/add_wallet_list_entity/add_wallet_list_entity.dart
 create mode 100644 lib/models/add_wallet_list_entity/sub_classes/coin_entity.dart
 create mode 100644 lib/pages/add_wallet_views/add_wallet_view/sub_widgets/add_wallet_entity_list.dart
 create mode 100644 lib/pages/add_wallet_views/add_wallet_view/sub_widgets/expanding_sub_list_item.dart
 delete mode 100644 lib/pages/add_wallet_views/add_wallet_view/sub_widgets/mobile_coin_list.dart
 delete mode 100644 lib/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.dart
 create mode 100644 lib/pages/send_view/sub_widgets/openalias_sheet.dart
 create mode 100644 lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/choose_unit_sheet.dart
 create mode 100644 lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/edit_coin_units_view.dart
 create mode 100644 lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart
 create mode 100644 lib/themes/coin_card_provider.dart
 create mode 100644 lib/utilities/amount/amount_formatter.dart
 create mode 100644 lib/utilities/amount/amount_input_formatter.dart
 create mode 100644 lib/widgets/coin_card.dart
 create mode 100644 lib/widgets/desktop/desktop_fee_dialog.dart
 create mode 100644 lib/widgets/fee_slider.dart
 create mode 100644 lib/widgets/gradient_card.dart
 delete mode 100644 test/electrumx_test.mocks.dart
 delete mode 100644 test/notifications/notification_card_test.mocks.dart
 delete mode 100644 test/pages/send_view/send_view_test.mocks.dart
 delete mode 100644 test/services/coins/manager_test.mocks.dart
 delete mode 100644 test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart
 delete mode 100644 test/widget_tests/custom_loading_overlay_test.mocks.dart
 delete mode 100644 test/widget_tests/desktop/desktop_scaffold_test.mocks.dart
 delete mode 100644 test/widget_tests/trade_card_test.mocks.dart
 delete mode 100644 test/widget_tests/transaction_card_test.mocks.dart

diff --git a/android/build.gradle b/android/build.gradle
index b309554fd..cd89d3a8b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,11 +2,11 @@ buildscript {
     ext.kotlin_version = '1.7.20'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -14,7 +14,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 562c5e444..6b665338b 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero
index 0a9196aa4..a470c4a97 160000
--- a/crypto_plugins/flutter_libmonero
+++ b/crypto_plugins/flutter_libmonero
@@ -1 +1 @@
-Subproject commit 0a9196aa454c14c886b848add3911da2c91e90ba
+Subproject commit a470c4a974f888eff04ed9d81d87365106675b01
diff --git a/lib/hive/db.dart b/lib/db/hive/db.dart
similarity index 100%
rename from lib/hive/db.dart
rename to lib/db/hive/db.dart
diff --git a/lib/db/main_db.dart b/lib/db/isar/main_db.dart
similarity index 99%
rename from lib/db/main_db.dart
rename to lib/db/isar/main_db.dart
index d6ad19275..761b378b7 100644
--- a/lib/db/main_db.dart
+++ b/lib/db/isar/main_db.dart
@@ -11,7 +11,7 @@ import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/stack_file_system.dart';
 import 'package:tuple/tuple.dart';
 
-part 'queries/queries.dart';
+part '../queries/queries.dart';
 
 class MainDB {
   MainDB._();
diff --git a/lib/db/queries/queries.dart b/lib/db/queries/queries.dart
index bf7064d83..99f266973 100644
--- a/lib/db/queries/queries.dart
+++ b/lib/db/queries/queries.dart
@@ -1,4 +1,4 @@
-part of 'package:stackduo/db/main_db.dart';
+part of 'package:stackduo/db/isar/main_db.dart';
 
 enum CCFilter {
   all,
diff --git a/lib/electrumx_rpc/cached_electrumx.dart b/lib/electrumx_rpc/cached_electrumx.dart
index 2ae26d847..7b1c8f76c 100644
--- a/lib/electrumx_rpc/cached_electrumx.dart
+++ b/lib/electrumx_rpc/cached_electrumx.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/electrumx_rpc/electrumx.dart';
-import 'package:stackduo/hive/db.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/logger.dart';
 import 'package:string_validator/string_validator.dart';
@@ -86,8 +86,9 @@ class CachedElectrumX {
             key: groupId,
             value: set);
         Logging.instance.log(
-            "Updated currently anonymity set for ${coin.name} with group ID $groupId",
-            level: LogLevel.Info);
+          "Updated current anonymity set for ${coin.name} with group ID $groupId",
+          level: LogLevel.Info,
+        );
       }
 
       return set;
diff --git a/lib/electrumx_rpc/electrumx.dart b/lib/electrumx_rpc/electrumx.dart
index 78adc6cd5..a6ac25897 100644
--- a/lib/electrumx_rpc/electrumx.dart
+++ b/lib/electrumx_rpc/electrumx.dart
@@ -150,7 +150,7 @@ class ElectrumX {
           "JSONRPC response\n"
           "     command: $command\n"
           "     args: $args\n"
-          "     error: $response.data",
+          "     error: ${response.data}",
         );
       }
 
@@ -567,8 +567,9 @@ class ElectrumX {
     bool verbose = true,
     String? requestID,
   }) async {
+    dynamic response;
     try {
-      final response = await request(
+      response = await request(
         requestID: requestID,
         command: 'blockchain.transaction.get',
         args: [
@@ -582,6 +583,10 @@ class ElectrumX {
 
       return Map<String, dynamic>.from(response["result"] as Map);
     } catch (e) {
+      Logging.instance.log(
+        "getTransaction($txHash) response: $response",
+        level: LogLevel.Error,
+      );
       rethrow;
     }
   }
diff --git a/lib/exceptions/sw_exception.dart b/lib/exceptions/sw_exception.dart
index 34ab664f2..0296da10a 100644
--- a/lib/exceptions/sw_exception.dart
+++ b/lib/exceptions/sw_exception.dart
@@ -1,7 +1,7 @@
 // generic stack wallet exception which all other custom exceptions should
 // extend from
 
-class SWException with Exception {
+class SWException implements Exception {
   SWException(this.message);
 
   final String message;
diff --git a/lib/main.dart b/lib/main.dart
index 2af01e602..f41e3d9da 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -17,8 +17,8 @@ import 'package:hive_flutter/hive_flutter.dart';
 import 'package:isar/isar.dart';
 import 'package:keyboard_dismisser/keyboard_dismisser.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:stackduo/db/main_db.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/exchange/change_now/exchange_transaction.dart';
 import 'package:stackduo/models/exchange/change_now/exchange_transaction_status.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
@@ -69,7 +69,7 @@ final openedFromSWBFileStringStateProvider =
 // runs the MyApp widget and checks for new users, caching the value in the
 // miscellaneous box for later use
 void main() async {
-  WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
+  WidgetsFlutterBinding.ensureInitialized();
   GoogleFonts.config.allowRuntimeFetching = false;
   if (Platform.isIOS) {
     Util.libraryPath = await getLibraryDirectory();
@@ -177,7 +177,9 @@ void main() async {
     }
   }
 
-  monero.onStartup();
+  if (!Platform.isWindows) {
+    monero.onStartup();
+  }
 
   // SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
   //     overlays: [SystemUiOverlay.bottom]);
@@ -440,6 +442,12 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
     super.dispose();
   }
 
+  @override
+  void didChangeLocales(List<Locale>? locales) {
+    ref.read(localeServiceChangeNotifierProvider).loadLocale();
+    super.didChangeLocales(locales);
+  }
+
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) async {
     debugPrint("didChangeAppLifecycleState: ${state.name}");
diff --git a/lib/models/add_wallet_list_entity/add_wallet_list_entity.dart b/lib/models/add_wallet_list_entity/add_wallet_list_entity.dart
new file mode 100644
index 000000000..0e4c8d12d
--- /dev/null
+++ b/lib/models/add_wallet_list_entity/add_wallet_list_entity.dart
@@ -0,0 +1,18 @@
+/* 
+ * This file is part of Stack Wallet.
+ * 
+ * Copyright (c) 2023 Cypher Stack
+ * All Rights Reserved.
+ * The code is distributed under GPLv3 license, see LICENSE file for details.
+ * Generated by Cypher Stack on 2023-05-26
+ *
+ */
+
+import 'package:equatable/equatable.dart';
+import 'package:stackduo/utilities/enums/coin_enum.dart';
+
+abstract class AddWalletListEntity extends Equatable {
+  Coin get coin;
+  String get name;
+  String get ticker;
+}
diff --git a/lib/models/add_wallet_list_entity/sub_classes/coin_entity.dart b/lib/models/add_wallet_list_entity/sub_classes/coin_entity.dart
new file mode 100644
index 000000000..50ced5c62
--- /dev/null
+++ b/lib/models/add_wallet_list_entity/sub_classes/coin_entity.dart
@@ -0,0 +1,30 @@
+/* 
+ * This file is part of Stack Wallet.
+ * 
+ * Copyright (c) 2023 Cypher Stack
+ * All Rights Reserved.
+ * The code is distributed under GPLv3 license, see LICENSE file for details.
+ * Generated by Cypher Stack on 2023-05-26
+ *
+ */
+
+import 'package:stackduo/models/add_wallet_list_entity/add_wallet_list_entity.dart';
+import 'package:stackduo/utilities/enums/coin_enum.dart';
+
+class CoinEntity extends AddWalletListEntity {
+  CoinEntity(this._coin);
+
+  final Coin _coin;
+
+  @override
+  Coin get coin => _coin;
+
+  @override
+  String get name => coin.prettyName;
+
+  @override
+  String get ticker => coin.ticker;
+
+  @override
+  List<Object?> get props => [coin, name, ticker];
+}
diff --git a/lib/models/isar/models/blockchain_data/address.dart b/lib/models/isar/models/blockchain_data/address.dart
index 5b1c6e28c..b6b186c76 100644
--- a/lib/models/isar/models/blockchain_data/address.dart
+++ b/lib/models/isar/models/blockchain_data/address.dart
@@ -122,7 +122,10 @@ enum AddressType {
   cryptonote,
   mimbleWimble,
   unknown,
-  nonWallet;
+  nonWallet,
+  ethereum,
+  nano,
+  banano;
 
   String get readableName {
     switch (this) {
@@ -140,6 +143,12 @@ enum AddressType {
         return "Unknown";
       case AddressType.nonWallet:
         return "Non wallet/unknown";
+      case AddressType.ethereum:
+        return "Ethereum";
+      case AddressType.nano:
+        return "Nano";
+      case AddressType.banano:
+        return "Banano";
     }
   }
 }
diff --git a/lib/models/isar/models/blockchain_data/address.g.dart b/lib/models/isar/models/blockchain_data/address.g.dart
index 37186584b..356904d2c 100644
--- a/lib/models/isar/models/blockchain_data/address.g.dart
+++ b/lib/models/isar/models/blockchain_data/address.g.dart
@@ -260,6 +260,9 @@ const _AddresstypeEnumValueMap = {
   'mimbleWimble': 4,
   'unknown': 5,
   'nonWallet': 6,
+  'ethereum': 7,
+  'nano': 8,
+  'banano': 9,
 };
 const _AddresstypeValueEnumMap = {
   0: AddressType.p2pkh,
@@ -269,6 +272,9 @@ const _AddresstypeValueEnumMap = {
   4: AddressType.mimbleWimble,
   5: AddressType.unknown,
   6: AddressType.nonWallet,
+  7: AddressType.ethereum,
+  8: AddressType.nano,
+  9: AddressType.banano,
 };
 
 Id _addressGetId(Address object) {
diff --git a/lib/models/isar/models/blockchain_data/transaction.dart b/lib/models/isar/models/blockchain_data/transaction.dart
index 70322d385..3b22287f4 100644
--- a/lib/models/isar/models/blockchain_data/transaction.dart
+++ b/lib/models/isar/models/blockchain_data/transaction.dart
@@ -12,6 +12,7 @@ part 'transaction.g.dart';
 
 @Collection()
 class Transaction {
+
   Transaction({
     required this.walletId,
     required this.txid,
@@ -29,6 +30,7 @@ class Transaction {
     required this.inputs,
     required this.outputs,
     required this.nonce,
+    required this.numberOfMessages,
   });
 
   Tuple2<Transaction, Address?> copyWith({
@@ -50,6 +52,7 @@ class Transaction {
     int? nonce,
     Id? id,
     Address? address,
+    int? numberOfMessages,
   }) {
     return Tuple2(
       Transaction(
@@ -68,7 +71,8 @@ class Transaction {
           otherData: otherData ?? this.otherData,
           nonce: nonce ?? this.nonce,
           inputs: inputs ?? this.inputs,
-          outputs: outputs ?? this.outputs)
+          outputs: outputs ?? this.outputs,
+          numberOfMessages: numberOfMessages ?? this.numberOfMessages)
         ..id = id ?? this.id,
       address ?? this.address.value,
     );
@@ -114,6 +118,8 @@ class Transaction {
 
   late final List<Output> outputs;
 
+  late final int? numberOfMessages;
+
   @Backlink(to: "transactions")
   final address = IsarLink<Address>();
 
@@ -154,6 +160,7 @@ class Transaction {
       "address: ${address.value}, "
       "inputsLength: ${inputs.length}, "
       "outputsLength: ${outputs.length}, "
+      "numberOfMessages: $numberOfMessages, "
       "}";
 
   String toJsonString() {
@@ -175,6 +182,7 @@ class Transaction {
       "address": address.value?.toJsonString(),
       "inputs": inputs.map((e) => e.toJsonString()).toList(),
       "outputs": outputs.map((e) => e.toJsonString()).toList(),
+      "numberOfMessages": numberOfMessages,
     };
     return jsonEncode(result);
   }
@@ -205,6 +213,7 @@ class Transaction {
       outputs: List<String>.from(json["outputs"] as List)
           .map((e) => Output.fromJsonString(e))
           .toList(),
+      numberOfMessages: json["numberOfMessages"] as int,
     );
     if (json["address"] == null) {
       return Tuple2(transaction, null);
diff --git a/lib/models/isar/models/blockchain_data/transaction.g.dart b/lib/models/isar/models/blockchain_data/transaction.g.dart
index 74a5a1652..c11649ddb 100644
--- a/lib/models/isar/models/blockchain_data/transaction.g.dart
+++ b/lib/models/isar/models/blockchain_data/transaction.g.dart
@@ -58,46 +58,51 @@ const TransactionSchema = CollectionSchema(
       name: r'nonce',
       type: IsarType.long,
     ),
-    r'otherData': PropertySchema(
+    r'numberOfMessages': PropertySchema(
       id: 8,
+      name: r'numberOfMessages',
+      type: IsarType.long,
+    ),
+    r'otherData': PropertySchema(
+      id: 9,
       name: r'otherData',
       type: IsarType.string,
     ),
     r'outputs': PropertySchema(
-      id: 9,
+      id: 10,
       name: r'outputs',
       type: IsarType.objectList,
       target: r'Output',
     ),
     r'slateId': PropertySchema(
-      id: 10,
+      id: 11,
       name: r'slateId',
       type: IsarType.string,
     ),
     r'subType': PropertySchema(
-      id: 11,
+      id: 12,
       name: r'subType',
       type: IsarType.byte,
       enumMap: _TransactionsubTypeEnumValueMap,
     ),
     r'timestamp': PropertySchema(
-      id: 12,
+      id: 13,
       name: r'timestamp',
       type: IsarType.long,
     ),
     r'txid': PropertySchema(
-      id: 13,
+      id: 14,
       name: r'txid',
       type: IsarType.string,
     ),
     r'type': PropertySchema(
-      id: 14,
+      id: 15,
       name: r'type',
       type: IsarType.byte,
       enumMap: _TransactiontypeEnumValueMap,
     ),
     r'walletId': PropertySchema(
-      id: 15,
+      id: 16,
       name: r'walletId',
       type: IsarType.string,
     )
@@ -233,19 +238,20 @@ void _transactionSerialize(
   writer.writeBool(offsets[5], object.isCancelled);
   writer.writeBool(offsets[6], object.isLelantus);
   writer.writeLong(offsets[7], object.nonce);
-  writer.writeString(offsets[8], object.otherData);
+  writer.writeLong(offsets[8], object.numberOfMessages);
+  writer.writeString(offsets[9], object.otherData);
   writer.writeObjectList<Output>(
-    offsets[9],
+    offsets[10],
     allOffsets,
     OutputSchema.serialize,
     object.outputs,
   );
-  writer.writeString(offsets[10], object.slateId);
-  writer.writeByte(offsets[11], object.subType.index);
-  writer.writeLong(offsets[12], object.timestamp);
-  writer.writeString(offsets[13], object.txid);
-  writer.writeByte(offsets[14], object.type.index);
-  writer.writeString(offsets[15], object.walletId);
+  writer.writeString(offsets[11], object.slateId);
+  writer.writeByte(offsets[12], object.subType.index);
+  writer.writeLong(offsets[13], object.timestamp);
+  writer.writeString(offsets[14], object.txid);
+  writer.writeByte(offsets[15], object.type.index);
+  writer.writeString(offsets[16], object.walletId);
 }
 
 Transaction _transactionDeserialize(
@@ -269,23 +275,24 @@ Transaction _transactionDeserialize(
     isCancelled: reader.readBool(offsets[5]),
     isLelantus: reader.readBoolOrNull(offsets[6]),
     nonce: reader.readLongOrNull(offsets[7]),
-    otherData: reader.readStringOrNull(offsets[8]),
+    numberOfMessages: reader.readLongOrNull(offsets[8]),
+    otherData: reader.readStringOrNull(offsets[9]),
     outputs: reader.readObjectList<Output>(
-          offsets[9],
+          offsets[10],
           OutputSchema.deserialize,
           allOffsets,
           Output(),
         ) ??
         [],
-    slateId: reader.readStringOrNull(offsets[10]),
+    slateId: reader.readStringOrNull(offsets[11]),
     subType:
-        _TransactionsubTypeValueEnumMap[reader.readByteOrNull(offsets[11])] ??
+        _TransactionsubTypeValueEnumMap[reader.readByteOrNull(offsets[12])] ??
             TransactionSubType.none,
-    timestamp: reader.readLong(offsets[12]),
-    txid: reader.readString(offsets[13]),
-    type: _TransactiontypeValueEnumMap[reader.readByteOrNull(offsets[14])] ??
+    timestamp: reader.readLong(offsets[13]),
+    txid: reader.readString(offsets[14]),
+    type: _TransactiontypeValueEnumMap[reader.readByteOrNull(offsets[15])] ??
         TransactionType.outgoing,
-    walletId: reader.readString(offsets[15]),
+    walletId: reader.readString(offsets[16]),
   );
   object.id = id;
   return object;
@@ -321,8 +328,10 @@ P _transactionDeserializeProp<P>(
     case 7:
       return (reader.readLongOrNull(offset)) as P;
     case 8:
-      return (reader.readStringOrNull(offset)) as P;
+      return (reader.readLongOrNull(offset)) as P;
     case 9:
+      return (reader.readStringOrNull(offset)) as P;
+    case 10:
       return (reader.readObjectList<Output>(
             offset,
             OutputSchema.deserialize,
@@ -330,19 +339,19 @@ P _transactionDeserializeProp<P>(
             Output(),
           ) ??
           []) as P;
-    case 10:
-      return (reader.readStringOrNull(offset)) as P;
     case 11:
+      return (reader.readStringOrNull(offset)) as P;
+    case 12:
       return (_TransactionsubTypeValueEnumMap[reader.readByteOrNull(offset)] ??
           TransactionSubType.none) as P;
-    case 12:
-      return (reader.readLong(offset)) as P;
     case 13:
-      return (reader.readString(offset)) as P;
+      return (reader.readLong(offset)) as P;
     case 14:
+      return (reader.readString(offset)) as P;
+    case 15:
       return (_TransactiontypeValueEnumMap[reader.readByteOrNull(offset)] ??
           TransactionType.outgoing) as P;
-    case 15:
+    case 16:
       return (reader.readString(offset)) as P;
     default:
       throw IsarError('Unknown property with id $propertyId');
@@ -1374,6 +1383,80 @@ extension TransactionQueryFilter
     });
   }
 
+  QueryBuilder<Transaction, Transaction, QAfterFilterCondition>
+      numberOfMessagesIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'numberOfMessages',
+      ));
+    });
+  }
+
+  QueryBuilder<Transaction, Transaction, QAfterFilterCondition>
+      numberOfMessagesIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'numberOfMessages',
+      ));
+    });
+  }
+
+  QueryBuilder<Transaction, Transaction, QAfterFilterCondition>
+      numberOfMessagesEqualTo(int? value) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'numberOfMessages',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<Transaction, Transaction, QAfterFilterCondition>
+      numberOfMessagesGreaterThan(
+    int? value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'numberOfMessages',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<Transaction, Transaction, QAfterFilterCondition>
+      numberOfMessagesLessThan(
+    int? value, {
+    bool include = false,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'numberOfMessages',
+        value: value,
+      ));
+    });
+  }
+
+  QueryBuilder<Transaction, Transaction, QAfterFilterCondition>
+      numberOfMessagesBetween(
+    int? lower,
+    int? upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'numberOfMessages',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+      ));
+    });
+  }
+
   QueryBuilder<Transaction, Transaction, QAfterFilterCondition>
       otherDataIsNull() {
     return QueryBuilder.apply(this, (query) {
@@ -2320,6 +2403,20 @@ extension TransactionQuerySortBy
     });
   }
 
+  QueryBuilder<Transaction, Transaction, QAfterSortBy>
+      sortByNumberOfMessages() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'numberOfMessages', Sort.asc);
+    });
+  }
+
+  QueryBuilder<Transaction, Transaction, QAfterSortBy>
+      sortByNumberOfMessagesDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'numberOfMessages', Sort.desc);
+    });
+  }
+
   QueryBuilder<Transaction, Transaction, QAfterSortBy> sortByOtherData() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'otherData', Sort.asc);
@@ -2504,6 +2601,20 @@ extension TransactionQuerySortThenBy
     });
   }
 
+  QueryBuilder<Transaction, Transaction, QAfterSortBy>
+      thenByNumberOfMessages() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'numberOfMessages', Sort.asc);
+    });
+  }
+
+  QueryBuilder<Transaction, Transaction, QAfterSortBy>
+      thenByNumberOfMessagesDesc() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addSortBy(r'numberOfMessages', Sort.desc);
+    });
+  }
+
   QueryBuilder<Transaction, Transaction, QAfterSortBy> thenByOtherData() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'otherData', Sort.asc);
@@ -2634,6 +2745,13 @@ extension TransactionQueryWhereDistinct
     });
   }
 
+  QueryBuilder<Transaction, Transaction, QDistinct>
+      distinctByNumberOfMessages() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addDistinctBy(r'numberOfMessages');
+    });
+  }
+
   QueryBuilder<Transaction, Transaction, QDistinct> distinctByOtherData(
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -2737,6 +2855,12 @@ extension TransactionQueryProperty
     });
   }
 
+  QueryBuilder<Transaction, int?, QQueryOperations> numberOfMessagesProperty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'numberOfMessages');
+    });
+  }
+
   QueryBuilder<Transaction, String?, QQueryOperations> otherDataProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'otherData');
diff --git a/lib/models/isar/stack_theme.dart b/lib/models/isar/stack_theme.dart
index a76be7ad9..7c4a2c930 100644
--- a/lib/models/isar/stack_theme.dart
+++ b/lib/models/isar/stack_theme.dart
@@ -1483,8 +1483,12 @@ class StackTheme {
 
   late final ThemeAssetsV2? assetsV2;
 
+  // cheat build runner into adding this at end of property id list in isar
+  @Name("zAssetsV3")
+  late final ThemeAssetsV3? assetsV3;
+
   @ignore
-  IThemeAssets get assets => assetsV2 ?? assetsV1!;
+  IThemeAssets get assets => assetsV3 ?? assetsV2 ?? assetsV1!;
 
   // ===========================================================================
 
@@ -1507,13 +1511,20 @@ class StackTheme {
               themeId: json["id"] as String,
             )
           : null
-      ..assetsV2 = version >= 2
+      ..assetsV2 = version == 2
           ? ThemeAssetsV2.fromJson(
               json: Map<String, dynamic>.from(json["assets"] as Map),
               applicationThemesDirectoryPath: applicationThemesDirectoryPath,
               themeId: json["id"] as String,
             )
           : null
+      ..assetsV3 = version >= 3
+          ? ThemeAssetsV3.fromJson(
+              json: Map<String, dynamic>.from(json["assets"] as Map),
+              applicationThemesDirectoryPath: applicationThemesDirectoryPath,
+              themeId: json["id"] as String,
+            )
+          : null
       ..themeId = json["id"] as String
       ..name = json["name"] as String
       ..brightnessString = json["brightness"] as String
@@ -1866,11 +1877,8 @@ class ThemeAssets implements IThemeAssets {
   late final String personaEasy;
   @override
   late final String stack;
-
   @override
-  @Deprecated("Use assets.dart's appIcon()")
   late final String stackIcon;
-
   @override
   late final String receive;
   @override
@@ -1932,8 +1940,6 @@ class ThemeAssets implements IThemeAssets {
   @override
   late final String? background;
 
-  // todo: add all assets expected in json
-
   ThemeAssets();
 
   factory ThemeAssets.fromJson({
@@ -2215,6 +2221,261 @@ class ThemeAssetsV2 implements IThemeAssets {
 
     return result;
   }
+
+  @override
+  String toString() {
+    return 'ThemeAssetsV2('
+        'bellNew: $bellNew, '
+        'buy: $buy, '
+        'exchange: $exchange, '
+        'personaIncognito: $personaIncognito, '
+        'personaEasy: $personaEasy, '
+        'stack: $stack, '
+        'stackIcon: $stackIcon, '
+        'receive: $receive, '
+        'receivePending: $receivePending, '
+        'receiveCancelled: $receiveCancelled, '
+        'send: $send, '
+        'sendPending: $sendPending, '
+        'sendCancelled: $sendCancelled, '
+        'themeSelector: $themeSelector, '
+        'themePreview: $themePreview, '
+        'txExchange: $txExchange, '
+        'txExchangePending: $txExchangePending, '
+        'txExchangeFailed: $txExchangeFailed, '
+        'loadingGif: $loadingGif, '
+        'background: $background, '
+        'coinPlaceholder: $coinPlaceholder, '
+        'coinIcons: $coinIcons, '
+        'coinImages: $coinImages, '
+        'coinSecondaryImages: $coinSecondaryImages, '
+        ')';
+  }
+}
+
+@Embedded(inheritance: false)
+class ThemeAssetsV3 implements IThemeAssets {
+  @override
+  late final String bellNew;
+  @override
+  late final String buy;
+  @override
+  late final String exchange;
+  @override
+  late final String personaIncognito;
+  @override
+  late final String personaEasy;
+  @override
+  late final String stack;
+  @override
+  late final String stackIcon;
+  @override
+  late final String receive;
+  @override
+  late final String receivePending;
+  @override
+  late final String receiveCancelled;
+  @override
+  late final String send;
+  @override
+  late final String sendPending;
+  @override
+  late final String sendCancelled;
+  @override
+  late final String themeSelector;
+  @override
+  late final String themePreview;
+  @override
+  late final String txExchange;
+  @override
+  late final String txExchangePending;
+  @override
+  late final String txExchangeFailed;
+  @override
+  late final String? loadingGif;
+  @override
+  late final String? background;
+
+  late final String coinPlaceholder;
+
+  // Added some future proof params in case we want to add anything else
+  // This should provide some buffer in stead of creating assetsV4 etc
+  @Name("otherStringParam1")
+  late final String? dummy1;
+  @Name("otherStringParam2")
+  late final String? dummy2;
+  @Name("otherStringParam3")
+  late final String? dummy3;
+
+  @ignore
+  Map<Coin, String> get coinIcons => _coinIcons ??= parseCoinAssetsString(
+        coinIconsString,
+        placeHolder: coinPlaceholder,
+      );
+  @ignore
+  Map<Coin, String>? _coinIcons;
+  late final String coinIconsString;
+
+  @ignore
+  Map<Coin, String> get coinImages => _coinImages ??= parseCoinAssetsString(
+        coinImagesString,
+        placeHolder: coinPlaceholder,
+      );
+  @ignore
+  Map<Coin, String>? _coinImages;
+  late final String coinImagesString;
+
+  @ignore
+  Map<Coin, String> get coinSecondaryImages =>
+      _coinSecondaryImages ??= parseCoinAssetsString(
+        coinSecondaryImagesString,
+        placeHolder: coinPlaceholder,
+      );
+  @ignore
+  Map<Coin, String>? _coinSecondaryImages;
+  late final String coinSecondaryImagesString;
+
+  @ignore
+  Map<Coin, String>? get coinCardImages =>
+      _coinCardImages ??= coinCardImagesString == null
+          ? null
+          : parseCoinAssetsString(
+              coinCardImagesString!,
+              placeHolder: coinPlaceholder,
+            );
+  @ignore
+  Map<Coin, String>? _coinCardImages;
+  late final String? coinCardImagesString;
+
+  ThemeAssetsV3();
+
+  factory ThemeAssetsV3.fromJson({
+    required Map<String, dynamic> json,
+    required String applicationThemesDirectoryPath,
+    required String themeId,
+  }) {
+    return ThemeAssetsV3()
+      ..bellNew =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["bell_new"] as String}"
+      ..buy =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["buy"] as String}"
+      ..exchange =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["exchange"] as String}"
+      ..personaIncognito =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_incognito"] as String}"
+      ..personaEasy =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_easy"] as String}"
+      ..stack =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack"] as String}"
+      ..stackIcon =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack_icon"] as String}"
+      ..receive =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive"] as String}"
+      ..receivePending =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_pending"] as String}"
+      ..receiveCancelled =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_cancelled"] as String}"
+      ..send =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["send"] as String}"
+      ..sendPending =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_pending"] as String}"
+      ..sendCancelled =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_cancelled"] as String}"
+      ..themeSelector =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_selector"] as String}"
+      ..themePreview =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_preview"] as String}"
+      ..txExchange =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange"] as String}"
+      ..txExchangePending =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_pending"] as String}"
+      ..txExchangeFailed =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_failed"] as String}"
+      ..coinPlaceholder =
+          "$applicationThemesDirectoryPath/$themeId/assets/${json["coin_placeholder"] as String}"
+      ..coinIconsString = createCoinAssetsString(
+        "$applicationThemesDirectoryPath/$themeId/assets",
+        Map<String, dynamic>.from(json["coins"]["icons"] as Map),
+      )
+      ..coinImagesString = createCoinAssetsString(
+        "$applicationThemesDirectoryPath/$themeId/assets",
+        Map<String, dynamic>.from(json["coins"]["images"] as Map),
+      )
+      ..coinSecondaryImagesString = createCoinAssetsString(
+        "$applicationThemesDirectoryPath/$themeId/assets",
+        Map<String, dynamic>.from(json["coins"]["secondaries"] as Map),
+      )
+      ..coinCardImagesString = json["coins"]["cards"] is Map
+          ? createCoinAssetsString(
+              "$applicationThemesDirectoryPath/$themeId/assets",
+              Map<String, dynamic>.from(json["coins"]["cards"] as Map),
+            )
+          : null
+      ..loadingGif = json["loading_gif"] is String
+          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["loading_gif"] as String}"
+          : null
+      ..background = json["background"] is String
+          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["background"] as String}"
+          : null
+      ..dummy1 = null
+      ..dummy2 = null
+      ..dummy3 = null;
+  }
+
+  static String createCoinAssetsString(String path, Map<String, dynamic> json) {
+    final Map<String, dynamic> map = {};
+    for (final entry in json.entries) {
+      map[entry.key] = "$path/${entry.value as String}";
+    }
+    return jsonEncode(map);
+  }
+
+  static Map<Coin, String> parseCoinAssetsString(
+    String jsonString, {
+    required String placeHolder,
+  }) {
+    final json = jsonDecode(jsonString) as Map;
+    final map = Map<String, dynamic>.from(json);
+
+    final Map<Coin, String> result = {};
+
+    for (final coin in Coin.values) {
+      result[coin] = map[coin.name] as String? ?? placeHolder;
+    }
+
+    return result;
+  }
+
+  @override
+  String toString() {
+    return 'ThemeAssetsV3('
+        'bellNew: $bellNew, '
+        'buy: $buy, '
+        'exchange: $exchange, '
+        'personaIncognito: $personaIncognito, '
+        'personaEasy: $personaEasy, '
+        'stack: $stack, '
+        'stackIcon: $stackIcon, '
+        'receive: $receive, '
+        'receivePending: $receivePending, '
+        'receiveCancelled: $receiveCancelled, '
+        'send: $send, '
+        'sendPending: $sendPending, '
+        'sendCancelled: $sendCancelled, '
+        'themeSelector: $themeSelector, '
+        'themePreview: $themePreview, '
+        'txExchange: $txExchange, '
+        'txExchangePending: $txExchangePending, '
+        'txExchangeFailed: $txExchangeFailed, '
+        'loadingGif: $loadingGif, '
+        'background: $background, '
+        'coinPlaceholder: $coinPlaceholder, '
+        'coinIcons: $coinIcons, '
+        'coinImages: $coinImages, '
+        'coinSecondaryImages: $coinSecondaryImages, '
+        'coinCardImages: $coinCardImages'
+        ')';
+  }
 }
 
 abstract class IThemeAssets {
diff --git a/lib/models/isar/stack_theme.g.dart b/lib/models/isar/stack_theme.g.dart
index ad6f905bd..e1bb0a549 100644
--- a/lib/models/isar/stack_theme.g.dart
+++ b/lib/models/isar/stack_theme.g.dart
@@ -823,6 +823,12 @@ const StackThemeSchema = CollectionSchema(
       id: 160,
       name: r'warningForegroundInt',
       type: IsarType.long,
+    ),
+    r'zAssetsV3': PropertySchema(
+      id: 161,
+      name: r'zAssetsV3',
+      type: IsarType.object,
+      target: r'ThemeAssetsV3',
     )
   },
   estimateSize: _stackThemeEstimateSize,
@@ -848,7 +854,8 @@ const StackThemeSchema = CollectionSchema(
   links: {},
   embeddedSchemas: {
     r'ThemeAssets': ThemeAssetsSchema,
-    r'ThemeAssetsV2': ThemeAssetsV2Schema
+    r'ThemeAssetsV2': ThemeAssetsV2Schema,
+    r'ThemeAssetsV3': ThemeAssetsV3Schema
   },
   getId: _stackThemeGetId,
   getLinks: _stackThemeGetLinks,
@@ -895,6 +902,14 @@ int _stackThemeEstimateSize(
   bytesCount += 3 + object.name.length * 3;
   bytesCount += 3 + object.standardBoxShadowString.length * 3;
   bytesCount += 3 + object.themeId.length * 3;
+  {
+    final value = object.assetsV3;
+    if (value != null) {
+      bytesCount += 3 +
+          ThemeAssetsV3Schema.estimateSize(
+              value, allOffsets[ThemeAssetsV3]!, allOffsets);
+    }
+  }
   return bytesCount;
 }
 
@@ -1075,6 +1090,12 @@ void _stackThemeSerialize(
   writer.writeLong(offsets[158], object.version);
   writer.writeLong(offsets[159], object.warningBackgroundInt);
   writer.writeLong(offsets[160], object.warningForegroundInt);
+  writer.writeObject<ThemeAssetsV3>(
+    offsets[161],
+    allOffsets,
+    ThemeAssetsV3Schema.serialize,
+    object.assetsV3,
+  );
 }
 
 StackTheme _stackThemeDeserialize(
@@ -1255,6 +1276,11 @@ StackTheme _stackThemeDeserialize(
   object.version = reader.readLongOrNull(offsets[158]);
   object.warningBackgroundInt = reader.readLong(offsets[159]);
   object.warningForegroundInt = reader.readLong(offsets[160]);
+  object.assetsV3 = reader.readObjectOrNull<ThemeAssetsV3>(
+    offsets[161],
+    ThemeAssetsV3Schema.deserialize,
+    allOffsets,
+  );
   return object;
 }
 
@@ -1595,6 +1621,12 @@ P _stackThemeDeserializeProp<P>(
       return (reader.readLong(offset)) as P;
     case 160:
       return (reader.readLong(offset)) as P;
+    case 161:
+      return (reader.readObjectOrNull<ThemeAssetsV3>(
+        offset,
+        ThemeAssetsV3Schema.deserialize,
+        allOffsets,
+      )) as P;
     default:
       throw IsarError('Unknown property with id $propertyId');
   }
@@ -11382,6 +11414,23 @@ extension StackThemeQueryFilter
       ));
     });
   }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> assetsV3IsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'zAssetsV3',
+      ));
+    });
+  }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition>
+      assetsV3IsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'zAssetsV3',
+      ));
+    });
+  }
 }
 
 extension StackThemeQueryObject
@@ -11399,6 +11448,13 @@ extension StackThemeQueryObject
       return query.object(q, r'assetsV2');
     });
   }
+
+  QueryBuilder<StackTheme, StackTheme, QAfterFilterCondition> assetsV3(
+      FilterQuery<ThemeAssetsV3> q) {
+    return QueryBuilder.apply(this, (query) {
+      return query.object(q, r'zAssetsV3');
+    });
+  }
 }
 
 extension StackThemeQueryLinks
@@ -17942,6 +17998,13 @@ extension StackThemeQueryProperty
       return query.addPropertyName(r'warningForegroundInt');
     });
   }
+
+  QueryBuilder<StackTheme, ThemeAssetsV3?, QQueryOperations>
+      assetsV3Property() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addPropertyName(r'zAssetsV3');
+    });
+  }
 }
 
 // **************************************************************************
@@ -29376,3 +29439,4287 @@ extension ThemeAssetsV2QueryFilter
 
 extension ThemeAssetsV2QueryObject
     on QueryBuilder<ThemeAssetsV2, ThemeAssetsV2, QFilterCondition> {}
+
+// coverage:ignore-file
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+
+const ThemeAssetsV3Schema = Schema(
+  name: r'ThemeAssetsV3',
+  id: -8828098514594684151,
+  properties: {
+    r'background': PropertySchema(
+      id: 0,
+      name: r'background',
+      type: IsarType.string,
+    ),
+    r'bellNew': PropertySchema(
+      id: 1,
+      name: r'bellNew',
+      type: IsarType.string,
+    ),
+    r'buy': PropertySchema(
+      id: 2,
+      name: r'buy',
+      type: IsarType.string,
+    ),
+    r'coinCardImagesString': PropertySchema(
+      id: 3,
+      name: r'coinCardImagesString',
+      type: IsarType.string,
+    ),
+    r'coinIconsString': PropertySchema(
+      id: 4,
+      name: r'coinIconsString',
+      type: IsarType.string,
+    ),
+    r'coinImagesString': PropertySchema(
+      id: 5,
+      name: r'coinImagesString',
+      type: IsarType.string,
+    ),
+    r'coinPlaceholder': PropertySchema(
+      id: 6,
+      name: r'coinPlaceholder',
+      type: IsarType.string,
+    ),
+    r'coinSecondaryImagesString': PropertySchema(
+      id: 7,
+      name: r'coinSecondaryImagesString',
+      type: IsarType.string,
+    ),
+    r'exchange': PropertySchema(
+      id: 8,
+      name: r'exchange',
+      type: IsarType.string,
+    ),
+    r'loadingGif': PropertySchema(
+      id: 9,
+      name: r'loadingGif',
+      type: IsarType.string,
+    ),
+    r'otherStringParam1': PropertySchema(
+      id: 10,
+      name: r'otherStringParam1',
+      type: IsarType.string,
+    ),
+    r'otherStringParam2': PropertySchema(
+      id: 11,
+      name: r'otherStringParam2',
+      type: IsarType.string,
+    ),
+    r'otherStringParam3': PropertySchema(
+      id: 12,
+      name: r'otherStringParam3',
+      type: IsarType.string,
+    ),
+    r'personaEasy': PropertySchema(
+      id: 13,
+      name: r'personaEasy',
+      type: IsarType.string,
+    ),
+    r'personaIncognito': PropertySchema(
+      id: 14,
+      name: r'personaIncognito',
+      type: IsarType.string,
+    ),
+    r'receive': PropertySchema(
+      id: 15,
+      name: r'receive',
+      type: IsarType.string,
+    ),
+    r'receiveCancelled': PropertySchema(
+      id: 16,
+      name: r'receiveCancelled',
+      type: IsarType.string,
+    ),
+    r'receivePending': PropertySchema(
+      id: 17,
+      name: r'receivePending',
+      type: IsarType.string,
+    ),
+    r'send': PropertySchema(
+      id: 18,
+      name: r'send',
+      type: IsarType.string,
+    ),
+    r'sendCancelled': PropertySchema(
+      id: 19,
+      name: r'sendCancelled',
+      type: IsarType.string,
+    ),
+    r'sendPending': PropertySchema(
+      id: 20,
+      name: r'sendPending',
+      type: IsarType.string,
+    ),
+    r'stack': PropertySchema(
+      id: 21,
+      name: r'stack',
+      type: IsarType.string,
+    ),
+    r'stackIcon': PropertySchema(
+      id: 22,
+      name: r'stackIcon',
+      type: IsarType.string,
+    ),
+    r'themePreview': PropertySchema(
+      id: 23,
+      name: r'themePreview',
+      type: IsarType.string,
+    ),
+    r'themeSelector': PropertySchema(
+      id: 24,
+      name: r'themeSelector',
+      type: IsarType.string,
+    ),
+    r'txExchange': PropertySchema(
+      id: 25,
+      name: r'txExchange',
+      type: IsarType.string,
+    ),
+    r'txExchangeFailed': PropertySchema(
+      id: 26,
+      name: r'txExchangeFailed',
+      type: IsarType.string,
+    ),
+    r'txExchangePending': PropertySchema(
+      id: 27,
+      name: r'txExchangePending',
+      type: IsarType.string,
+    )
+  },
+  estimateSize: _themeAssetsV3EstimateSize,
+  serialize: _themeAssetsV3Serialize,
+  deserialize: _themeAssetsV3Deserialize,
+  deserializeProp: _themeAssetsV3DeserializeProp,
+);
+
+int _themeAssetsV3EstimateSize(
+  ThemeAssetsV3 object,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  var bytesCount = offsets.last;
+  {
+    final value = object.background;
+    if (value != null) {
+      bytesCount += 3 + value.length * 3;
+    }
+  }
+  bytesCount += 3 + object.bellNew.length * 3;
+  bytesCount += 3 + object.buy.length * 3;
+  {
+    final value = object.coinCardImagesString;
+    if (value != null) {
+      bytesCount += 3 + value.length * 3;
+    }
+  }
+  bytesCount += 3 + object.coinIconsString.length * 3;
+  bytesCount += 3 + object.coinImagesString.length * 3;
+  bytesCount += 3 + object.coinPlaceholder.length * 3;
+  bytesCount += 3 + object.coinSecondaryImagesString.length * 3;
+  bytesCount += 3 + object.exchange.length * 3;
+  {
+    final value = object.loadingGif;
+    if (value != null) {
+      bytesCount += 3 + value.length * 3;
+    }
+  }
+  {
+    final value = object.dummy1;
+    if (value != null) {
+      bytesCount += 3 + value.length * 3;
+    }
+  }
+  {
+    final value = object.dummy2;
+    if (value != null) {
+      bytesCount += 3 + value.length * 3;
+    }
+  }
+  {
+    final value = object.dummy3;
+    if (value != null) {
+      bytesCount += 3 + value.length * 3;
+    }
+  }
+  bytesCount += 3 + object.personaEasy.length * 3;
+  bytesCount += 3 + object.personaIncognito.length * 3;
+  bytesCount += 3 + object.receive.length * 3;
+  bytesCount += 3 + object.receiveCancelled.length * 3;
+  bytesCount += 3 + object.receivePending.length * 3;
+  bytesCount += 3 + object.send.length * 3;
+  bytesCount += 3 + object.sendCancelled.length * 3;
+  bytesCount += 3 + object.sendPending.length * 3;
+  bytesCount += 3 + object.stack.length * 3;
+  bytesCount += 3 + object.stackIcon.length * 3;
+  bytesCount += 3 + object.themePreview.length * 3;
+  bytesCount += 3 + object.themeSelector.length * 3;
+  bytesCount += 3 + object.txExchange.length * 3;
+  bytesCount += 3 + object.txExchangeFailed.length * 3;
+  bytesCount += 3 + object.txExchangePending.length * 3;
+  return bytesCount;
+}
+
+void _themeAssetsV3Serialize(
+  ThemeAssetsV3 object,
+  IsarWriter writer,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  writer.writeString(offsets[0], object.background);
+  writer.writeString(offsets[1], object.bellNew);
+  writer.writeString(offsets[2], object.buy);
+  writer.writeString(offsets[3], object.coinCardImagesString);
+  writer.writeString(offsets[4], object.coinIconsString);
+  writer.writeString(offsets[5], object.coinImagesString);
+  writer.writeString(offsets[6], object.coinPlaceholder);
+  writer.writeString(offsets[7], object.coinSecondaryImagesString);
+  writer.writeString(offsets[8], object.exchange);
+  writer.writeString(offsets[9], object.loadingGif);
+  writer.writeString(offsets[10], object.dummy1);
+  writer.writeString(offsets[11], object.dummy2);
+  writer.writeString(offsets[12], object.dummy3);
+  writer.writeString(offsets[13], object.personaEasy);
+  writer.writeString(offsets[14], object.personaIncognito);
+  writer.writeString(offsets[15], object.receive);
+  writer.writeString(offsets[16], object.receiveCancelled);
+  writer.writeString(offsets[17], object.receivePending);
+  writer.writeString(offsets[18], object.send);
+  writer.writeString(offsets[19], object.sendCancelled);
+  writer.writeString(offsets[20], object.sendPending);
+  writer.writeString(offsets[21], object.stack);
+  writer.writeString(offsets[22], object.stackIcon);
+  writer.writeString(offsets[23], object.themePreview);
+  writer.writeString(offsets[24], object.themeSelector);
+  writer.writeString(offsets[25], object.txExchange);
+  writer.writeString(offsets[26], object.txExchangeFailed);
+  writer.writeString(offsets[27], object.txExchangePending);
+}
+
+ThemeAssetsV3 _themeAssetsV3Deserialize(
+  Id id,
+  IsarReader reader,
+  List<int> offsets,
+  Map<Type, List<int>> allOffsets,
+) {
+  final object = ThemeAssetsV3();
+  object.background = reader.readStringOrNull(offsets[0]);
+  object.bellNew = reader.readString(offsets[1]);
+  object.buy = reader.readString(offsets[2]);
+  object.coinCardImagesString = reader.readStringOrNull(offsets[3]);
+  object.coinIconsString = reader.readString(offsets[4]);
+  object.coinImagesString = reader.readString(offsets[5]);
+  object.coinPlaceholder = reader.readString(offsets[6]);
+  object.coinSecondaryImagesString = reader.readString(offsets[7]);
+  object.exchange = reader.readString(offsets[8]);
+  object.loadingGif = reader.readStringOrNull(offsets[9]);
+  object.dummy1 = reader.readStringOrNull(offsets[10]);
+  object.dummy2 = reader.readStringOrNull(offsets[11]);
+  object.dummy3 = reader.readStringOrNull(offsets[12]);
+  object.personaEasy = reader.readString(offsets[13]);
+  object.personaIncognito = reader.readString(offsets[14]);
+  object.receive = reader.readString(offsets[15]);
+  object.receiveCancelled = reader.readString(offsets[16]);
+  object.receivePending = reader.readString(offsets[17]);
+  object.send = reader.readString(offsets[18]);
+  object.sendCancelled = reader.readString(offsets[19]);
+  object.sendPending = reader.readString(offsets[20]);
+  object.stack = reader.readString(offsets[21]);
+  object.stackIcon = reader.readString(offsets[22]);
+  object.themePreview = reader.readString(offsets[23]);
+  object.themeSelector = reader.readString(offsets[24]);
+  object.txExchange = reader.readString(offsets[25]);
+  object.txExchangeFailed = reader.readString(offsets[26]);
+  object.txExchangePending = reader.readString(offsets[27]);
+  return object;
+}
+
+P _themeAssetsV3DeserializeProp<P>(
+  IsarReader reader,
+  int propertyId,
+  int offset,
+  Map<Type, List<int>> allOffsets,
+) {
+  switch (propertyId) {
+    case 0:
+      return (reader.readStringOrNull(offset)) as P;
+    case 1:
+      return (reader.readString(offset)) as P;
+    case 2:
+      return (reader.readString(offset)) as P;
+    case 3:
+      return (reader.readStringOrNull(offset)) as P;
+    case 4:
+      return (reader.readString(offset)) as P;
+    case 5:
+      return (reader.readString(offset)) as P;
+    case 6:
+      return (reader.readString(offset)) as P;
+    case 7:
+      return (reader.readString(offset)) as P;
+    case 8:
+      return (reader.readString(offset)) as P;
+    case 9:
+      return (reader.readStringOrNull(offset)) as P;
+    case 10:
+      return (reader.readStringOrNull(offset)) as P;
+    case 11:
+      return (reader.readStringOrNull(offset)) as P;
+    case 12:
+      return (reader.readStringOrNull(offset)) as P;
+    case 13:
+      return (reader.readString(offset)) as P;
+    case 14:
+      return (reader.readString(offset)) as P;
+    case 15:
+      return (reader.readString(offset)) as P;
+    case 16:
+      return (reader.readString(offset)) as P;
+    case 17:
+      return (reader.readString(offset)) as P;
+    case 18:
+      return (reader.readString(offset)) as P;
+    case 19:
+      return (reader.readString(offset)) as P;
+    case 20:
+      return (reader.readString(offset)) as P;
+    case 21:
+      return (reader.readString(offset)) as P;
+    case 22:
+      return (reader.readString(offset)) as P;
+    case 23:
+      return (reader.readString(offset)) as P;
+    case 24:
+      return (reader.readString(offset)) as P;
+    case 25:
+      return (reader.readString(offset)) as P;
+    case 26:
+      return (reader.readString(offset)) as P;
+    case 27:
+      return (reader.readString(offset)) as P;
+    default:
+      throw IsarError('Unknown property with id $propertyId');
+  }
+}
+
+extension ThemeAssetsV3QueryFilter
+    on QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QFilterCondition> {
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'background',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'background',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundEqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundGreaterThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundLessThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundBetween(
+    String? lower,
+    String? upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'background',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'background',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'background',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'background',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      backgroundIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'background',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'bellNew',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'bellNew',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'bellNew',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'bellNew',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      bellNewIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'bellNew',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'buy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'buy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'buy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'buy',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'buy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'buy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyContains(
+      String value,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'buy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'buy',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'buy',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'buy',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'coinCardImagesString',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'coinCardImagesString',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringEqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinCardImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringGreaterThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'coinCardImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringLessThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'coinCardImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringBetween(
+    String? lower,
+    String? upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'coinCardImagesString',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'coinCardImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'coinCardImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'coinCardImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'coinCardImagesString',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinCardImagesString',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinCardImagesStringIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'coinCardImagesString',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinIconsString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'coinIconsString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'coinIconsString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'coinIconsString',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'coinIconsString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'coinIconsString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'coinIconsString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'coinIconsString',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinIconsString',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinIconsStringIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'coinIconsString',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'coinImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'coinImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'coinImagesString',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'coinImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'coinImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'coinImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'coinImagesString',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinImagesString',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinImagesStringIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'coinImagesString',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinPlaceholder',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'coinPlaceholder',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'coinPlaceholder',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'coinPlaceholder',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'coinPlaceholder',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'coinPlaceholder',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'coinPlaceholder',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'coinPlaceholder',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinPlaceholder',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinPlaceholderIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'coinPlaceholder',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinSecondaryImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'coinSecondaryImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'coinSecondaryImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'coinSecondaryImagesString',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'coinSecondaryImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'coinSecondaryImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringContains(String value,
+          {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'coinSecondaryImagesString',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringMatches(String pattern,
+          {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'coinSecondaryImagesString',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'coinSecondaryImagesString',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      coinSecondaryImagesStringIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'coinSecondaryImagesString',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'exchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'exchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'exchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'exchange',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'exchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'exchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'exchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'exchange',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'exchange',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      exchangeIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'exchange',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifIsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'loadingGif',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifIsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'loadingGif',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifEqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'loadingGif',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifGreaterThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'loadingGif',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifLessThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'loadingGif',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifBetween(
+    String? lower,
+    String? upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'loadingGif',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'loadingGif',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'loadingGif',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'loadingGif',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'loadingGif',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'loadingGif',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      loadingGifIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'loadingGif',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1IsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'otherStringParam1',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1IsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'otherStringParam1',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1EqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'otherStringParam1',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1GreaterThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'otherStringParam1',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1LessThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'otherStringParam1',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1Between(
+    String? lower,
+    String? upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'otherStringParam1',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1StartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'otherStringParam1',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1EndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'otherStringParam1',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1Contains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'otherStringParam1',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1Matches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'otherStringParam1',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1IsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'otherStringParam1',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy1IsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'otherStringParam1',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2IsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'otherStringParam2',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2IsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'otherStringParam2',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2EqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'otherStringParam2',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2GreaterThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'otherStringParam2',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2LessThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'otherStringParam2',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2Between(
+    String? lower,
+    String? upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'otherStringParam2',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2StartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'otherStringParam2',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2EndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'otherStringParam2',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2Contains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'otherStringParam2',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2Matches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'otherStringParam2',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2IsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'otherStringParam2',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy2IsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'otherStringParam2',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3IsNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNull(
+        property: r'otherStringParam3',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3IsNotNull() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(const FilterCondition.isNotNull(
+        property: r'otherStringParam3',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3EqualTo(
+    String? value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'otherStringParam3',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3GreaterThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'otherStringParam3',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3LessThan(
+    String? value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'otherStringParam3',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3Between(
+    String? lower,
+    String? upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'otherStringParam3',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3StartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'otherStringParam3',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3EndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'otherStringParam3',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3Contains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'otherStringParam3',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3Matches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'otherStringParam3',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3IsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'otherStringParam3',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      dummy3IsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'otherStringParam3',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'personaEasy',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'personaEasy',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'personaEasy',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'personaEasy',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaEasyIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'personaEasy',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'personaIncognito',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'personaIncognito',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'personaIncognito',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'personaIncognito',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      personaIncognitoIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'personaIncognito',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'receive',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'receive',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'receive',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receive',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'receive',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'receiveCancelled',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'receiveCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'receiveCancelled',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receiveCancelled',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receiveCancelledIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'receiveCancelled',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'receivePending',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'receivePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'receivePending',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'receivePending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      receivePendingIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'receivePending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> sendEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> sendBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'send',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'send',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> sendMatches(
+      String pattern,
+      {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'send',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'send',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'send',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'sendCancelled',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'sendCancelled',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'sendCancelled',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'sendCancelled',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendCancelledIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'sendCancelled',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'sendPending',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'sendPending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'sendPending',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'sendPending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendPendingIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'sendPending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'stack',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'stack',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'stack',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'stack',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'stack',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'stackIcon',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'stackIcon',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'stackIcon',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'stackIcon',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      stackIconIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'stackIcon',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'themePreview',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'themePreview',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'themePreview',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'themePreview',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themePreviewIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'themePreview',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'themeSelector',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'themeSelector',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'themeSelector',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'themeSelector',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      themeSelectorIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'themeSelector',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'txExchange',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'txExchange',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'txExchange',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchange',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'txExchange',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'txExchangeFailed',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'txExchangeFailed',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'txExchangeFailed',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchangeFailed',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangeFailedIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'txExchangeFailed',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingEqualTo(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingGreaterThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        include: include,
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingLessThan(
+    String value, {
+    bool include = false,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.lessThan(
+        include: include,
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingBetween(
+    String lower,
+    String upper, {
+    bool includeLower = true,
+    bool includeUpper = true,
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.between(
+        property: r'txExchangePending',
+        lower: lower,
+        includeLower: includeLower,
+        upper: upper,
+        includeUpper: includeUpper,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingStartsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.startsWith(
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingEndsWith(
+    String value, {
+    bool caseSensitive = true,
+  }) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.endsWith(
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingContains(String value, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.contains(
+        property: r'txExchangePending',
+        value: value,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingMatches(String pattern, {bool caseSensitive = true}) {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.matches(
+        property: r'txExchangePending',
+        wildcard: pattern,
+        caseSensitive: caseSensitive,
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingIsEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.equalTo(
+        property: r'txExchangePending',
+        value: '',
+      ));
+    });
+  }
+
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      txExchangePendingIsNotEmpty() {
+    return QueryBuilder.apply(this, (query) {
+      return query.addFilterCondition(FilterCondition.greaterThan(
+        property: r'txExchangePending',
+        value: '',
+      ));
+    });
+  }
+}
+
+extension ThemeAssetsV3QueryObject
+    on QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QFilterCondition> {}
diff --git a/lib/models/paymint/transactions_model.dart b/lib/models/paymint/transactions_model.dart
index 987c4c3c5..f952fa4fd 100644
--- a/lib/models/paymint/transactions_model.dart
+++ b/lib/models/paymint/transactions_model.dart
@@ -362,8 +362,8 @@ class Output {
         scriptpubkeyType: json['scriptPubKey']['type'] as String?,
         scriptpubkeyAddress: address,
         value: (Decimal.parse((json["value"] ?? 0).toString()) *
-                Decimal.fromInt(Constants.satsPerCoin(Coin
-                    .bitcoin))) // dirty hack but we need 8 decimal places here to keep consistent data structure
+                Decimal.fromInt(Constants.satsPerCoin(Coin.bitcoin)
+                    .toInt())) // dirty hack but we need 8 decimal places here to keep consistent data structure
             .toBigInt()
             .toInt(),
       );
@@ -375,8 +375,8 @@ class Output {
           scriptpubkeyType: "",
           scriptpubkeyAddress: "",
           value: (Decimal.parse(0.toString()) *
-                  Decimal.fromInt(Constants.satsPerCoin(Coin
-                      .bitcoin))) // dirty hack but we need 8 decimal places here to keep consistent data structure
+                  Decimal.fromInt(Constants.satsPerCoin(Coin.bitcoin)
+                      .toInt())) // dirty hack but we need 8 decimal places here to keep consistent data structure
               .toBigInt()
               .toInt());
     }
diff --git a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
index 8f1f22187..d9d5f87b2 100644
--- a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
+++ b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
@@ -1,12 +1,15 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:stackduo/models/add_wallet_list_entity/add_wallet_list_entity.dart';
+import 'package:stackduo/models/add_wallet_list_entity/sub_classes/coin_entity.dart';
 import 'package:stackduo/pages/add_wallet_views/add_wallet_view/sub_widgets/add_wallet_text.dart';
-import 'package:stackduo/pages/add_wallet_views/add_wallet_view/sub_widgets/mobile_coin_list.dart';
+import 'package:stackduo/pages/add_wallet_views/add_wallet_view/sub_widgets/expanding_sub_list_item.dart';
 import 'package:stackduo/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart';
-import 'package:stackduo/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.dart';
 import 'package:stackduo/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart';
+import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
@@ -17,39 +20,119 @@ import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackduo/widgets/desktop/desktop_app_bar.dart';
 import 'package:stackduo/widgets/desktop/desktop_scaffold.dart';
+import 'package:stackduo/widgets/expandable.dart';
 import 'package:stackduo/widgets/icon_widgets/x_icon.dart';
 import 'package:stackduo/widgets/rounded_white_container.dart';
 import 'package:stackduo/widgets/stack_text_field.dart';
 import 'package:stackduo/widgets/textfield_icon_button.dart';
 
-class AddWalletView extends StatefulWidget {
+class AddWalletView extends ConsumerStatefulWidget {
   const AddWalletView({Key? key}) : super(key: key);
 
   static const routeName = "/addWallet";
 
   @override
-  State<AddWalletView> createState() => _AddWalletViewState();
+  ConsumerState<AddWalletView> createState() => _AddWalletViewState();
 }
 
-class _AddWalletViewState extends State<AddWalletView> {
+class _AddWalletViewState extends ConsumerState<AddWalletView> {
   late final TextEditingController _searchFieldController;
   late final FocusNode _searchFocusNode;
 
   String _searchTerm = "";
 
-  final List<Coin> coins = [...Coin.values];
+  final List<Coin> _coinsTestnet = [
+    ...Coin.values.sublist(Coin.values.length - kTestNetCoinCount),
+  ];
+  final List<Coin> _coins = [
+    ...Coin.values.sublist(0, Coin.values.length - kTestNetCoinCount)
+  ];
+  final List<AddWalletListEntity> coinEntities = [];
 
   final bool isDesktop = Util.isDesktop;
 
+  List<AddWalletListEntity> filter(
+    String text,
+    List<AddWalletListEntity> entities,
+  ) {
+    final _entities = [...entities];
+    if (text.isNotEmpty) {
+      final lowercaseTerm = text.toLowerCase();
+      _entities.retainWhere(
+        (e) =>
+            e.ticker.toLowerCase().contains(lowercaseTerm) ||
+            e.name.toLowerCase().contains(lowercaseTerm) ||
+            e.coin.name.toLowerCase().contains(lowercaseTerm),
+      );
+    }
+
+    return _entities;
+  }
+
+  // Future<void> _addToken() async {
+  //   EthContract? contract;
+  //   if (isDesktop) {
+  //     contract = await showDialog(
+  //       context: context,
+  //       builder: (context) => const DesktopDialog(
+  //         maxWidth: 580,
+  //         maxHeight: 500,
+  //         child: AddCustomTokenView(),
+  //       ),
+  //     );
+  //   } else {
+  //     contract = await Navigator.of(context).pushNamed(
+  //       AddCustomTokenView.routeName,
+  //     );
+  //   }
+  //
+  //   if (contract != null) {
+  //     await MainDB.instance.putEthContract(contract);
+  //     if (mounted) {
+  //       setState(() {
+  //         if (tokenEntities
+  //             .where((e) => e.token.address == contract!.address)
+  //             .isEmpty) {
+  //           tokenEntities.add(EthTokenEntity(contract!));
+  //           tokenEntities.sort((a, b) => a.token.name.compareTo(b.token.name));
+  //         }
+  //       });
+  //     }
+  //   }
+  // }
+
   @override
   void initState() {
     _searchFieldController = TextEditingController();
     _searchFocusNode = FocusNode();
-    if (isDesktop) {
-      if (Platform.isWindows) {
-        coins.remove(Coin.monero);
-      }
+    // _coinsTestnet.remove(Coin.firoTestNet);
+    if (Platform.isWindows) {
+      _coins.remove(Coin.monero);
+      // _coins.remove(Coin.wownero);
+    } else if (Platform.isLinux) {
+      // _coins.remove(Coin.wownero);
     }
+
+    coinEntities.addAll(_coins.map((e) => CoinEntity(e)));
+
+    if (ref.read(prefsChangeNotifierProvider).showTestNetCoins) {
+      coinEntities.addAll(_coinsTestnet.map((e) => CoinEntity(e)));
+    }
+
+    // final contracts =
+    //     MainDB.instance.getEthContracts().sortByName().findAllSync();
+    //
+    // if (contracts.isEmpty) {
+    //   contracts.addAll(DefaultTokens.list);
+    //   MainDB.instance.putEthContracts(contracts);
+    // }
+    //
+    // tokenEntities.addAll(contracts.map((e) => EthTokenEntity(e)));
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.refresh(addWalletSelectedEntityStateProvider);
+    });
+
     super.initState();
   }
 
@@ -95,87 +178,102 @@ class _AddWalletViewState extends State<AddWalletView> {
                       Padding(
                         padding: const EdgeInsets.all(4.0),
                         child: ClipRRect(
-                            borderRadius: BorderRadius.circular(
-                              Constants.size.circularBorderRadius,
+                          borderRadius: BorderRadius.circular(
+                            Constants.size.circularBorderRadius,
+                          ),
+                          child: TextField(
+                            autocorrect: Util.isDesktop ? false : true,
+                            enableSuggestions: Util.isDesktop ? false : true,
+                            controller: _searchFieldController,
+                            focusNode: _searchFocusNode,
+                            onChanged: (value) {
+                              setState(() {
+                                _searchTerm = value;
+                              });
+                            },
+                            style:
+                                STextStyles.desktopTextMedium(context).copyWith(
+                              height: 2,
                             ),
-                            child: Semantics(
-                              label:
-                                  "Search Text Field. Inputs Text To Search In Wallets.",
-                              excludeSemantics: true,
-                              child: TextField(
-                                autocorrect: Util.isDesktop ? false : true,
-                                enableSuggestions:
-                                    Util.isDesktop ? false : true,
-                                controller: _searchFieldController,
-                                focusNode: _searchFocusNode,
-                                onChanged: (value) {
-                                  setState(() {
-                                    _searchTerm = value;
-                                  });
-                                },
-                                style: STextStyles.desktopTextMedium(context)
-                                    .copyWith(
-                                  height: 2,
+                            decoration: standardInputDecoration(
+                              "Search",
+                              _searchFocusNode,
+                              context,
+                            ).copyWith(
+                              contentPadding: const EdgeInsets.symmetric(
+                                vertical: 10,
+                              ),
+                              prefixIcon: Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 16,
+                                  // vertical: 20,
                                 ),
-                                decoration: standardInputDecoration(
-                                  "Search",
-                                  _searchFocusNode,
-                                  context,
-                                ).copyWith(
-                                  contentPadding: const EdgeInsets.symmetric(
-                                    vertical: 10,
-                                  ),
-                                  prefixIcon: Padding(
-                                    padding: const EdgeInsets.symmetric(
-                                      horizontal: 16,
-                                      // vertical: 20,
-                                    ),
-                                    child: SvgPicture.asset(
-                                      Assets.svg.search,
-                                      width: 24,
-                                      height: 24,
-                                      color: Theme.of(context)
-                                          .extension<StackColors>()!
-                                          .textFieldDefaultSearchIconLeft,
-                                    ),
-                                  ),
-                                  suffixIcon: _searchFieldController
-                                          .text.isNotEmpty
-                                      ? Padding(
-                                          padding:
-                                              const EdgeInsets.only(right: 10),
-                                          child: UnconstrainedBox(
-                                            child: Row(
-                                              children: [
-                                                TextFieldIconButton(
-                                                  child: const XIcon(
-                                                    width: 24,
-                                                    height: 24,
-                                                  ),
-                                                  onTap: () async {
-                                                    setState(() {
-                                                      _searchFieldController
-                                                          .text = "";
-                                                      _searchTerm = "";
-                                                    });
-                                                  },
-                                                ),
-                                              ],
-                                            ),
-                                          ),
-                                        )
-                                      : null,
+                                child: SvgPicture.asset(
+                                  Assets.svg.search,
+                                  width: 24,
+                                  height: 24,
+                                  color: Theme.of(context)
+                                      .extension<StackColors>()!
+                                      .textFieldDefaultSearchIconLeft,
                                 ),
                               ),
-                            )),
+                              suffixIcon: _searchFieldController.text.isNotEmpty
+                                  ? Padding(
+                                      padding: const EdgeInsets.only(right: 10),
+                                      child: UnconstrainedBox(
+                                        child: Row(
+                                          children: [
+                                            TextFieldIconButton(
+                                              child: const XIcon(
+                                                width: 24,
+                                                height: 24,
+                                              ),
+                                              onTap: () async {
+                                                setState(() {
+                                                  _searchFieldController.text =
+                                                      "";
+                                                  _searchTerm = "";
+                                                });
+                                              },
+                                            ),
+                                          ],
+                                        ),
+                                      ),
+                                    )
+                                  : null,
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(
+                        height: 8,
                       ),
                       Expanded(
-                        child: SearchableCoinList(
-                          coins: coins,
-                          isDesktop: true,
-                          searchTerm: _searchTerm,
+                        child: SingleChildScrollView(
+                          child: Column(
+                            children: [
+                              ExpandingSubListItem(
+                                title: "Coins",
+                                entities: filter(_searchTerm, coinEntities),
+                                initialState: ExpandableState.expanded,
+                                animationDurationMultiplier: 0.5,
+                              ),
+                              // ExpandingSubListItem(
+                              //   title: "Tokens",
+                              //   entities: filter(_searchTerm, tokenEntities),
+                              //   initialState: ExpandableState.expanded,
+                              //   animationDurationMultiplier: 0.5,
+                              //   trailing: AddCustomTokenSelector(
+                              //     addFunction: _addToken,
+                              //   ),
+                              // ),
+                            ],
+                          ),
                         ),
                       ),
+                      const SizedBox(
+                        height: 20,
+                      ),
                     ],
                   ),
                 ),
@@ -222,9 +320,83 @@ class _AddWalletViewState extends State<AddWalletView> {
                   const SizedBox(
                     height: 16,
                   ),
+                  ClipRRect(
+                      borderRadius: BorderRadius.circular(
+                        Constants.size.circularBorderRadius,
+                      ),
+                      child: Semantics(
+                        label:
+                            "Search Text Field. Inputs Text To Search In Wallets.",
+                        excludeSemantics: true,
+                        child: TextField(
+                          autofocus: isDesktop,
+                          autocorrect: !isDesktop,
+                          enableSuggestions: !isDesktop,
+                          controller: _searchFieldController,
+                          focusNode: _searchFocusNode,
+                          onChanged: (value) =>
+                              setState(() => _searchTerm = value),
+                          style: STextStyles.field(context),
+                          decoration: standardInputDecoration(
+                            "Search",
+                            _searchFocusNode,
+                            context,
+                            desktopMed: isDesktop,
+                          ).copyWith(
+                            prefixIcon: Padding(
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 10,
+                                vertical: 16,
+                              ),
+                              child: SvgPicture.asset(
+                                Assets.svg.search,
+                                width: 16,
+                                height: 16,
+                              ),
+                            ),
+                            suffixIcon: _searchFieldController.text.isNotEmpty
+                                ? Padding(
+                                    padding: const EdgeInsets.only(right: 0),
+                                    child: UnconstrainedBox(
+                                      child: Row(
+                                        children: [
+                                          TextFieldIconButton(
+                                            child: const XIcon(),
+                                            onTap: () async {
+                                              setState(() {
+                                                _searchFieldController.text =
+                                                    "";
+                                                _searchTerm = "";
+                                              });
+                                            },
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  )
+                                : null,
+                          ),
+                        ),
+                      )),
+                  const SizedBox(
+                    height: 10,
+                  ),
                   Expanded(
-                    child: MobileCoinList(
-                      coins: coins,
+                    child: SingleChildScrollView(
+                      child: Column(
+                        children: [
+                          ExpandingSubListItem(
+                            title: "Coins",
+                            entities: filter(_searchTerm, coinEntities),
+                            initialState: ExpandableState.expanded,
+                          ),
+                          // ExpandingSubListItem(
+                          //   title: "Tokens",
+                          //   entities: filter(_searchTerm, tokenEntities),
+                          //   initialState: ExpandableState.expanded,
+                          // ),
+                        ],
+                      ),
                     ),
                   ),
                   const SizedBox(
diff --git a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/add_wallet_entity_list.dart b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/add_wallet_entity_list.dart
new file mode 100644
index 000000000..bbafbe2cc
--- /dev/null
+++ b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/add_wallet_entity_list.dart
@@ -0,0 +1,48 @@
+/* 
+ * This file is part of Stack Wallet.
+ * 
+ * Copyright (c) 2023 Cypher Stack
+ * All Rights Reserved.
+ * The code is distributed under GPLv3 license, see LICENSE file for details.
+ * Generated by Cypher Stack on 2023-05-26
+ *
+ */
+
+import 'package:flutter/material.dart';
+import 'package:stackduo/models/add_wallet_list_entity/add_wallet_list_entity.dart';
+import 'package:stackduo/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart';
+
+class AddWalletEntityList extends StatelessWidget {
+  const AddWalletEntityList({
+    Key? key,
+    required this.entities,
+    this.trailing,
+  }) : super(key: key);
+
+  final List<AddWalletListEntity> entities;
+  final Widget? trailing;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      shrinkWrap: true,
+      primary: false,
+      itemCount: trailing != null ? entities.length + 1 : entities.length,
+      itemBuilder: (ctx, index) {
+        if (trailing != null && index == entities.length) {
+          return Padding(
+            padding: const EdgeInsets.all(4),
+            child: trailing,
+          );
+        } else {
+          return Padding(
+            padding: const EdgeInsets.all(4),
+            child: CoinSelectItem(
+              entity: entities[index],
+            ),
+          );
+        }
+      },
+    );
+  }
+}
diff --git a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart
index 4354aae6c..1600d2104 100644
--- a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart
+++ b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:stackduo/models/add_wallet_list_entity/add_wallet_list_entity.dart';
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
@@ -15,30 +16,44 @@ import 'package:stackduo/utilities/util.dart';
 class CoinSelectItem extends ConsumerWidget {
   const CoinSelectItem({
     Key? key,
-    required this.coin,
+    required this.entity,
   }) : super(key: key);
 
-  final Coin coin;
+  final AddWalletListEntity entity;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    debugPrint("BUILD: CoinSelectItem for ${coin.name}");
-    final selectedCoin = ref.watch(addWalletSelectedCoinStateProvider);
+    debugPrint("BUILD: CoinSelectItem for ${entity.name}");
+    final selectedEntity = ref.watch(addWalletSelectedEntityStateProvider);
 
     final isDesktop = Util.isDesktop;
 
+    String? tokenImageUri;
+    // if (entity is EthTokenEntity) {
+    //   final currency = ExchangeDataLoadingService.instance.isar.currencies
+    //       .where()
+    //       .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
+    //       .filter()
+    //       .tokenContractEqualTo(
+    //         (entity as EthTokenEntity).token.address,
+    //         caseSensitive: false,
+    //       )
+    //       .and()
+    //       .imageIsNotEmpty()
+    //       .findFirstSync();
+    //   tokenImageUri = currency?.image;
+    // }
+
     return Container(
       decoration: BoxDecoration(
-        // color: selectedCoin == coin ? CFColors.selection : CFColors.white,
-        color: selectedCoin == coin
+        color: selectedEntity == entity
             ? Theme.of(context).extension<StackColors>()!.textFieldActiveBG
             : Theme.of(context).extension<StackColors>()!.popupBG,
         borderRadius:
             BorderRadius.circular(Constants.size.circularBorderRadius),
       ),
       child: MaterialButton(
-        // splashColor: Theme.of(context).extension<StackColors>()!.highlight,
-        key: Key("coinSelectItemButtonKey_${coin.name}"),
+        key: Key("coinSelectItemButtonKey_${entity.name}${entity.ticker}"),
         padding: isDesktop
             ? const EdgeInsets.only(left: 24)
             : const EdgeInsets.all(12),
@@ -53,26 +68,32 @@ class CoinSelectItem extends ConsumerWidget {
           ),
           child: Row(
             children: [
-              SvgPicture.file(
-                File(
-                  ref.watch(coinIconProvider(coin)),
-                ),
-                width: 26,
-                height: 26,
-              ),
+              tokenImageUri != null
+                  ? SvgPicture.network(
+                      tokenImageUri,
+                      width: 26,
+                      height: 26,
+                    )
+                  : SvgPicture.file(
+                      File(
+                        ref.watch(coinIconProvider(entity.coin)),
+                      ),
+                      width: 26,
+                      height: 26,
+                    ),
               SizedBox(
                 width: isDesktop ? 12 : 10,
               ),
               Text(
-                coin.prettyName,
+                "${entity.name} (${entity.ticker})",
                 style: isDesktop
                     ? STextStyles.desktopTextMedium(context)
                     : STextStyles.subtitle600(context).copyWith(
                         fontSize: 14,
                       ),
               ),
-              if (isDesktop && selectedCoin == coin) const Spacer(),
-              if (isDesktop && selectedCoin == coin)
+              if (isDesktop && selectedEntity == entity) const Spacer(),
+              if (isDesktop && selectedEntity == entity)
                 Padding(
                   padding: const EdgeInsets.only(
                     right: 18,
@@ -91,8 +112,9 @@ class CoinSelectItem extends ConsumerWidget {
             ],
           ),
         ),
-        onPressed: () =>
-            ref.read(addWalletSelectedCoinStateProvider.state).state = coin,
+        onPressed: () {
+          ref.read(addWalletSelectedEntityStateProvider.state).state = entity;
+        },
       ),
     );
   }
diff --git a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/expanding_sub_list_item.dart b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/expanding_sub_list_item.dart
new file mode 100644
index 000000000..6f6f7ddc5
--- /dev/null
+++ b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/expanding_sub_list_item.dart
@@ -0,0 +1,133 @@
+/* 
+ * This file is part of Stack Wallet.
+ * 
+ * Copyright (c) 2023 Cypher Stack
+ * All Rights Reserved.
+ * The code is distributed under GPLv3 license, see LICENSE file for details.
+ * Generated by Cypher Stack on 2023-05-26
+ *
+ */
+
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:stackduo/models/add_wallet_list_entity/add_wallet_list_entity.dart';
+import 'package:stackduo/pages/add_wallet_views/add_wallet_view/sub_widgets/add_wallet_entity_list.dart';
+import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/assets.dart';
+import 'package:stackduo/utilities/text_styles.dart';
+import 'package:stackduo/utilities/util.dart';
+import 'package:stackduo/widgets/animated_widgets/rotate_icon.dart';
+import 'package:stackduo/widgets/expandable.dart';
+
+class ExpandingSubListItem extends StatefulWidget {
+  const ExpandingSubListItem({
+    Key? key,
+    required this.title,
+    required this.entities,
+    this.trailing,
+    required this.initialState,
+    double? animationDurationMultiplier,
+    this.curve = Curves.easeInOutCubicEmphasized,
+  })  : animationDurationMultiplier =
+            animationDurationMultiplier ?? entities.length * 0.11,
+        super(key: key);
+
+  final String title;
+  final List<AddWalletListEntity> entities;
+  final Widget? trailing;
+  final ExpandableState initialState;
+  final double animationDurationMultiplier;
+  final Curve curve;
+
+  @override
+  State<ExpandingSubListItem> createState() => _ExpandingSubListItemState();
+}
+
+class _ExpandingSubListItemState extends State<ExpandingSubListItem> {
+  final isDesktop = Util.isDesktop;
+
+  late final ExpandableController _controller;
+  late final RotateIconController _rotateIconController;
+
+  @override
+  void initState() {
+    _controller = ExpandableController();
+    _rotateIconController = RotateIconController();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (widget.initialState == ExpandableState.expanded) {
+        _controller.toggle?.call();
+      }
+    });
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _controller.toggle = null;
+    _rotateIconController.forward = null;
+    _rotateIconController.reverse = null;
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Expandable(
+      animationDurationMultiplier: widget.animationDurationMultiplier,
+      curve: widget.curve,
+      controller: _controller,
+      onExpandWillChange: (state) {
+        if (state == ExpandableState.expanded) {
+          _rotateIconController.forward?.call();
+        } else {
+          _rotateIconController.reverse?.call();
+        }
+      },
+      header: Container(
+        color: Colors.transparent,
+        child: Padding(
+          padding: const EdgeInsets.only(
+            top: 8.0,
+            bottom: 8.0,
+            right: 10,
+          ),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                widget.title,
+                style: isDesktop
+                    ? STextStyles.desktopTextMedium(context).copyWith(
+                        color: Theme.of(context)
+                            .extension<StackColors>()!
+                            .textDark3,
+                      )
+                    : STextStyles.smallMed12(context),
+                textAlign: TextAlign.left,
+              ),
+              RotateIcon(
+                icon: SvgPicture.asset(
+                  Assets.svg.chevronDown,
+                  width: isDesktop ? 20 : 12,
+                  height: isDesktop ? 10 : 6,
+                  color: Theme.of(context)
+                      .extension<StackColors>()!
+                      .textFieldActiveSearchIconRight,
+                ),
+                curve: widget.curve,
+                animationDurationMultiplier: widget.animationDurationMultiplier,
+                controller: _rotateIconController,
+              ),
+            ],
+          ),
+        ),
+      ),
+      body: SingleChildScrollView(
+        primary: false,
+        child: AddWalletEntityList(
+          entities: widget.entities,
+          trailing: widget.trailing,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/mobile_coin_list.dart b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/mobile_coin_list.dart
deleted file mode 100644
index b238c6833..000000000
--- a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/mobile_coin_list.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:stackduo/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart';
-import 'package:stackduo/providers/global/prefs_provider.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-
-class MobileCoinList extends StatelessWidget {
-  const MobileCoinList({
-    Key? key,
-    required this.coins,
-  }) : super(key: key);
-
-  final List<Coin> coins;
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer(
-      builder: (_, ref, __) {
-        bool showTestNet = ref.watch(
-          prefsChangeNotifierProvider.select((value) => value.showTestNetCoins),
-        );
-
-        return ListView.builder(
-          itemCount:
-              showTestNet ? coins.length : coins.length - (kTestNetCoinCount),
-          itemBuilder: (ctx, index) {
-            return Padding(
-              padding: const EdgeInsets.all(4),
-              child: CoinSelectItem(
-                coin: coins[index],
-              ),
-            );
-          },
-        );
-      },
-    );
-  }
-}
diff --git a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart
index 2d7d3f36f..e872b2373 100644
--- a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart
+++ b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/next_button.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:stackduo/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart';
 import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/utilities/text_styles.dart';
 import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/text_styles.dart';
 
 class AddWalletNextButton extends ConsumerWidget {
   const AddWalletNextButton({
@@ -17,7 +17,7 @@ class AddWalletNextButton extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     debugPrint("BUILD: NextButton");
     final selectedCoin =
-        ref.watch(addWalletSelectedCoinStateProvider.state).state;
+        ref.watch(addWalletSelectedEntityStateProvider.state).state;
 
     final enabled = selectedCoin != null;
 
@@ -25,13 +25,17 @@ class AddWalletNextButton extends ConsumerWidget {
       onPressed: !enabled
           ? null
           : () {
-              final selectedCoin =
-                  ref.read(addWalletSelectedCoinStateProvider.state).state;
-
+              // if (selectedCoin is EthTokenEntity) {
+              //   Navigator.of(context).pushNamed(
+              //     SelectWalletForTokenView.routeName,
+              //     arguments: selectedCoin,
+              //   );
+              // } else {
               Navigator.of(context).pushNamed(
                 CreateOrRestoreWalletView.routeName,
                 arguments: selectedCoin,
               );
+              // }
             },
       style: enabled
           ? Theme.of(context)
diff --git a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.dart b/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.dart
deleted file mode 100644
index c7d063e29..000000000
--- a/lib/pages/add_wallet_views/add_wallet_view/sub_widgets/searchable_coin_list.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:stackduo/pages/add_wallet_views/add_wallet_view/sub_widgets/coin_select_item.dart';
-import 'package:stackduo/providers/global/prefs_provider.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-
-class SearchableCoinList extends ConsumerWidget {
-  const SearchableCoinList({
-    Key? key,
-    required this.coins,
-    required this.isDesktop,
-    required this.searchTerm,
-  }) : super(key: key);
-
-  final List<Coin> coins;
-  final bool isDesktop;
-  final String searchTerm;
-
-  List<Coin> filterCoins(String text, bool showTestNetCoins) {
-    final _coins = [...coins];
-    if (text.isNotEmpty) {
-      final lowercaseTerm = text.toLowerCase();
-      _coins.retainWhere((e) =>
-          e.ticker.toLowerCase().contains(lowercaseTerm) ||
-          e.prettyName.toLowerCase().contains(lowercaseTerm) ||
-          e.name.toLowerCase().contains(lowercaseTerm));
-    }
-
-    // Kidgloves for Wownero on desktop
-    // if(isDesktop) {
-    // _coins.remove(Coin.wownero);
-    // }
-
-    return _coins;
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    bool showTestNet = ref.watch(
-      prefsChangeNotifierProvider.select((value) => value.showTestNetCoins),
-    );
-
-    final _coins = filterCoins(searchTerm, showTestNet);
-
-    return ListView.builder(
-      itemCount: _coins.length,
-      itemBuilder: (ctx, index) {
-        return Padding(
-          padding: const EdgeInsets.all(4),
-          child: CoinSelectItem(
-            coin: _coins[index],
-          ),
-        );
-      },
-    );
-  }
-}
diff --git a/lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart b/lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
index 796b27515..6dd6862ce 100644
--- a/lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
+++ b/lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:stackduo/models/add_wallet_list_entity/add_wallet_list_entity.dart';
 import 'package:stackduo/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/coin_image.dart';
 import 'package:stackduo/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_or_restore_wallet_subtitle.dart';
 import 'package:stackduo/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_or_restore_wallet_title.dart';
 import 'package:stackduo/pages/add_wallet_views/create_or_restore_wallet_view/sub_widgets/create_wallet_button_group.dart';
 import 'package:stackduo/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart';
 import 'package:stackduo/themes/stack_colors.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
@@ -15,12 +15,12 @@ import 'package:stackduo/widgets/desktop/desktop_scaffold.dart';
 class CreateOrRestoreWalletView extends StatelessWidget {
   const CreateOrRestoreWalletView({
     Key? key,
-    required this.coin,
+    required this.entity,
   }) : super(key: key);
 
   static const routeName = "/createOrRestoreWallet";
 
-  final Coin coin;
+  final AddWalletListEntity entity;
 
   @override
   Widget build(BuildContext context) {
@@ -44,7 +44,7 @@ class CreateOrRestoreWalletView extends StatelessWidget {
                 flex: 10,
               ),
               CreateRestoreWalletTitle(
-                coin: coin,
+                coin: entity.coin,
                 isDesktop: isDesktop,
               ),
               const SizedBox(
@@ -60,7 +60,7 @@ class CreateOrRestoreWalletView extends StatelessWidget {
                 height: 32,
               ),
               CoinImage(
-                coin: coin,
+                coin: entity.coin,
                 width:
                     isDesktop ? 324 : MediaQuery.of(context).size.width / 1.6,
                 height:
@@ -70,7 +70,7 @@ class CreateOrRestoreWalletView extends StatelessWidget {
                 height: 32,
               ),
               CreateWalletButtonGroup(
-                coin: coin,
+                coin: entity.coin,
                 isDesktop: isDesktop,
               ),
               const Spacer(
@@ -112,7 +112,7 @@ class CreateOrRestoreWalletView extends StatelessWidget {
                                 flex: 2,
                               ),
                               CoinImage(
-                                coin: coin,
+                                coin: entity.coin,
                                 width: isDesktop
                                     ? 324
                                     : MediaQuery.of(context).size.width / 1.6,
@@ -124,7 +124,7 @@ class CreateOrRestoreWalletView extends StatelessWidget {
                                 flex: 2,
                               ),
                               CreateRestoreWalletTitle(
-                                coin: coin,
+                                coin: entity.coin,
                                 isDesktop: isDesktop,
                               ),
                               const SizedBox(
@@ -137,7 +137,7 @@ class CreateOrRestoreWalletView extends StatelessWidget {
                                 flex: 5,
                               ),
                               CreateWalletButtonGroup(
-                                coin: coin,
+                                coin: entity.coin,
                                 isDesktop: isDesktop,
                               ),
                             ],
diff --git a/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart b/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart
index ce8befeb0..79340722d 100644
--- a/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart
+++ b/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart
@@ -327,19 +327,15 @@ class _NameYourWalletViewState extends ConsumerState<NameYourWalletView> {
                       final name = textEditingController.text;
 
                       if (await walletsService.checkForDuplicate(name)) {
-                        if (mounted) {
-                          unawaited(
-                            showFloatingFlushBar(
-                              type: FlushBarType.warning,
-                              message: "Wallet name already in use.",
-                              iconAsset: Assets.svg.circleAlert,
-                              context: context,
-                            ),
-                          );
-                        }
+                        unawaited(showFloatingFlushBar(
+                          type: FlushBarType.warning,
+                          message: "Wallet name already in use.",
+                          iconAsset: Assets.svg.circleAlert,
+                          context: context,
+                        ));
                       } else {
                         // hide keyboard if has focus
-                        if (mounted && FocusScope.of(context).hasFocus) {
+                        if (FocusScope.of(context).hasFocus) {
                           FocusScope.of(context).unfocus();
                           await Future<void>.delayed(
                               const Duration(milliseconds: 50));
diff --git a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart
index 439733a48..a78cff398 100644
--- a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart
+++ b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart
@@ -63,10 +63,6 @@ class _NewWalletRecoveryPhraseWarningViewState
   Widget build(BuildContext context) {
     debugPrint("BUILD: $runtimeType");
 
-    final _numberOfPhraseWords = coin == Coin.monero
-        ? Constants.seedPhraseWordCountMonero
-        : Constants.seedPhraseWordCountBip39;
-
     return MasterScaffold(
       isDesktop: isDesktop,
       appBar: isDesktop
@@ -165,7 +161,15 @@ class _NewWalletRecoveryPhraseWarningViewState
               width: isDesktop ? 480 : null,
               child: isDesktop
                   ? Text(
-                      "On the next screen you will see $_numberOfPhraseWords words that make up your recovery phrase.\n\nPlease write it down. Keep it safe and never share it with anyone. Your recovery phrase is the only way you can access your funds if you forget your PIN, lose your phone, etc.\n\nStack Duo does not keep nor is able to restore your recover phrase. Only you have access to your wallet.",
+                      "On the next screen you will see "
+                      "${Constants.defaultSeedPhraseLengthFor(coin: coin)} "
+                      "words that make up your recovery phrase.\n\nPlease "
+                      "write it down. Keep it safe and never share it with "
+                      "anyone. Your recovery phrase is the only way you can"
+                      " access your funds if you forget your PIN, lose your"
+                      " phone, etc.\n\nStack Wallet does not keep nor is "
+                      "able to restore your recover phrase. Only you have "
+                      "access to your wallet.",
                       style: isDesktop
                           ? STextStyles.desktopTextMediumRegular(context)
                           : STextStyles.subtitle(context).copyWith(
@@ -202,7 +206,9 @@ class _NewWalletRecoveryPhraseWarningViewState
                                 ),
                               ),
                               TextSpan(
-                                text: "$_numberOfPhraseWords words",
+                                text:
+                                    "${Constants.defaultSeedPhraseLengthFor(coin: coin)}"
+                                    " words",
                                 style: STextStyles.desktopH3(context).copyWith(
                                   color: Theme.of(context)
                                       .extension<StackColors>()!
diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
index 413130e68..c4883829c 100644
--- a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
+++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
@@ -391,32 +391,32 @@ class _RestoreOptionsViewState extends ConsumerState<RestoreOptionsView> {
                       }
                     },
                     isExpanded: true,
-                    icon: SvgPicture.asset(
-                      Assets.svg.chevronDown,
-                      width: 12,
-                      height: 6,
-                      color: Theme.of(context)
-                          .extension<StackColors>()!
-                          .textFieldActiveSearchIconRight,
-                    ),
-                    buttonPadding: const EdgeInsets.symmetric(
-                      horizontal: 16,
-                      vertical: 8,
+                    iconStyleData: IconStyleData(
+                      icon: SvgPicture.asset(
+                        Assets.svg.chevronDown,
+                        width: 12,
+                        height: 6,
+                        color: Theme.of(context)
+                            .extension<StackColors>()!
+                            .textFieldActiveSearchIconRight,
+                      ),
                     ),
-                    buttonDecoration: BoxDecoration(
-                      color: Theme.of(context)
-                          .extension<StackColors>()!
-                          .textFieldDefaultBG,
-                      borderRadius: BorderRadius.circular(
-                        Constants.size.circularBorderRadius,
+                    dropdownStyleData: DropdownStyleData(
+                      offset: const Offset(0, -10),
+                      elevation: 0,
+                      decoration: BoxDecoration(
+                        color: Theme.of(context)
+                            .extension<StackColors>()!
+                            .textFieldDefaultBG,
+                        borderRadius: BorderRadius.circular(
+                          Constants.size.circularBorderRadius,
+                        ),
                       ),
                     ),
-                    dropdownDecoration: BoxDecoration(
-                      color: Theme.of(context)
-                          .extension<StackColors>()!
-                          .textFieldDefaultBG,
-                      borderRadius: BorderRadius.circular(
-                        Constants.size.circularBorderRadius,
+                    menuItemStyleData: const MenuItemStyleData(
+                      padding: EdgeInsets.symmetric(
+                        horizontal: 16,
+                        vertical: 8,
                       ),
                     ),
                   ),
diff --git a/lib/pages/address_book_views/subviews/add_address_book_entry_view.dart b/lib/pages/address_book_views/subviews/add_address_book_entry_view.dart
index 797ac6ec8..32c9ada28 100644
--- a/lib/pages/address_book_views/subviews/add_address_book_entry_view.dart
+++ b/lib/pages/address_book_views/subviews/add_address_book_entry_view.dart
@@ -693,7 +693,7 @@ class _AddAddressBookEntryViewState
                                               name: nameController.text,
                                               addresses: entries,
                                               isFavorite: _isFavorite,
-                                              customId: const Uuid().v1(),
+                                               customId: const Uuid().v1(),
                                             );
 
                                             if (await ref
diff --git a/lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart b/lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart
index 06646300e..d079ee139 100644
--- a/lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart
+++ b/lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart
@@ -98,9 +98,25 @@ class _NewContactAddressEntryFormState
                 "Select cryptocurrency",
                 style: STextStyles.fieldLabel(context),
               ),
-              offset: const Offset(0, -10),
+              dropdownStyleData: DropdownStyleData(
+                offset: const Offset(0, -10),
+                elevation: 0,
+                decoration: BoxDecoration(
+                  color: Theme.of(context)
+                      .extension<StackColors>()!
+                      .textFieldDefaultBG,
+                  borderRadius: BorderRadius.circular(
+                    Constants.size.circularBorderRadius,
+                  ),
+                ),
+              ),
+              menuItemStyleData: const MenuItemStyleData(
+                padding: EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 4,
+                ),
+              ),
               isExpanded: true,
-              dropdownElevation: 0,
               value: ref.watch(addressEntryDataProvider(widget.id)
                   .select((value) => value.coin)),
               onChanged: (value) {
@@ -108,30 +124,12 @@ class _NewContactAddressEntryFormState
                   ref.read(addressEntryDataProvider(widget.id)).coin = value;
                 }
               },
-              icon: SvgPicture.asset(
-                Assets.svg.chevronDown,
-                width: 10,
-                height: 5,
-                color: Theme.of(context).extension<StackColors>()!.textDark3,
-              ),
-              buttonPadding: const EdgeInsets.symmetric(
-                horizontal: 16,
-                vertical: 4,
-              ),
-              buttonDecoration: BoxDecoration(
-                color: Theme.of(context)
-                    .extension<StackColors>()!
-                    .textFieldDefaultBG,
-                borderRadius: BorderRadius.circular(
-                  Constants.size.circularBorderRadius,
-                ),
-              ),
-              dropdownDecoration: BoxDecoration(
-                color: Theme.of(context)
-                    .extension<StackColors>()!
-                    .textFieldDefaultBG,
-                borderRadius: BorderRadius.circular(
-                  Constants.size.circularBorderRadius,
+              iconStyleData: IconStyleData(
+                icon: SvgPicture.asset(
+                  Assets.svg.chevronDown,
+                  width: 10,
+                  height: 5,
+                  color: Theme.of(context).extension<StackColors>()!.textDark3,
                 ),
               ),
               items: [
diff --git a/lib/pages/coin_control/coin_control_view.dart b/lib/pages/coin_control/coin_control_view.dart
index 3d9ff5c4d..3a6094b41 100644
--- a/lib/pages/coin_control/coin_control_view.dart
+++ b/lib/pages/coin_control/coin_control_view.dart
@@ -4,19 +4,19 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
 import 'package:stackduo/pages/coin_control/utxo_card.dart';
 import 'package:stackduo/pages/coin_control/utxo_details_view.dart';
-import 'package:stackduo/providers/global/locale_provider.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
 import 'package:stackduo/services/mixins/coin_control_interface.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/animated_widgets/rotate_icon.dart';
 import 'package:stackduo/widgets/app_bar_field.dart';
 import 'package:stackduo/widgets/background.dart';
@@ -687,14 +687,9 @@ class _CoinControlViewState extends ConsumerState<CoinControlView> {
                                             fractionDigits: coin.decimals,
                                           );
                                           return Text(
-                                            "${selectedSum.localizedStringAsFixed(
-                                              locale: ref.watch(
-                                                localeServiceChangeNotifierProvider
-                                                    .select(
-                                                  (value) => value.locale,
-                                                ),
-                                              ),
-                                            )} ${coin.ticker}",
+                                            ref
+                                                .watch(pAmountFormatter(coin))
+                                                .format(selectedSum),
                                             style: widget.requestedTotal == null
                                                 ? STextStyles.w600_14(context)
                                                 : STextStyles.w600_14(context).copyWith(
@@ -735,14 +730,9 @@ class _CoinControlViewState extends ConsumerState<CoinControlView> {
                                           style: STextStyles.w600_14(context),
                                         ),
                                         Text(
-                                          "${widget.requestedTotal!.localizedStringAsFixed(
-                                            locale: ref.watch(
-                                              localeServiceChangeNotifierProvider
-                                                  .select(
-                                                (value) => value.locale,
-                                              ),
-                                            ),
-                                          )} ${coin.ticker}",
+                                          ref
+                                              .watch(pAmountFormatter(coin))
+                                              .format(widget.requestedTotal!),
                                           style: STextStyles.w600_14(context),
                                         ),
                                       ],
diff --git a/lib/pages/coin_control/utxo_card.dart b/lib/pages/coin_control/utxo_card.dart
index cd8366184..3560e90b4 100644
--- a/lib/pages/coin_control/utxo_card.dart
+++ b/lib/pages/coin_control/utxo_card.dart
@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
-import 'package:stackduo/providers/global/locale_provider.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
 import 'package:stackduo/widgets/icon_widgets/utxo_status_icon.dart';
 import 'package:stackduo/widgets/rounded_container.dart';
@@ -124,15 +124,11 @@ class _UtxoCardState extends ConsumerState<UtxoCard> {
                       mainAxisSize: MainAxisSize.min,
                       children: [
                         Text(
-                          "${utxo.value.toAmountAsRaw(
-                                fractionDigits: coin.decimals,
-                              ).localizedStringAsFixed(
-                                locale: ref.watch(
-                                  localeServiceChangeNotifierProvider.select(
-                                    (value) => value.locale,
-                                  ),
+                          ref.watch(pAmountFormatter(coin)).format(
+                                utxo.value.toAmountAsRaw(
+                                  fractionDigits: coin.decimals,
                                 ),
-                              )} ${coin.ticker}",
+                              ),
                           style: STextStyles.w600_14(context),
                         ),
                         const SizedBox(
diff --git a/lib/pages/coin_control/utxo_details_view.dart b/lib/pages/coin_control/utxo_details_view.dart
index 0d14a961a..4fd62b35b 100644
--- a/lib/pages/coin_control/utxo_details_view.dart
+++ b/lib/pages/coin_control/utxo_details_view.dart
@@ -3,15 +3,15 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
 import 'package:stackduo/pages/wallet_view/transaction_views/transaction_details_view.dart';
-import 'package:stackduo/providers/global/locale_provider.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
@@ -240,13 +240,11 @@ class _UtxoDetailsViewState extends ConsumerState<UtxoDetailsView> {
                               width: 16,
                             ),
                           Text(
-                            "${utxo!.value.toAmountAsRaw(fractionDigits: coin.decimals).localizedStringAsFixed(
-                                  locale: ref.watch(
-                                    localeServiceChangeNotifierProvider.select(
-                                      (value) => value.locale,
-                                    ),
+                            ref.watch(pAmountFormatter(coin)).format(
+                                  utxo!.value.toAmountAsRaw(
+                                    fractionDigits: coin.decimals,
                                   ),
-                                )} ${coin.ticker}",
+                                ),
                             style: STextStyles.pageTitleH2(context),
                           ),
                         ],
diff --git a/lib/pages/exchange_view/confirm_change_now_send.dart b/lib/pages/exchange_view/confirm_change_now_send.dart
index 72a2088ea..d49da08be 100644
--- a/lib/pages/exchange_view/confirm_change_now_send.dart
+++ b/lib/pages/exchange_view/confirm_change_now_send.dart
@@ -10,11 +10,13 @@ import 'package:stackduo/pages/wallet_view/wallet_view.dart';
 import 'package:stackduo/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_auth_send.dart';
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/route_generator.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
+import 'package:stackduo/utilities/logger.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
@@ -139,7 +141,12 @@ class _ConfirmChangeNowSendViewState
 
         Navigator.of(context).popUntil(ModalRoute.withName(routeOnSuccessName));
       }
-    } catch (e) {
+    } catch (e, s) {
+      Logging.instance.log(
+        "Broadcast transaction failed: $e\n$s",
+        level: LogLevel.Error,
+      );
+
       // pop sending dialog
       Navigator.of(context).pop();
 
@@ -188,9 +195,9 @@ class _ConfirmChangeNowSendViewState
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
-              Row(
+              const Row(
                 mainAxisAlignment: MainAxisAlignment.end,
-                children: const [
+                children: [
                   DesktopDialogCloseButton(),
                 ],
               ),
@@ -360,20 +367,19 @@ class _ConfirmChangeNowSendViewState
                         mainAxisAlignment: MainAxisAlignment.end,
                         children: [
                           Text(
-                            "${(transactionInfo["fee"] is Amount ? transactionInfo["fee"] as Amount : (transactionInfo["fee"] as int).toAmountAsRaw(
-                                fractionDigits: ref.watch(
-                                  managerProvider
-                                      .select((value) => value.coin.decimals),
-                                ),
-                              )).localizedStringAsFixed(
-                              locale: ref.watch(
-                                localeServiceChangeNotifierProvider.select(
-                                  (value) => value.locale,
-                                ),
-                              ),
-                            )} ${ref.watch(
+                            ref
+                                .watch(pAmountFormatter(ref.watch(
                                   managerProvider.select((value) => value.coin),
-                                ).ticker}",
+                                )))
+                                .format(transactionInfo["fee"] is Amount
+                                    ? transactionInfo["fee"] as Amount
+                                    : (transactionInfo["fee"] as int)
+                                        .toAmountAsRaw(
+                                        fractionDigits: ref.watch(
+                                          managerProvider.select(
+                                              (value) => value.coin.decimals),
+                                        ),
+                                      )),
                             style:
                                 STextStyles.desktopTextExtraExtraSmall(context)
                                     .copyWith(
@@ -417,16 +423,9 @@ class _ConfirmChangeNowSendViewState
                               final amount =
                                   transactionInfo["recipientAmt"] as Amount;
                               final total = amount + fee;
-                              final locale = ref.watch(
-                                localeServiceChangeNotifierProvider.select(
-                                  (value) => value.locale,
-                                ),
-                              );
+
                               return Text(
-                                "${total.localizedStringAsFixed(
-                                  locale: locale,
-                                )}"
-                                " ${coin.ticker}",
+                                ref.watch(pAmountFormatter(coin)).format(total),
                                 style: STextStyles.itemSubtitle12(context)
                                     .copyWith(
                                   color: Theme.of(context)
@@ -599,7 +598,7 @@ class _ConfirmChangeNowSendViewState
                           );
 
                           return Text(
-                            " | ${value.localizedStringAsFixed(locale: locale)} $currency",
+                            " | ${value.fiatString(locale: locale)} $currency",
                             style:
                                 STextStyles.desktopTextExtraExtraSmall(context)
                                     .copyWith(
@@ -612,15 +611,11 @@ class _ConfirmChangeNowSendViewState
                       ],
                     ),
                     child: Text(
-                      "${(transactionInfo["recipientAmt"] as Amount).localizedStringAsFixed(
-                        locale: ref.watch(
-                          localeServiceChangeNotifierProvider.select(
-                            (value) => value.locale,
-                          ),
-                        ),
-                      )} ${ref.watch(
-                            managerProvider.select((value) => value.coin),
-                          ).ticker}",
+                      ref
+                          .watch(pAmountFormatter(ref.watch(
+                              walletsChangeNotifierProvider.select(
+                                  (value) => value.getManager(walletId).coin))))
+                          .format((transactionInfo["recipientAmt"] as Amount)),
                       style: STextStyles.itemSubtitle12(context),
                       textAlign: TextAlign.right,
                     ),
@@ -646,19 +641,20 @@ class _ConfirmChangeNowSendViewState
                     style: STextStyles.smallMed12(context),
                   ),
                   Text(
-                    "${(transactionInfo["fee"] is Amount ? transactionInfo["fee"] as Amount : (transactionInfo["fee"] as int).toAmountAsRaw(fractionDigits: ref.watch(
-                        managerProvider.select(
-                          (value) => value.coin.decimals,
-                        ),
-                      ))).localizedStringAsFixed(
-                      locale: ref.watch(
-                        localeServiceChangeNotifierProvider.select(
-                          (value) => value.locale,
-                        ),
-                      ),
-                    )} ${ref.watch(
+                    ref
+                        .watch(pAmountFormatter(ref.watch(
                           managerProvider.select((value) => value.coin),
-                        ).ticker}",
+                        )))
+                        .format(
+                          (transactionInfo["fee"] is Amount
+                              ? transactionInfo["fee"] as Amount
+                              : (transactionInfo["fee"] as int).toAmountAsRaw(
+                                  fractionDigits: ref.watch(
+                                  managerProvider.select(
+                                    (value) => value.coin.decimals,
+                                  ),
+                                ))),
+                        ),
                     style: STextStyles.itemSubtitle12(context),
                     textAlign: TextAlign.right,
                   ),
@@ -750,16 +746,9 @@ class _ConfirmChangeNowSendViewState
                         final amount =
                             transactionInfo["recipientAmt"] as Amount;
                         final total = amount + fee;
-                        final locale = ref.watch(
-                          localeServiceChangeNotifierProvider.select(
-                            (value) => value.locale,
-                          ),
-                        );
+
                         return Text(
-                          "${total.localizedStringAsFixed(
-                            locale: locale,
-                          )}"
-                          " ${coin.ticker}",
+                          ref.watch(pAmountFormatter(coin)).format(total),
                           style: STextStyles.itemSubtitle12(context).copyWith(
                             color: Theme.of(context)
                                 .extension<StackColors>()!
diff --git a/lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart b/lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart
index f53fb9292..63f212206 100644
--- a/lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart
+++ b/lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart
@@ -9,11 +9,11 @@ import 'package:stackduo/models/isar/exchange_cache/pair.dart';
 import 'package:stackduo/services/exchange/change_now/change_now_exchange.dart';
 import 'package:stackduo/services/exchange/exchange_data_loading_service.dart';
 import 'package:stackduo/services/exchange/majestic_bank/majestic_bank_exchange.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
@@ -371,18 +371,27 @@ class _ExchangeCurrencySelectionViewState
                                 SizedBox(
                                   width: 24,
                                   height: 24,
-                                  child: hasImageUrl
-                                      ? SvgPicture.network(
-                                          items[index].image,
-                                          width: 24,
-                                          height: 24,
-                                          placeholderBuilder: (_) =>
-                                              const LoadingIndicator(),
-                                        )
-                                      : const SizedBox(
-                                          width: 24,
-                                          height: 24,
-                                        ),
+                                  child:
+                                      // isStackCoin(items[index].ticker)
+                                      //     ? CoinIconForTicker(
+                                      //         ticker: items[index].ticker, size: 24)
+                                      //     // ? getIconForTicker(
+                                      //     //     items[index].ticker,
+                                      //     //     size: 24,
+                                      //     //   )
+                                      //     :
+                                      hasImageUrl
+                                          ? SvgPicture.network(
+                                              items[index].image,
+                                              width: 24,
+                                              height: 24,
+                                              placeholderBuilder: (_) =>
+                                                  const LoadingIndicator(),
+                                            )
+                                          : const SizedBox(
+                                              width: 24,
+                                              height: 24,
+                                            ),
                                 ),
                                 const SizedBox(
                                   width: 10,
diff --git a/lib/pages/exchange_view/exchange_step_views/step_4_view.dart b/lib/pages/exchange_view/exchange_step_views/step_4_view.dart
index a5af66551..68e69148b 100644
--- a/lib/pages/exchange_view/exchange_step_views/step_4_view.dart
+++ b/lib/pages/exchange_view/exchange_step_views/step_4_view.dart
@@ -567,7 +567,7 @@ class _Step4ViewState extends ConsumerState<Step4View> {
                                             height: 24,
                                           ),
                                           Center(
-                                            child: QrImage(
+                                            child: QrImageView(
                                               // TODO: grab coin uri scheme from somewhere
                                               // data: "${coin.uriScheme}:$receivingAddress",
                                               data: model.trade!.payInAddress,
diff --git a/lib/pages/exchange_view/exchange_view.dart b/lib/pages/exchange_view/exchange_view.dart
index c77b28c59..a4faa9956 100644
--- a/lib/pages/exchange_view/exchange_view.dart
+++ b/lib/pages/exchange_view/exchange_view.dart
@@ -3,16 +3,16 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/blockchain_data/transaction.dart';
 import 'package:stackduo/pages/exchange_view/exchange_form.dart';
 import 'package:stackduo/pages/exchange_view/trade_details_view.dart';
 import 'package:stackduo/providers/global/trades_service_provider.dart';
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/services/exchange/exchange_data_loading_service.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
 import 'package:stackduo/widgets/custom_loading_overlay.dart';
 import 'package:stackduo/widgets/trade_card.dart';
diff --git a/lib/pages/exchange_view/send_from_view.dart b/lib/pages/exchange_view/send_from_view.dart
index b845835f1..0e1e17496 100644
--- a/lib/pages/exchange_view/send_from_view.dart
+++ b/lib/pages/exchange_view/send_from_view.dart
@@ -15,6 +15,7 @@ import 'package:stackduo/services/coins/manager.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
@@ -146,13 +147,7 @@ class _SendFromViewState extends ConsumerState<SendFromView> {
             Row(
               children: [
                 Text(
-                  "You need to send ${amount.localizedStringAsFixed(
-                    locale: ref.watch(
-                      localeServiceChangeNotifierProvider.select(
-                        (value) => value.locale,
-                      ),
-                    ),
-                  )} ${coin.ticker}",
+                  "You need to send ${ref.watch(pAmountFormatter(coin)).format(amount)}",
                   style: isDesktop
                       ? STextStyles.desktopTextExtraExtraSmall(context)
                       : STextStyles.itemSubtitle(context),
@@ -426,6 +421,13 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
                               "Use private balance",
                               style: STextStyles.itemSubtitle(context),
                             ),
+                            // Text(
+                            //   ref.watch(pAmountFormatter(coin)).format(
+                            //         (manager.wallet as FiroWallet)
+                            //             .availablePrivateBalance(),
+                            //       ),
+                            //   style: STextStyles.itemSubtitle(context),
+                            // ),
                           ],
                         ),
                         SvgPicture.asset(
@@ -482,6 +484,12 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
                               "Use public balance",
                               style: STextStyles.itemSubtitle(context),
                             ),
+                            // Text(
+                            //   ref.watch(pAmountFormatter(coin)).format(
+                            //       (manager.wallet as FiroWallet)
+                            //           .availablePublicBalance()),
+                            //   style: STextStyles.itemSubtitle(context),
+                            // ),
                           ],
                         ),
                         SvgPicture.asset(
@@ -567,9 +575,9 @@ class _SendFromCardState extends ConsumerState<SendFromCard> {
                       ),
                     if (!isFiro)
                       Text(
-                        "${manager.balance.spendable.localizedStringAsFixed(
-                          locale: locale,
-                        )} ${coin.ticker}",
+                        ref
+                            .watch(pAmountFormatter(coin))
+                            .format(manager.balance.spendable),
                         style: STextStyles.itemSubtitle(context),
                       ),
                   ],
diff --git a/lib/pages/exchange_view/sub_widgets/exchange_provider_option.dart b/lib/pages/exchange_view/sub_widgets/exchange_provider_option.dart
index 565f8cd0d..de90ff7d2 100644
--- a/lib/pages/exchange_view/sub_widgets/exchange_provider_option.dart
+++ b/lib/pages/exchange_view/sub_widgets/exchange_provider_option.dart
@@ -6,13 +6,15 @@ import 'package:stackduo/models/exchange/response_objects/estimate.dart';
 import 'package:stackduo/providers/exchange/exchange_form_state_provider.dart';
 import 'package:stackduo/providers/global/locale_provider.dart';
 import 'package:stackduo/services/exchange/exchange.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
+import 'package:stackduo/utilities/amount/amount_unit.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/enums/exchange_rate_type_enum.dart';
 import 'package:stackduo/utilities/logger.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/animated_text.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
@@ -97,13 +99,32 @@ class _ExchangeOptionState extends ConsumerState<ExchangeOption> {
                               .toAmount(fractionDigits: decimals);
                         }
 
-                        final rateString =
-                            "1 ${sendCurrency.ticker.toUpperCase()} ~ ${rate.localizedStringAsFixed(
-                          locale: ref.watch(
-                            localeServiceChangeNotifierProvider
-                                .select((value) => value.locale),
-                          ),
-                        )} ${receivingCurrency.ticker.toUpperCase()}";
+                        Coin? coin;
+                        try {
+                          coin = coinFromTickerCaseInsensitive(
+                              receivingCurrency.ticker);
+                        } catch (_) {
+                          coin = null;
+                        }
+
+                        final String rateString;
+                        if (coin != null) {
+                          rateString = "1 ${sendCurrency.ticker.toUpperCase()} "
+                              "~ ${ref.watch(pAmountFormatter(coin)).format(rate)}";
+                        } else {
+                          final formatter = AmountFormatter(
+                            unit: AmountUnit.normal,
+                            locale: ref.watch(
+                              localeServiceChangeNotifierProvider
+                                  .select((value) => value.locale),
+                            ),
+                            coin: Coin.bitcoin, // some sane default
+                            maxDecimals: 8, // some sane default
+                          );
+                          rateString = "1 ${sendCurrency.ticker.toUpperCase()} "
+                              "~ ${formatter.format(rate, withUnitName: false)}"
+                              " ${receivingCurrency.ticker.toUpperCase()}";
+                        }
 
                         return ConditionalParent(
                           condition: i > 0,
diff --git a/lib/pages/exchange_view/trade_details_view.dart b/lib/pages/exchange_view/trade_details_view.dart
index 3431d4296..d8dc6a0fa 100644
--- a/lib/pages/exchange_view/trade_details_view.dart
+++ b/lib/pages/exchange_view/trade_details_view.dart
@@ -26,6 +26,7 @@ import 'package:stackduo/services/exchange/trocador/trocador_exchange.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/themes/theme_providers.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/clipboard_interface.dart';
 import 'package:stackduo/utilities/constants.dart';
@@ -356,13 +357,9 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
                                   trade.payInCurrency);
                               final amount = sendAmount.toAmount(
                                   fractionDigits: coin.decimals);
-                              text = amount.localizedStringAsFixed(
-                                locale: ref.watch(
-                                  localeServiceChangeNotifierProvider.select(
-                                    (value) => value.locale,
-                                  ),
-                                ),
-                              );
+                              text = ref
+                                  .watch(pAmountFormatter(coin))
+                                  .format(amount);
                             } catch (_) {
                               text = sendAmount.toStringAsFixed(
                                   trade.payInCurrency.toLowerCase() == "xmr"
@@ -771,7 +768,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
                                       child: SizedBox(
                                         width: width + 20,
                                         height: width + 20,
-                                        child: QrImage(
+                                        child: QrImageView(
                                             data: trade.payInAddress,
                                             size: width,
                                             backgroundColor: Theme.of(context)
diff --git a/lib/pages/paynym/dialogs/confirm_paynym_connect_dialog.dart b/lib/pages/paynym/dialogs/confirm_paynym_connect_dialog.dart
index 3b4511a20..2d413399a 100644
--- a/lib/pages/paynym/dialogs/confirm_paynym_connect_dialog.dart
+++ b/lib/pages/paynym/dialogs/confirm_paynym_connect_dialog.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/desktop/desktop_dialog.dart';
 import 'package:stackduo/widgets/desktop/desktop_dialog_close_button.dart';
@@ -12,7 +14,7 @@ import 'package:stackduo/widgets/desktop/primary_button.dart';
 import 'package:stackduo/widgets/desktop/secondary_button.dart';
 import 'package:stackduo/widgets/stack_dialog.dart';
 
-class ConfirmPaynymConnectDialog extends StatelessWidget {
+class ConfirmPaynymConnectDialog extends ConsumerWidget {
   const ConfirmPaynymConnectDialog({
     Key? key,
     required this.nymName,
@@ -30,14 +32,14 @@ class ConfirmPaynymConnectDialog extends StatelessWidget {
 
   String get title => "Connect to $nymName";
 
-  String get message => "A one-time connection fee of "
-      "${amount.localizedStringAsFixed(locale: locale)} ${coin.ticker} "
+  String message(String amountString) => "A one-time connection fee of "
+      "$amountString "
       "will be charged to connect to this PayNym.\n\nThis fee "
       "covers the cost of creating a one-time transaction to create a "
       "record on the blockchain. This keeps PayNyms decentralized.";
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     if (Util.isDesktop) {
       return DesktopDialog(
         maxHeight: double.infinity,
@@ -76,7 +78,7 @@ class ConfirmPaynymConnectDialog extends StatelessWidget {
                 right: 40,
               ),
               child: Text(
-                message,
+                message(ref.watch(pAmountFormatter(coin)).format(amount)),
                 style: STextStyles.desktopTextMedium(context).copyWith(
                   color: Theme.of(context).extension<StackColors>()!.textDark3,
                 ),
@@ -123,7 +125,7 @@ class ConfirmPaynymConnectDialog extends StatelessWidget {
           width: 24,
           height: 24,
         ),
-        message: message,
+        message: message(ref.watch(pAmountFormatter(coin)).format(amount)),
         leftButton: SecondaryButton(
           buttonHeight: ButtonHeight.xl,
           label: "Cancel",
diff --git a/lib/pages/paynym/dialogs/paynym_details_popup.dart b/lib/pages/paynym/dialogs/paynym_details_popup.dart
index 0fdc2b427..c2e81773f 100644
--- a/lib/pages/paynym/dialogs/paynym_details_popup.dart
+++ b/lib/pages/paynym/dialogs/paynym_details_popup.dart
@@ -138,6 +138,9 @@ class _PaynymDetailsPopupState extends ConsumerState<PaynymDetailsPopup> {
           nymName: widget.accountLite.nymName,
           locale: ref.read(localeServiceChangeNotifierProvider).locale,
           onConfirmPressed: () {
+            //
+            print("CONFIRM NOTIF TX: $preparedTx");
+
             Navigator.of(context).push(
               RouteGenerator.getRoute(
                 builder: (_) => ConfirmTransactionView(
@@ -366,7 +369,7 @@ class _PaynymDetailsPopupState extends ConsumerState<PaynymDetailsPopup> {
                 const SizedBox(
                   width: 20,
                 ),
-                QrImage(
+                QrImageView(
                   padding: const EdgeInsets.all(0),
                   size: 100,
                   data: widget.accountLite.code,
diff --git a/lib/pages/paynym/dialogs/paynym_qr_popup.dart b/lib/pages/paynym/dialogs/paynym_qr_popup.dart
index 19adf19c0..23c1303d3 100644
--- a/lib/pages/paynym/dialogs/paynym_qr_popup.dart
+++ b/lib/pages/paynym/dialogs/paynym_qr_popup.dart
@@ -147,7 +147,7 @@ class PaynymQrPopup extends StatelessWidget {
                 const SizedBox(
                   width: 20,
                 ),
-                QrImage(
+                QrImageView(
                   padding: const EdgeInsets.all(0),
                   size: 130,
                   data: paynymAccount.nonSegwitPaymentCode.code,
diff --git a/lib/pages/paynym/subwidgets/desktop_paynym_details.dart b/lib/pages/paynym/subwidgets/desktop_paynym_details.dart
index 7eb7b2832..81c3ed341 100644
--- a/lib/pages/paynym/subwidgets/desktop_paynym_details.dart
+++ b/lib/pages/paynym/subwidgets/desktop_paynym_details.dart
@@ -356,7 +356,7 @@ class _PaynymDetailsPopupState extends ConsumerState<DesktopPaynymDetails> {
                     const SizedBox(
                       width: 20,
                     ),
-                    QrImage(
+                    QrImageView(
                       padding: const EdgeInsets.all(0),
                       size: 100,
                       data: widget.accountLite.code,
diff --git a/lib/pages/receive_view/addresses/address_card.dart b/lib/pages/receive_view/addresses/address_card.dart
index df5484ff8..b9ad4956f 100644
--- a/lib/pages/receive_view/addresses/address_card.dart
+++ b/lib/pages/receive_view/addresses/address_card.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
 import 'package:stackduo/pages/receive_view/addresses/address_tag.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
diff --git a/lib/pages/receive_view/addresses/address_details_view.dart b/lib/pages/receive_view/addresses/address_details_view.dart
index 3ea6dc51f..ecbe7cd4a 100644
--- a/lib/pages/receive_view/addresses/address_details_view.dart
+++ b/lib/pages/receive_view/addresses/address_details_view.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:isar/isar.dart';
 import 'package:qr_flutter/qr_flutter.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
 import 'package:stackduo/pages/receive_view/addresses/address_tag.dart';
 import 'package:stackduo/pages/wallet_view/sub_widgets/no_transactions_found.dart';
@@ -77,7 +77,7 @@ class _AddressDetailsViewState extends ConsumerState<AddressDetailsView> {
                   Center(
                     child: RepaintBoundary(
                       key: _qrKey,
-                      child: QrImage(
+                      child: QrImageView(
                         data: AddressUtils.buildUriString(
                           ref.watch(walletsChangeNotifierProvider.select(
                               (value) =>
@@ -266,7 +266,7 @@ class _AddressDetailsViewState extends ConsumerState<AddressDetailsView> {
                   Center(
                     child: RepaintBoundary(
                       key: _qrKey,
-                      child: QrImage(
+                      child: QrImageView(
                         data: AddressUtils.buildUriString(
                           ref.watch(walletsChangeNotifierProvider.select(
                               (value) =>
diff --git a/lib/pages/receive_view/addresses/address_qr_popup.dart b/lib/pages/receive_view/addresses/address_qr_popup.dart
index f93e33b21..e8d27165a 100644
--- a/lib/pages/receive_view/addresses/address_qr_popup.dart
+++ b/lib/pages/receive_view/addresses/address_qr_popup.dart
@@ -126,7 +126,7 @@ class _AddressQrPopupState extends State<AddressQrPopup> {
           Center(
             child: RepaintBoundary(
               key: _qrKey,
-              child: QrImage(
+              child: QrImageView(
                 data: AddressUtils.buildUriString(
                   widget.coin,
                   widget.addressString,
diff --git a/lib/pages/receive_view/addresses/edit_address_label_view.dart b/lib/pages/receive_view/addresses/edit_address_label_view.dart
index 0f69f9f0a..a23d64ed5 100644
--- a/lib/pages/receive_view/addresses/edit_address_label_view.dart
+++ b/lib/pages/receive_view/addresses/edit_address_label_view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/address_label.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/text_styles.dart';
diff --git a/lib/pages/receive_view/addresses/wallet_addresses_view.dart b/lib/pages/receive_view/addresses/wallet_addresses_view.dart
index e597c4c84..06b9ce19a 100644
--- a/lib/pages/receive_view/addresses/wallet_addresses_view.dart
+++ b/lib/pages/receive_view/addresses/wallet_addresses_view.dart
@@ -2,15 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
 import 'package:stackduo/pages/receive_view/addresses/address_card.dart';
 import 'package:stackduo/pages/receive_view/addresses/address_details_view.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
diff --git a/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart b/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
index f8524fc0a..0782e26bc 100644
--- a/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
+++ b/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
@@ -13,15 +13,14 @@ import 'package:path_provider/path_provider.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:stackduo/notifications/show_flush_bar.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/address_utils.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/clipboard_interface.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
-import 'package:stackduo/utilities/enums/flush_bar_type.dart';
 import 'package:stackduo/utilities/logger.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
@@ -194,7 +193,7 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
                   child: SizedBox(
                     width: width + 20,
                     height: width + 20,
-                    child: QrImage(
+                    child: QrImageView(
                         data: uriString,
                         size: width,
                         backgroundColor:
@@ -529,7 +528,7 @@ class _GenerateUriQrCodeViewState extends State<GenerateUriQrCodeView> {
                                 child: SizedBox(
                                   width: 234,
                                   height: 234,
-                                  child: QrImage(
+                                  child: QrImageView(
                                       data: _uriString,
                                       size: 220,
                                       backgroundColor: Theme.of(context)
diff --git a/lib/pages/receive_view/receive_view.dart b/lib/pages/receive_view/receive_view.dart
index 416ef408b..7362b376c 100644
--- a/lib/pages/receive_view/receive_view.dart
+++ b/lib/pages/receive_view/receive_view.dart
@@ -25,15 +25,15 @@ import 'package:stackduo/widgets/rounded_white_container.dart';
 class ReceiveView extends ConsumerStatefulWidget {
   const ReceiveView({
     Key? key,
-    required this.coin,
     required this.walletId,
+    this.tokenContract,
     this.clipboard = const ClipboardWrapper(),
   }) : super(key: key);
 
   static const String routeName = "/receiveView";
 
-  final Coin coin;
   final String walletId;
+  final dynamic? tokenContract;
   final ClipboardInterface clipboard;
 
   @override
@@ -86,7 +86,7 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
   @override
   void initState() {
     walletId = widget.walletId;
-    coin = widget.coin;
+    coin = ref.read(walletsChangeNotifierProvider).getManager(walletId).coin;
     clipboard = widget.clipboard;
 
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
@@ -117,6 +117,8 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
       }
     });
 
+    final ticker = widget.tokenContract?.symbol ?? coin.ticker;
+
     return Background(
       child: Scaffold(
         backgroundColor: Theme.of(context).extension<StackColors>()!.background,
@@ -127,7 +129,7 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
             },
           ),
           title: Text(
-            "Receive ${coin.ticker}",
+            "Receive $ticker",
             style: STextStyles.navBarTitle(context),
           ),
           actions: [
@@ -248,7 +250,7 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
                           Row(
                             children: [
                               Text(
-                                "Your ${coin.ticker} address",
+                                "Your $ticker address",
                                 style: STextStyles.itemSubtitle(context),
                               ),
                               const Spacer(),
@@ -315,7 +317,7 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
                       child: Center(
                         child: Column(
                           children: [
-                            QrImage(
+                            QrImageView(
                                 data: "${coin.uriScheme}:$receivingAddress",
                                 size: MediaQuery.of(context).size.width / 2,
                                 foregroundColor: Theme.of(context)
diff --git a/lib/pages/send_view/confirm_transaction_view.dart b/lib/pages/send_view/confirm_transaction_view.dart
index 84ae8ac7c..2acd2e601 100644
--- a/lib/pages/send_view/confirm_transaction_view.dart
+++ b/lib/pages/send_view/confirm_transaction_view.dart
@@ -18,6 +18,7 @@ import 'package:stackduo/services/mixins/paynym_wallet_interface.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/themes/theme_providers.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
@@ -44,6 +45,7 @@ class ConfirmTransactionView extends ConsumerStatefulWidget {
     this.isTradeTransaction = false,
     this.isPaynymTransaction = false,
     this.isPaynymNotificationTransaction = false,
+    this.isTokenTx = false,
     this.onSuccessInsteadOfRouteOnSuccess,
   }) : super(key: key);
 
@@ -55,6 +57,7 @@ class ConfirmTransactionView extends ConsumerStatefulWidget {
   final bool isTradeTransaction;
   final bool isPaynymTransaction;
   final bool isPaynymNotificationTransaction;
+  final bool isTokenTx;
   final VoidCallback? onSuccessInsteadOfRouteOnSuccess;
 
   @override
@@ -104,13 +107,26 @@ class _ConfirmTransactionViewState
     final note = noteController.text;
 
     try {
-      if (widget.isPaynymNotificationTransaction) {
+      // if (widget.isTokenTx) {
+      //   txidFuture = ref
+      //       .read(tokenServiceProvider)!
+      //       .confirmSend(txData: transactionInfo);
+      // } else
+        if (widget.isPaynymNotificationTransaction) {
         txidFuture = (manager.wallet as PaynymWalletInterface)
             .broadcastNotificationTx(preparedTx: transactionInfo);
       } else if (widget.isPaynymTransaction) {
         txidFuture = manager.confirmSend(txData: transactionInfo);
       } else {
-        txidFuture = manager.confirmSend(txData: transactionInfo);
+        // final coin = manager.coin;
+        // if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+        //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+        //         "Private") {
+        //   txidFuture = (manager.wallet as FiroWallet)
+        //       .confirmSendPublic(txData: transactionInfo);
+        // } else {
+          txidFuture = manager.confirmSend(txData: transactionInfo);
+        // }
       }
 
       final results = await Future.wait([
@@ -140,6 +156,20 @@ class _ConfirmTransactionViewState
           widget.onSuccessInsteadOfRouteOnSuccess!.call();
         }
       }
+    // } on BadEpicHttpAddressException catch (_) {
+    //   if (mounted) {
+    //     // pop building dialog
+    //     Navigator.of(context).pop();
+    //     unawaited(
+    //       showFloatingFlushBar(
+    //         type: FlushBarType.warning,
+    //         message:
+    //             "Connection failed. Please check the address and try again.",
+    //         context: context,
+    //       ),
+    //     );
+    //     return;
+    //   }
     } catch (e, s) {
       //todo: comeback to this
       debugPrint("$e\n$s");
@@ -241,8 +271,16 @@ class _ConfirmTransactionViewState
     final managerProvider = ref.watch(walletsChangeNotifierProvider
         .select((value) => value.getManagerProvider(walletId)));
 
-    final String unit = ref.watch(walletsChangeNotifierProvider
-        .select((value) => value.getManager(walletId).coin.ticker));
+    final coin = ref.watch(walletsChangeNotifierProvider
+        .select((value) => value.getManager(walletId).coin));
+
+    final String unit;
+    // if (widget.isTokenTx) {
+    //   unit = ref.watch(
+    //       tokenServiceProvider.select((value) => value!.tokenContract.symbol));
+    // } else {
+      unit = coin.ticker;
+    // }
 
     return ConditionalParent(
       condition: !isDesktop,
@@ -369,50 +407,76 @@ class _ConfirmTransactionViewState
                           style: STextStyles.smallMed12(context),
                         ),
                         Text(
-                          "${(transactionInfo["recipientAmt"] as Amount).localizedStringAsFixed(
-                            locale: ref.watch(
-                              localeServiceChangeNotifierProvider
-                                  .select((value) => value.locale),
-                            ),
-                          )} $unit",
+                          ref.watch(pAmountFormatter(coin)).format(
+                                transactionInfo["recipientAmt"] as Amount,
+                                // ethContract:
+                                // ref
+                                //     .watch(tokenServiceProvider)
+                                //     ?.tokenContract,
+                              ),
                           style: STextStyles.itemSubtitle12(context),
                           textAlign: TextAlign.right,
                         ),
                       ],
                     ),
                   ),
-                  const SizedBox(
-                    height: 12,
-                  ),
-                  RoundedWhiteContainer(
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Text(
-                          "Transaction fee",
-                          style: STextStyles.smallMed12(context),
-                        ),
-                        Text(
-                          "${(transactionInfo["fee"] is Amount ? transactionInfo["fee"] as Amount : (transactionInfo["fee"] as int).toAmountAsRaw(
-                              fractionDigits: ref.watch(
-                                managerProvider.select(
-                                  (value) => value.coin.decimals,
+                  // if (coin != Coin.banano && coin != Coin.nano)
+                    const SizedBox(
+                      height: 12,
+                    ),
+                  // if (coin != Coin.banano && coin != Coin.nano)
+                    RoundedWhiteContainer(
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Text(
+                            "Transaction fee",
+                            style: STextStyles.smallMed12(context),
+                          ),
+                          Text(
+                            ref.watch(pAmountFormatter(coin)).format(
+                                  (transactionInfo["fee"] is Amount
+                                      ? transactionInfo["fee"] as Amount
+                                      : (transactionInfo["fee"] as int)
+                                          .toAmountAsRaw(
+                                          fractionDigits: ref.watch(
+                                            managerProvider.select(
+                                              (value) => value.coin.decimals,
+                                            ),
+                                          ),
+                                        )),
                                 ),
-                              ),
-                            )).localizedStringAsFixed(
-                            locale: ref.watch(
-                              localeServiceChangeNotifierProvider
-                                  .select((value) => value.locale),
-                            ),
-                          )} ${ref.watch(
-                                managerProvider.select((value) => value.coin),
-                              ).ticker}",
-                          style: STextStyles.itemSubtitle12(context),
-                          textAlign: TextAlign.right,
-                        ),
-                      ],
+                            style: STextStyles.itemSubtitle12(context),
+                            textAlign: TextAlign.right,
+                          ),
+                        ],
+                      ),
+                    ),
+                  if (transactionInfo["fee"] is int &&
+                      transactionInfo["vSize"] is int)
+                    const SizedBox(
+                      height: 12,
+                    ),
+                  if (transactionInfo["fee"] is int &&
+                      transactionInfo["vSize"] is int)
+                    RoundedWhiteContainer(
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Text(
+                            "sats/vByte",
+                            style: STextStyles.smallMed12(context),
+                          ),
+                          const SizedBox(
+                            height: 4,
+                          ),
+                          Text(
+                            "~${(transactionInfo["fee"] / transactionInfo["vSize"]).toInt()}",
+                            style: STextStyles.itemSubtitle12(context),
+                          ),
+                        ],
+                      ),
                     ),
-                  ),
                   const SizedBox(
                     height: 12,
                   ),
@@ -524,14 +588,28 @@ class _ConfirmTransactionViewState
                                 String fiatAmount = "N/A";
 
                                 if (externalCalls) {
-                                  final price = ref
-                                      .read(priceAnd24hChangeNotifierProvider)
-                                      .getPrice(coin)
-                                      .item1;
+                                  final price =
+                                  // widget.isTokenTx
+                                  //     ? ref
+                                  //         .read(
+                                  //             priceAnd24hChangeNotifierProvider)
+                                  //         .getTokenPrice(
+                                  //           ref
+                                  //               .read(tokenServiceProvider)!
+                                  //               .tokenContract
+                                  //               .address,
+                                  //         )
+                                  //         .item1
+                                  //     :
+                                  ref
+                                          .read(
+                                              priceAnd24hChangeNotifierProvider)
+                                          .getPrice(coin)
+                                          .item1;
                                   if (price > Decimal.zero) {
                                     fiatAmount = (amount.decimal * price)
                                         .toAmount(fractionDigits: 2)
-                                        .localizedStringAsFixed(
+                                        .fiatString(
                                           locale: ref
                                               .read(
                                                   localeServiceChangeNotifierProvider)
@@ -543,12 +621,12 @@ class _ConfirmTransactionViewState
                                 return Row(
                                   children: [
                                     Text(
-                                      "${amount.localizedStringAsFixed(
-                                        locale: ref.watch(
-                                          localeServiceChangeNotifierProvider
-                                              .select((value) => value.locale),
-                                        ),
-                                      )} $unit",
+                                      ref.watch(pAmountFormatter(coin)).format(
+                                          amount,
+                                          // ethContract: ref
+                                          //     .read(tokenServiceProvider)
+                                          //     ?.tokenContract
+                                      ),
                                       style: STextStyles
                                               .desktopTextExtraExtraSmall(
                                                   context)
@@ -658,14 +736,9 @@ class _ConfirmTransactionViewState
                                         );
 
                                   return Text(
-                                    "${fee.localizedStringAsFixed(
-                                      locale: ref.watch(
-                                        localeServiceChangeNotifierProvider
-                                            .select(
-                                          (value) => value.locale,
-                                        ),
-                                      ),
-                                    )} ${coin.ticker}",
+                                    ref
+                                        .watch(pAmountFormatter(coin))
+                                        .format(fee),
                                     style:
                                         STextStyles.desktopTextExtraExtraSmall(
                                                 context)
@@ -838,75 +911,76 @@ class _ConfirmTransactionViewState
                             );
 
                       return Text(
-                        "${fee.localizedStringAsFixed(
-                          locale: ref.watch(
-                            localeServiceChangeNotifierProvider.select(
-                              (value) => value.locale,
-                            ),
-                          ),
-                        )} ${coin.ticker}",
+                        ref.watch(pAmountFormatter(coin)).format(fee),
                         style: STextStyles.itemSubtitle(context),
                       );
                     },
                   ),
                 ),
               ),
+            if (isDesktop &&
+                !widget.isPaynymTransaction &&
+                transactionInfo["fee"] is int &&
+                transactionInfo["vSize"] is int)
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: 32,
+                ),
+                child: Text(
+                  "sats/vByte",
+                  style: STextStyles.desktopTextExtraExtraSmall(context),
+                ),
+              ),
+            if (isDesktop &&
+                !widget.isPaynymTransaction &&
+                transactionInfo["fee"] is int &&
+                transactionInfo["vSize"] is int)
+              Padding(
+                padding: const EdgeInsets.only(
+                  top: 10,
+                  left: 32,
+                  right: 32,
+                ),
+                child: RoundedContainer(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 16,
+                    vertical: 18,
+                  ),
+                  color: Theme.of(context)
+                      .extension<StackColors>()!
+                      .textFieldDefaultBG,
+                  child: Text(
+                    "~${(transactionInfo["fee"] / transactionInfo["vSize"]).toInt()}",
+                    style: STextStyles.itemSubtitle(context),
+                  ),
+                ),
+              ),
             if (!isDesktop) const Spacer(),
             SizedBox(
               height: isDesktop ? 23 : 12,
             ),
-            Padding(
-              padding: isDesktop
-                  ? const EdgeInsets.symmetric(
-                      horizontal: 32,
-                    )
-                  : const EdgeInsets.all(0),
-              child: RoundedContainer(
+            if (!widget.isTokenTx)
+              Padding(
                 padding: isDesktop
                     ? const EdgeInsets.symmetric(
-                        horizontal: 16,
-                        vertical: 18,
+                        horizontal: 32,
                       )
-                    : const EdgeInsets.all(12),
-                color: Theme.of(context)
-                    .extension<StackColors>()!
-                    .snackBarBackSuccess,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Text(
-                      isDesktop ? "Total amount to send" : "Total amount",
-                      style: isDesktop
-                          ? STextStyles.desktopTextExtraExtraSmall(context)
-                              .copyWith(
-                              color: Theme.of(context)
-                                  .extension<StackColors>()!
-                                  .textConfirmTotalAmount,
-                            )
-                          : STextStyles.titleBold12(context).copyWith(
-                              color: Theme.of(context)
-                                  .extension<StackColors>()!
-                                  .textConfirmTotalAmount,
-                            ),
-                    ),
-                    Builder(builder: (context) {
-                      final coin = ref.watch(walletsChangeNotifierProvider
-                          .select((value) => value.getManager(walletId).coin));
-                      final fee = transactionInfo["fee"] is Amount
-                          ? transactionInfo["fee"] as Amount
-                          : (transactionInfo["fee"] as int)
-                              .toAmountAsRaw(fractionDigits: coin.decimals);
-                      final locale = ref.watch(
-                        localeServiceChangeNotifierProvider
-                            .select((value) => value.locale),
-                      );
-                      final amount = transactionInfo["recipientAmt"] as Amount;
-                      return Text(
-                        "${(amount + fee).localizedStringAsFixed(
-                          locale: locale,
-                        )} ${ref.watch(
-                              managerProvider.select((value) => value.coin),
-                            ).ticker}",
+                    : const EdgeInsets.all(0),
+                child: RoundedContainer(
+                  padding: isDesktop
+                      ? const EdgeInsets.symmetric(
+                          horizontal: 16,
+                          vertical: 18,
+                        )
+                      : const EdgeInsets.all(12),
+                  color: Theme.of(context)
+                      .extension<StackColors>()!
+                      .snackBarBackSuccess,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text(
+                        isDesktop ? "Total amount to send" : "Total amount",
                         style: isDesktop
                             ? STextStyles.desktopTextExtraExtraSmall(context)
                                 .copyWith(
@@ -914,18 +988,46 @@ class _ConfirmTransactionViewState
                                     .extension<StackColors>()!
                                     .textConfirmTotalAmount,
                               )
-                            : STextStyles.itemSubtitle12(context).copyWith(
+                            : STextStyles.titleBold12(context).copyWith(
                                 color: Theme.of(context)
                                     .extension<StackColors>()!
                                     .textConfirmTotalAmount,
                               ),
-                        textAlign: TextAlign.right,
-                      );
-                    }),
-                  ],
+                      ),
+                      Builder(builder: (context) {
+                        final coin = ref.watch(
+                            walletsChangeNotifierProvider.select(
+                                (value) => value.getManager(walletId).coin));
+                        final fee = transactionInfo["fee"] is Amount
+                            ? transactionInfo["fee"] as Amount
+                            : (transactionInfo["fee"] as int)
+                                .toAmountAsRaw(fractionDigits: coin.decimals);
+
+                        final amount =
+                            transactionInfo["recipientAmt"] as Amount;
+                        return Text(
+                          ref
+                              .watch(pAmountFormatter(coin))
+                              .format(amount + fee),
+                          style: isDesktop
+                              ? STextStyles.desktopTextExtraExtraSmall(context)
+                                  .copyWith(
+                                  color: Theme.of(context)
+                                      .extension<StackColors>()!
+                                      .textConfirmTotalAmount,
+                                )
+                              : STextStyles.itemSubtitle12(context).copyWith(
+                                  color: Theme.of(context)
+                                      .extension<StackColors>()!
+                                      .textConfirmTotalAmount,
+                                ),
+                          textAlign: TextAlign.right,
+                        );
+                      }),
+                    ],
+                  ),
                 ),
               ),
-            ),
             SizedBox(
               height: isDesktop ? 28 : 16,
             ),
diff --git a/lib/pages/send_view/send_view.dart b/lib/pages/send_view/send_view.dart
index 97cf1f839..277850348 100644
--- a/lib/pages/send_view/send_view.dart
+++ b/lib/pages/send_view/send_view.dart
@@ -26,6 +26,9 @@ import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/address_utils.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
+import 'package:stackduo/utilities/amount/amount_input_formatter.dart';
+import 'package:stackduo/utilities/amount/amount_unit.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/barcode_scanner_interface.dart';
 import 'package:stackduo/utilities/clipboard_interface.dart';
@@ -40,6 +43,7 @@ import 'package:stackduo/widgets/animated_text.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackduo/widgets/custom_buttons/blue_text_button.dart';
+import 'package:stackduo/widgets/fee_slider.dart';
 import 'package:stackduo/widgets/icon_widgets/addressbook_icon.dart';
 import 'package:stackduo/widgets/icon_widgets/clipboard_icon.dart';
 import 'package:stackduo/widgets/icon_widgets/qrcode_icon.dart';
@@ -108,15 +112,11 @@ class _SendViewState extends ConsumerState<SendView> {
 
   void _cryptoAmountChanged() async {
     if (!_cryptoAmountChangeLock) {
-      final String cryptoAmount = cryptoAmountController.text;
-      if (cryptoAmount.isNotEmpty &&
-          cryptoAmount != "." &&
-          cryptoAmount != ",") {
-        _amountToSend = cryptoAmount.contains(",")
-            ? Decimal.parse(cryptoAmount.replaceFirst(",", "."))
-                .toAmount(fractionDigits: coin.decimals)
-            : Decimal.parse(cryptoAmount)
-                .toAmount(fractionDigits: coin.decimals);
+      final cryptoAmount = ref.read(pAmountFormatter(coin)).tryParse(
+            cryptoAmountController.text,
+          );
+      if (cryptoAmount != null) {
+        _amountToSend = cryptoAmount;
         if (_cachedAmountToSend != null &&
             _cachedAmountToSend == _amountToSend) {
           return;
@@ -133,7 +133,7 @@ class _SendViewState extends ConsumerState<SendView> {
               .toAmount(
                 fractionDigits: 2,
               )
-              .localizedStringAsFixed(
+              .fiatString(
                 locale: ref.read(localeServiceChangeNotifierProvider).locale,
               );
         }
@@ -182,6 +182,15 @@ class _SendViewState extends ConsumerState<SendView> {
   late Amount _currentFee;
 
   void _setCurrentFee(String fee, bool shouldSetState) {
+    fee = fee.trim();
+
+    if (fee.startsWith("~")) {
+      fee = fee.substring(1);
+    }
+    if (fee.contains(" ")) {
+      fee = fee.split(" ").first;
+    }
+
     final value = fee.contains(",")
         ? Decimal.parse(fee.replaceFirst(",", "."))
             .toAmount(fractionDigits: coin.decimals)
@@ -249,9 +258,10 @@ class _SendViewState extends ConsumerState<SendView> {
       case FeeRateType.slow:
         feeRate = feeObject.slow;
         break;
+      default:
+        feeRate = -1;
     }
 
-    final String locale = ref.read(localeServiceChangeNotifierProvider).locale;
     Amount fee;
     if (coin == Coin.monero) {
       MoneroTransactionPriority specialMoneroId;
@@ -265,15 +275,25 @@ class _SendViewState extends ConsumerState<SendView> {
         case FeeRateType.slow:
           specialMoneroId = MoneroTransactionPriority.slow;
           break;
+        default:
+          throw ArgumentError("custom fee not available for monero");
       }
 
       fee = await manager.estimateFeeFor(amount, specialMoneroId.raw!);
-      cachedFees[amount] = fee.localizedStringAsFixed(locale: locale);
+      cachedFees[amount] = ref.read(pAmountFormatter(coin)).format(
+            fee,
+            withUnitName: true,
+            indicatePrecisionLoss: false,
+          );
 
       return cachedFees[amount]!;
     } else {
       fee = await manager.estimateFeeFor(amount, feeRate);
-      cachedFees[amount] = fee.localizedStringAsFixed(locale: locale);
+      cachedFees[amount] = ref.read(pAmountFormatter(coin)).format(
+            fee,
+            withUnitName: true,
+            indicatePrecisionLoss: false,
+          );
 
       return cachedFees[amount]!;
     }
@@ -394,6 +414,7 @@ class _SendViewState extends ConsumerState<SendView> {
           isSegwit: widget.accountLite!.segwit,
           amount: amount,
           args: {
+            "satsPerVByte": isCustomFee ? customFeeRate : null,
             "feeRate": feeRate,
             "UTXOs": (manager.hasCoinControlSupport &&
                     coinControlEnabled &&
@@ -408,6 +429,7 @@ class _SendViewState extends ConsumerState<SendView> {
           amount: amount,
           args: {
             "feeRate": ref.read(feeRateTypeStateProvider),
+            "satsPerVByte": isCustomFee ? customFeeRate : null,
             "UTXOs": (manager.hasCoinControlSupport &&
                     coinControlEnabled &&
                     selectedUTXOs.isNotEmpty)
@@ -485,6 +507,10 @@ class _SendViewState extends ConsumerState<SendView> {
 
   bool get isPaynymSend => widget.accountLite != null;
 
+  bool isCustomFee = false;
+
+  int customFeeRate = 1;
+
   @override
   void initState() {
     coin = widget.coin;
@@ -510,7 +536,15 @@ class _SendViewState extends ConsumerState<SendView> {
 
     if (_data != null) {
       if (_data!.amount != null) {
-        cryptoAmountController.text = _data!.amount!.toString();
+        final amount = Amount.fromDecimal(
+          _data!.amount!,
+          fractionDigits: coin.decimals,
+        );
+
+        cryptoAmountController.text = ref.read(pAmountFormatter(coin)).format(
+              amount,
+              withUnitName: false,
+            );
       }
       sendToController.text = _data!.contactLabel;
       _address = _data!.address.trim();
@@ -700,10 +734,12 @@ class _SendViewState extends ConsumerState<SendView> {
                                       if (_cachedBalance != null) {
                                         return GestureDetector(
                                           onTap: () {
-                                            cryptoAmountController.text =
-                                                _cachedBalance!
-                                                    .localizedStringAsFixed(
-                                                        locale: locale);
+                                            cryptoAmountController.text = ref
+                                                .read(pAmountFormatter(coin))
+                                                .format(
+                                                  _cachedBalance!,
+                                                  withUnitName: false,
+                                                );
                                           },
                                           child: Container(
                                             color: Colors.transparent,
@@ -712,9 +748,10 @@ class _SendViewState extends ConsumerState<SendView> {
                                                   CrossAxisAlignment.end,
                                               children: [
                                                 Text(
-                                                  "${_cachedBalance!.localizedStringAsFixed(
-                                                    locale: locale,
-                                                  )} ${coin.ticker}",
+                                                  ref
+                                                      .watch(pAmountFormatter(
+                                                          coin))
+                                                      .format(_cachedBalance!),
                                                   style:
                                                       STextStyles.titleBold12(
                                                               context)
@@ -726,7 +763,7 @@ class _SendViewState extends ConsumerState<SendView> {
                                                 Text(
                                                   "${(_cachedBalance!.decimal * ref.watch(priceAnd24hChangeNotifierProvider.select((value) => value.getPrice(coin).item1))).toAmount(
                                                         fractionDigits: 2,
-                                                      ).localizedStringAsFixed(
+                                                      ).fiatString(
                                                         locale: locale,
                                                       )} ${ref.watch(prefsChangeNotifierProvider.select((value) => value.currency))}",
                                                   style: STextStyles.subtitle(
@@ -786,10 +823,32 @@ class _SendViewState extends ConsumerState<SendView> {
                           const SizedBox(
                             height: 16,
                           ),
-                          Text(
-                            isPaynymSend ? "Send to PayNym address" : "Send to",
-                            style: STextStyles.smallMed12(context),
-                            textAlign: TextAlign.left,
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              Text(
+                                isPaynymSend
+                                    ? "Send to PayNym address"
+                                    : "Send to",
+                                style: STextStyles.smallMed12(context),
+                                textAlign: TextAlign.left,
+                              ),
+                              // if (coin == Coin.monero)
+                              //   CustomTextButton(
+                              //     text: "Use OpenAlias",
+                              //     onTap: () async {
+                              //       await showModalBottomSheet(
+                              //         context: context,
+                              //         builder: (context) =>
+                              //             OpenAliasBottomSheet(
+                              //           onSelected: (address) {
+                              //             sendToController.text = address;
+                              //           },
+                              //         ),
+                              //       );
+                              //     },
+                              //   ),
+                            ],
                           ),
                           const SizedBox(
                             height: 8,
@@ -1011,10 +1070,15 @@ class _SendViewState extends ConsumerState<SendView> {
                                                       );
                                                       cryptoAmountController
                                                               .text =
-                                                          amount
-                                                              .localizedStringAsFixed(
-                                                        locale: locale,
-                                                      );
+                                                          ref
+                                                              .read(
+                                                                  pAmountFormatter(
+                                                                      coin))
+                                                              .format(
+                                                                amount,
+                                                                withUnitName:
+                                                                    false,
+                                                              );
                                                       _amountToSend = amount;
                                                     }
 
@@ -1120,11 +1184,11 @@ class _SendViewState extends ConsumerState<SendView> {
                                 text: "Send all ${coin.ticker}",
                                 onTap: () async {
                                   cryptoAmountController.text = ref
-                                      .read(provider)
-                                      .balance
-                                      .spendable
-                                      .localizedStringAsFixed(locale: locale);
-
+                                      .read(pAmountFormatter(coin))
+                                      .format(
+                                        ref.read(provider).balance.spendable,
+                                        withUnitName: false,
+                                      );
                                   _cryptoAmountChanged();
                                 },
                               ),
@@ -1153,13 +1217,21 @@ class _SendViewState extends ConsumerState<SendView> {
                                   ),
                             textAlign: TextAlign.right,
                             inputFormatters: [
+                              AmountInputFormatter(
+                                decimals: coin.decimals,
+                                unit: ref.watch(pAmountUnit(coin)),
+                                locale: locale,
+                              ),
+
                               // regex to validate a crypto amount with 8 decimal places
-                              TextInputFormatter.withFunction((oldValue,
-                                      newValue) =>
-                                  RegExp(r'^([0-9]*[,.]?[0-9]{0,8}|[,.][0-9]{0,8})$')
-                                          .hasMatch(newValue.text)
-                                      ? newValue
-                                      : oldValue),
+                              // TextInputFormatter.withFunction((oldValue,
+                              //         newValue) =>
+                              //     // RegExp(r'^([0-9]*[,.]?[0-9]{0,8}|[,.][0-9]{0,8})$')
+                              //     // RegExp(r'^\d{1,3}([,\.]\d+)?|[,\.\d]+$')
+                              //     getAmountRegex(locale, coin.decimals)
+                              //             .hasMatch(newValue.text)
+                              //         ? newValue
+                              //         : oldValue),
                             ],
                             decoration: InputDecoration(
                               contentPadding: const EdgeInsets.only(
@@ -1176,7 +1248,9 @@ class _SendViewState extends ConsumerState<SendView> {
                                 child: Padding(
                                   padding: const EdgeInsets.all(12),
                                   child: Text(
-                                    coin.ticker,
+                                    ref
+                                        .watch(pAmountUnit(coin))
+                                        .unitForCoin(coin),
                                     style: STextStyles.smallMed14(context)
                                         .copyWith(
                                             color: Theme.of(context)
@@ -1212,26 +1286,25 @@ class _SendViewState extends ConsumerState<SendView> {
                                     ),
                               textAlign: TextAlign.right,
                               inputFormatters: [
+                                AmountInputFormatter(
+                                  decimals: 2,
+                                  locale: locale,
+                                ),
                                 // regex to validate a fiat amount with 2 decimal places
-                                TextInputFormatter.withFunction((oldValue,
-                                        newValue) =>
-                                    RegExp(r'^([0-9]*[,.]?[0-9]{0,2}|[,.][0-9]{0,2})$')
-                                            .hasMatch(newValue.text)
-                                        ? newValue
-                                        : oldValue),
+                                // TextInputFormatter.withFunction((oldValue,
+                                //         newValue) =>
+                                //     // RegExp(r'^([0-9]*[,.]?[0-9]{0,2}|[,.][0-9]{0,2})$')
+                                //     getAmountRegex(locale, 2)
+                                //             .hasMatch(newValue.text)
+                                //         ? newValue
+                                //         : oldValue),
                               ],
                               onChanged: (baseAmountString) {
-                                if (baseAmountString.isNotEmpty &&
-                                    baseAmountString != "." &&
-                                    baseAmountString != ",") {
-                                  final Amount baseAmount =
-                                      baseAmountString.contains(",")
-                                          ? Decimal.parse(baseAmountString
-                                                  .replaceFirst(",", "."))
-                                              .toAmount(fractionDigits: 2)
-                                          : Decimal.parse(baseAmountString)
-                                              .toAmount(fractionDigits: 2);
-
+                                final baseAmount = Amount.tryParseFiatString(
+                                  baseAmountString,
+                                  locale: locale,
+                                );
+                                if (baseAmount != null) {
                                   final Decimal _price = ref
                                       .read(priceAnd24hChangeNotifierProvider)
                                       .getPrice(coin)
@@ -1262,12 +1335,10 @@ class _SendViewState extends ConsumerState<SendView> {
                                       level: LogLevel.Info);
 
                                   final amountString =
-                                      _amountToSend!.localizedStringAsFixed(
-                                    locale: ref
-                                        .read(
-                                            localeServiceChangeNotifierProvider)
-                                        .locale,
-                                  );
+                                      ref.read(pAmountFormatter(coin)).format(
+                                            _amountToSend!,
+                                            withUnitName: false,
+                                          );
 
                                   _cryptoAmountChangeLock = true;
                                   cryptoAmountController.text = amountString;
@@ -1439,14 +1510,23 @@ class _SendViewState extends ConsumerState<SendView> {
                           const SizedBox(
                             height: 12,
                           ),
+                          // if (coin != Coin.epicCash &&
+                          //     coin != Coin.nano &&
+                          //     coin != Coin.banano)
                           Text(
                             "Transaction fee (estimated)",
                             style: STextStyles.smallMed12(context),
                             textAlign: TextAlign.left,
                           ),
+                          // if (coin != Coin.epicCash &&
+                          //     coin != Coin.nano &&
+                          //     coin != Coin.banano)
                           const SizedBox(
                             height: 8,
                           ),
+                          // if (coin != Coin.epicCash &&
+                          //     coin != Coin.nano &&
+                          //     coin != Coin.banano)
                           Stack(
                             children: [
                               TextField(
@@ -1470,7 +1550,18 @@ class _SendViewState extends ConsumerState<SendView> {
                                       Constants.size.circularBorderRadius,
                                     ),
                                   ),
-                                  onPressed: () {
+                                  onPressed:
+                                      // (coin == Coin.firo ||
+                                      //             coin == Coin.firoTestNet) &&
+                                      //         ref
+                                      //                 .watch(
+                                      //                     publicPrivateBalanceStateProvider
+                                      //                         .state)
+                                      //                 .state ==
+                                      //             "Private"
+                                      //     ? null
+                                      //     :
+                                      () {
                                     showModalBottomSheet<dynamic>(
                                       backgroundColor: Colors.transparent,
                                       context: context,
@@ -1485,11 +1576,21 @@ class _SendViewState extends ConsumerState<SendView> {
                                         amount: (Decimal.tryParse(
                                                     cryptoAmountController
                                                         .text) ??
+                                                _amountToSend?.decimal ??
                                                 Decimal.zero)
                                             .toAmount(
                                           fractionDigits: coin.decimals,
                                         ),
                                         updateChosen: (String fee) {
+                                          if (fee == "custom") {
+                                            if (!isCustomFee) {
+                                              setState(() {
+                                                isCustomFee = true;
+                                              });
+                                            }
+                                            return;
+                                          }
+
                                           _setCurrentFee(
                                             fee,
                                             true,
@@ -1497,12 +1598,61 @@ class _SendViewState extends ConsumerState<SendView> {
                                           setState(() {
                                             _calculateFeesFuture =
                                                 Future(() => fee);
+                                            if (isCustomFee) {
+                                              isCustomFee = false;
+                                            }
                                           });
                                         },
                                       ),
                                     );
                                   },
-                                  child: Row(
+                                  child:
+                                      // ((coin == Coin.firo ||
+                                      //             coin == Coin.firoTestNet) &&
+                                      //         ref
+                                      //                 .watch(
+                                      //                     publicPrivateBalanceStateProvider
+                                      //                         .state)
+                                      //                 .state ==
+                                      //             "Private")
+                                      //     ? Row(
+                                      //         children: [
+                                      //           FutureBuilder(
+                                      //             future: _calculateFeesFuture,
+                                      //             builder: (context, snapshot) {
+                                      //               if (snapshot.connectionState ==
+                                      //                       ConnectionState
+                                      //                           .done &&
+                                      //                   snapshot.hasData) {
+                                      //                 _setCurrentFee(
+                                      //                   snapshot.data!,
+                                      //                   false,
+                                      //                 );
+                                      //                 return Text(
+                                      //                   "~${snapshot.data!}",
+                                      //                   style: STextStyles
+                                      //                       .itemSubtitle(
+                                      //                           context),
+                                      //                 );
+                                      //               } else {
+                                      //                 return AnimatedText(
+                                      //                   stringsToLoopThrough: const [
+                                      //                     "Calculating",
+                                      //                     "Calculating.",
+                                      //                     "Calculating..",
+                                      //                     "Calculating...",
+                                      //                   ],
+                                      //                   style: STextStyles
+                                      //                       .itemSubtitle(
+                                      //                           context),
+                                      //                 );
+                                      //               }
+                                      //             },
+                                      //           ),
+                                      //         ],
+                                      //       )
+                                      //     :
+                                      Row(
                                     mainAxisAlignment:
                                         MainAxisAlignment.spaceBetween,
                                     children: [
@@ -1527,11 +1677,13 @@ class _SendViewState extends ConsumerState<SendView> {
                                                       ConnectionState.done &&
                                                   snapshot.hasData) {
                                                 _setCurrentFee(
-                                                  snapshot.data! as String,
+                                                  snapshot.data!,
                                                   false,
                                                 );
                                                 return Text(
-                                                  "~${snapshot.data! as String} ${coin.ticker}",
+                                                  isCustomFee
+                                                      ? ""
+                                                      : "~${snapshot.data!}",
                                                   style:
                                                       STextStyles.itemSubtitle(
                                                           context),
@@ -1567,6 +1719,18 @@ class _SendViewState extends ConsumerState<SendView> {
                               )
                             ],
                           ),
+                          if (isCustomFee)
+                            Padding(
+                              padding: const EdgeInsets.only(
+                                bottom: 12,
+                                top: 16,
+                              ),
+                              child: FeeSlider(
+                                onSatVByteChanged: (rate) {
+                                  customFeeRate = rate;
+                                },
+                              ),
+                            ),
                           const Spacer(),
                           const SizedBox(
                             height: 12,
diff --git a/lib/pages/send_view/sub_widgets/openalias_sheet.dart b/lib/pages/send_view/sub_widgets/openalias_sheet.dart
new file mode 100644
index 000000000..9c9d9a0f8
--- /dev/null
+++ b/lib/pages/send_view/sub_widgets/openalias_sheet.dart
@@ -0,0 +1,151 @@
+// /*
+//  * This file is part of Stack Wallet.
+//  *
+//  * Copyright (c) 2023 Cypher Stack
+//  * All Rights Reserved.
+//  * The code is distributed under GPLv3 license, see LICENSE file for details.
+//  * Generated by Cypher Stack on 2023-05-26
+//  *
+//  */
+//
+// import 'package:basic_utils/basic_utils.dart';
+// import 'package:flutter/material.dart';
+// import 'package:flutter_riverpod/flutter_riverpod.dart';
+// import 'package:stackduo/themes/stack_colors.dart';
+// import 'package:stackduo/utilities/constants.dart';
+// import 'package:stackduo/utilities/text_styles.dart';
+//
+// class OpenAliasBottomSheet extends ConsumerStatefulWidget {
+//   const OpenAliasBottomSheet({
+//     Key? key,
+//     required this.onSelected,
+//   }) : super(key: key);
+//
+//   final Null Function(String) onSelected;
+//
+//   @override
+//   ConsumerState<OpenAliasBottomSheet> createState() =>
+//       _OpenAliasBottomSheetState();
+// }
+//
+// class _OpenAliasBottomSheetState extends ConsumerState<OpenAliasBottomSheet> {
+//   late TextEditingController textEditingController;
+//
+//   @override
+//   void initState() {
+//     super.initState();
+//     textEditingController = TextEditingController();
+//   }
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     return SingleChildScrollView(
+//       child: Padding(
+//         padding:
+//             EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+//         child: Container(
+//           decoration: BoxDecoration(
+//             color: Theme.of(context).extension<StackColors>()!.popupBG,
+//             borderRadius: const BorderRadius.vertical(
+//               top: Radius.circular(20),
+//             ),
+//           ),
+//           child: Padding(
+//             padding: const EdgeInsets.only(
+//               top: 20,
+//               left: 20,
+//               right: 20,
+//               bottom: 20,
+//             ),
+//             child: Column(
+//               mainAxisSize: MainAxisSize.min,
+//               crossAxisAlignment: CrossAxisAlignment.start,
+//               children: [
+//                 Center(
+//                   child: Container(
+//                     decoration: BoxDecoration(
+//                       color: Theme.of(context)
+//                           .extension<StackColors>()!
+//                           .textFieldDefaultBG,
+//                       borderRadius: BorderRadius.circular(
+//                         Constants.size.circularBorderRadius,
+//                       ),
+//                     ),
+//                     width: 60,
+//                     height: 4,
+//                   ),
+//                 ),
+//                 const SizedBox(
+//                   height: 36,
+//                 ),
+//                 Text(
+//                   'OpenAlias Address',
+//                   style: STextStyles.smallMed12(context),
+//                   textAlign: TextAlign.left,
+//                 ),
+//                 const SizedBox(
+//                   height: 8,
+//                 ),
+//                 TextField(
+//                   controller: textEditingController,
+//                   decoration: const InputDecoration(
+//                     border: OutlineInputBorder(),
+//                   ),
+//                 ),
+//                 const SizedBox(
+//                   height: 16,
+//                 ),
+//                 Align(
+//                   alignment: Alignment.bottomCenter,
+//                   child: ConstrainedBox(
+//                     constraints: const BoxConstraints(
+//                       minWidth: 480,
+//                       minHeight: 70,
+//                     ),
+//                     child: TextButton(
+//                       style: Theme.of(context)
+//                           .extension<StackColors>()!
+//                           .getPrimaryEnabledButtonStyle(context),
+//                       onPressed: () async {
+//                         String text = textEditingController.text
+//                             .trim()
+//                             .replaceAll("@", ".");
+//                         List<RRecord>? result =
+//                             await DnsUtils.lookupRecord(text, RRecordType.TXT);
+//                         String address = "";
+//                         if (result != null && result.isNotEmpty) {
+//                           for (RRecord record in result) {
+//                             if (record.data.startsWith("oa1:xmr")) {
+//                               List<String> datas = record.data.split(" ");
+//                               for (String data in datas) {
+//                                 if (data.startsWith("recipient_address=")) {
+//                                   address = data
+//                                       .substring("recipient_address=".length)
+//                                       .replaceAll(";", "");
+//                                   break;
+//                                 }
+//                               }
+//                               break;
+//                             }
+//                           }
+//                         }
+//                         widget.onSelected(address);
+//                         if (mounted) {
+//                           Navigator.of(context).pop();
+//                         }
+//                       },
+//                       child: Text(
+//                         "Enter",
+//                         style: STextStyles.button(context),
+//                       ),
+//                     ),
+//                   ),
+//                 )
+//               ],
+//             ),
+//           ),
+//         ),
+//       ),
+//     );
+//   }
+// }
diff --git a/lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart b/lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart
index f844f0e41..a0f59a315 100644
--- a/lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart
+++ b/lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart
@@ -1,17 +1,17 @@
 import 'package:cw_core/monero_transaction_priority.dart';
-import 'package:decimal/decimal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:stackduo/models/paymint/fee_object_model.dart';
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/providers/ui/fee_rate_type_state_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/enums/fee_rate_type_enum.dart';
 import 'package:stackduo/utilities/logger.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/animated_text.dart';
 
 final feeSheetSessionCacheProvider =
@@ -33,11 +33,13 @@ class TransactionFeeSelectionSheet extends ConsumerStatefulWidget {
     required this.walletId,
     required this.amount,
     required this.updateChosen,
+    this.isToken = false,
   }) : super(key: key);
 
   final String walletId;
   final Amount amount;
   final Function updateChosen;
+  final bool isToken;
 
   @override
   ConsumerState<TransactionFeeSelectionSheet> createState() =>
@@ -67,49 +69,88 @@ class _TransactionFeeSelectionSheetState
     switch (feeRateType) {
       case FeeRateType.fast:
         if (ref.read(feeSheetSessionCacheProvider).fast[amount] == null) {
+          // if (widget.isToken == false) {
           final manager =
               ref.read(walletsChangeNotifierProvider).getManager(walletId);
 
-          if (coin == Coin.monero) {
+          if (coin == Coin.monero /*|| coin == Coin.wownero*/) {
             final fee = await manager.estimateFeeFor(
                 amount, MoneroTransactionPriority.fast.raw!);
             ref.read(feeSheetSessionCacheProvider).fast[amount] = fee;
+            // } else if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+            //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+            //         "Private") {
+            //   ref.read(feeSheetSessionCacheProvider).fast[amount] =
+            //       await (manager.wallet as FiroWallet)
+            //           .estimateFeeForPublic(amount, feeRate);
           } else {
             ref.read(feeSheetSessionCacheProvider).fast[amount] =
                 await manager.estimateFeeFor(amount, feeRate);
           }
+          // } else {
+          //   final tokenWallet = ref.read(tokenServiceProvider)!;
+          //   final fee = tokenWallet.estimateFeeFor(feeRate);
+          //   ref.read(feeSheetSessionCacheProvider).fast[amount] = fee;
+          // }
         }
         return ref.read(feeSheetSessionCacheProvider).fast[amount]!;
 
       case FeeRateType.average:
         if (ref.read(feeSheetSessionCacheProvider).average[amount] == null) {
+          // if (widget.isToken == false) {
           final manager =
               ref.read(walletsChangeNotifierProvider).getManager(walletId);
-          if (coin == Coin.monero) {
+          if (coin == Coin.monero /* || coin == Coin.wownero*/) {
             final fee = await manager.estimateFeeFor(
                 amount, MoneroTransactionPriority.regular.raw!);
             ref.read(feeSheetSessionCacheProvider).average[amount] = fee;
+            // } else if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+            //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+            //         "Private") {
+            //   ref.read(feeSheetSessionCacheProvider).average[amount] =
+            //       await (manager.wallet as FiroWallet)
+            //           .estimateFeeForPublic(amount, feeRate);
           } else {
             ref.read(feeSheetSessionCacheProvider).average[amount] =
                 await manager.estimateFeeFor(amount, feeRate);
           }
+          // } else {
+          //   final tokenWallet = ref.read(tokenServiceProvider)!;
+          //   final fee = tokenWallet.estimateFeeFor(feeRate);
+          //   ref.read(feeSheetSessionCacheProvider).average[amount] = fee;
+          // }
         }
         return ref.read(feeSheetSessionCacheProvider).average[amount]!;
 
       case FeeRateType.slow:
         if (ref.read(feeSheetSessionCacheProvider).slow[amount] == null) {
+          // if (widget.isToken == false) {
           final manager =
               ref.read(walletsChangeNotifierProvider).getManager(walletId);
-          if (coin == Coin.monero) {
+          if (coin == Coin.monero /*|| coin == Coin.wownero*/) {
             final fee = await manager.estimateFeeFor(
                 amount, MoneroTransactionPriority.slow.raw!);
             ref.read(feeSheetSessionCacheProvider).slow[amount] = fee;
+            // } else if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+            //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+            //         "Private") {
+            //   ref.read(feeSheetSessionCacheProvider).slow[amount] =
+            //       await (manager.wallet as FiroWallet)
+            //           .estimateFeeForPublic(amount, feeRate);
           } else {
             ref.read(feeSheetSessionCacheProvider).slow[amount] =
                 await manager.estimateFeeFor(amount, feeRate);
           }
+          // } else {
+          //   final tokenWallet = ref.read(tokenServiceProvider)!;
+          //   final fee = tokenWallet.estimateFeeFor(feeRate);
+          //   ref.read(feeSheetSessionCacheProvider).slow[amount] = fee;
+          // }
         }
         return ref.read(feeSheetSessionCacheProvider).slow[amount]!;
+
+      default:
+        return Amount.zero;
     }
   }
 
@@ -188,7 +229,11 @@ class _TransactionFeeSelectionSheetState
               height: 36,
             ),
             FutureBuilder(
-              future: manager.fees,
+              future:
+                  // widget.isToken
+                  //     ? ref.read(tokenServiceProvider)!.fees
+                  //     :
+                  manager.fees,
               builder: (context, AsyncSnapshot<FeeObject> snapshot) {
                 if (snapshot.connectionState == ConnectionState.done &&
                     snapshot.hasData) {
@@ -282,20 +327,21 @@ class _TransactionFeeSelectionSheetState
                                             feeRate: feeObject!.fast,
                                             amount: amount,
                                           ),
-                                          // future: manager.estimateFeeFor(
-                                          //     Format.decimalAmountToSatoshis(
-                                          //         amount),
-                                          //     feeObject!.fast),
                                           builder: (_,
                                               AsyncSnapshot<Amount> snapshot) {
                                             if (snapshot.connectionState ==
                                                     ConnectionState.done &&
                                                 snapshot.hasData) {
                                               return Text(
-                                                "(~${snapshot.data!.decimal.toStringAsFixed(
-                                                  manager.coin.decimals,
-                                                )}"
-                                                " ${manager.coin.ticker})",
+                                                "(~${ref.watch(
+                                                      pAmountFormatter(
+                                                        manager.coin,
+                                                      ),
+                                                    ).format(
+                                                      snapshot.data!,
+                                                      indicatePrecisionLoss:
+                                                          false,
+                                                    )})",
                                                 style: STextStyles.itemSubtitle(
                                                     context),
                                                 textAlign: TextAlign.left,
@@ -315,13 +361,19 @@ class _TransactionFeeSelectionSheetState
                                   const SizedBox(
                                     height: 2,
                                   ),
-                                  if (feeObject == null)
+                                  if (feeObject ==
+                                          null /* &&
+                                      manager.coin != Coin.ethereum*/
+                                      )
                                     AnimatedText(
                                       stringsToLoopThrough:
                                           stringsToLoopThrough,
                                       style: STextStyles.itemSubtitle(context),
                                     ),
-                                  if (feeObject != null)
+                                  if (feeObject !=
+                                          null /* &&
+                                      manager.coin != Coin.ethereum*/
+                                      )
                                     Text(
                                       estimatedTimeToBeIncludedInNextBlock(
                                         Constants.targetBlockTimeInSeconds(
@@ -416,18 +468,21 @@ class _TransactionFeeSelectionSheetState
                                             feeRate: feeObject!.medium,
                                             amount: amount,
                                           ),
-                                          // future: manager.estimateFeeFor(
-                                          //     Format.decimalAmountToSatoshis(
-                                          //         amount),
-                                          //     feeObject!.fast),
                                           builder: (_,
                                               AsyncSnapshot<Amount> snapshot) {
                                             if (snapshot.connectionState ==
                                                     ConnectionState.done &&
                                                 snapshot.hasData) {
                                               return Text(
-                                                "(~${snapshot.data!.decimal.toStringAsFixed(manager.coin.decimals)}"
-                                                " ${manager.coin.ticker})",
+                                                "(~${ref.watch(
+                                                      pAmountFormatter(
+                                                        manager.coin,
+                                                      ),
+                                                    ).format(
+                                                      snapshot.data!,
+                                                      indicatePrecisionLoss:
+                                                          false,
+                                                    )})",
                                                 style: STextStyles.itemSubtitle(
                                                     context),
                                                 textAlign: TextAlign.left,
@@ -506,8 +561,6 @@ class _TransactionFeeSelectionSheetState
                                         .watch(feeRateTypeStateProvider.state)
                                         .state,
                                     onChanged: (x) {
-                                      //todo: check if print needed
-                                      // debugPrint(x.toString());
                                       ref
                                           .read(feeRateTypeStateProvider.state)
                                           .state = FeeRateType.slow;
@@ -549,17 +602,21 @@ class _TransactionFeeSelectionSheetState
                                             feeRate: feeObject!.slow,
                                             amount: amount,
                                           ),
-                                          // future: manager.estimateFeeFor(
-                                          //     Format.decimalAmountToSatoshis(
-                                          //         amount),
-                                          //     feeObject!.fast),
                                           builder: (_,
                                               AsyncSnapshot<Amount> snapshot) {
                                             if (snapshot.connectionState ==
                                                     ConnectionState.done &&
                                                 snapshot.hasData) {
                                               return Text(
-                                                "(~${snapshot.data!.decimal.toStringAsFixed(manager.coin.decimals)} ${manager.coin.ticker})",
+                                                "(~${ref.watch(
+                                                      pAmountFormatter(
+                                                        manager.coin,
+                                                      ),
+                                                    ).format(
+                                                      snapshot.data!,
+                                                      indicatePrecisionLoss:
+                                                          false,
+                                                    )})",
                                                 style: STextStyles.itemSubtitle(
                                                     context),
                                                 textAlign: TextAlign.left,
@@ -605,6 +662,79 @@ class _TransactionFeeSelectionSheetState
                     const SizedBox(
                       height: 24,
                     ),
+                    if (manager.coin.isElectrumXCoin)
+                      GestureDetector(
+                        onTap: () {
+                          final state =
+                              ref.read(feeRateTypeStateProvider.state).state;
+                          if (state != FeeRateType.custom) {
+                            ref.read(feeRateTypeStateProvider.state).state =
+                                FeeRateType.custom;
+                          }
+                          widget.updateChosen("custom");
+
+                          Navigator.of(context).pop();
+                        },
+                        child: Container(
+                          color: Colors.transparent,
+                          child: Row(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Column(
+                                children: [
+                                  SizedBox(
+                                    width: 20,
+                                    height: 20,
+                                    child: Radio(
+                                      activeColor: Theme.of(context)
+                                          .extension<StackColors>()!
+                                          .radioButtonIconEnabled,
+                                      value: FeeRateType.custom,
+                                      groupValue: ref
+                                          .watch(feeRateTypeStateProvider.state)
+                                          .state,
+                                      onChanged: (x) {
+                                        ref
+                                            .read(
+                                                feeRateTypeStateProvider.state)
+                                            .state = FeeRateType.custom;
+                                        Navigator.of(context).pop();
+                                      },
+                                    ),
+                                  ),
+                                ],
+                              ),
+                              const SizedBox(
+                                width: 12,
+                              ),
+                              Flexible(
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Row(
+                                      children: [
+                                        Text(
+                                          FeeRateType.custom.prettyName,
+                                          style:
+                                              STextStyles.titleBold12(context),
+                                          textAlign: TextAlign.left,
+                                        ),
+                                      ],
+                                    ),
+                                    const SizedBox(
+                                      height: 2,
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    if (manager.coin.isElectrumXCoin)
+                      const SizedBox(
+                        height: 24,
+                      ),
                   ],
                 );
               },
@@ -620,27 +750,35 @@ class _TransactionFeeSelectionSheetState
       switch (feeRateType) {
         case FeeRateType.fast:
           if (ref.read(feeSheetSessionCacheProvider).fast[amount] != null) {
-            return (ref.read(feeSheetSessionCacheProvider).fast[amount]
-                    as Decimal)
-                .toStringAsFixed(coin.decimals);
+            return ref.read(pAmountFormatter(coin)).format(
+                  ref.read(feeSheetSessionCacheProvider).fast[amount]!,
+                  indicatePrecisionLoss: false,
+                  withUnitName: false,
+                );
           }
           return null;
 
         case FeeRateType.average:
           if (ref.read(feeSheetSessionCacheProvider).average[amount] != null) {
-            return (ref.read(feeSheetSessionCacheProvider).average[amount]
-                    as Decimal)
-                .toStringAsFixed(coin.decimals);
+            return ref.read(pAmountFormatter(coin)).format(
+                  ref.read(feeSheetSessionCacheProvider).average[amount]!,
+                  indicatePrecisionLoss: false,
+                  withUnitName: false,
+                );
           }
           return null;
 
         case FeeRateType.slow:
           if (ref.read(feeSheetSessionCacheProvider).slow[amount] != null) {
-            return (ref.read(feeSheetSessionCacheProvider).slow[amount]
-                    as Decimal)
-                .toStringAsFixed(coin.decimals);
+            return ref.read(pAmountFormatter(coin)).format(
+                  ref.read(feeSheetSessionCacheProvider).slow[amount]!,
+                  indicatePrecisionLoss: false,
+                  withUnitName: false,
+                );
           }
           return null;
+        case FeeRateType.custom:
+          return null;
       }
     } catch (e, s) {
       Logging.instance.log("$e $s", level: LogLevel.Warning);
diff --git a/lib/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart b/lib/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart
index 9c3284ae3..7bbc9f4e7 100644
--- a/lib/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart
+++ b/lib/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/debug_view.dart';
+import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/manage_explorer_view.dart';
 import 'package:stackduo/pages/stack_privacy_calls.dart';
 import 'package:stackduo/providers/global/prefs_provider.dart';
@@ -227,6 +228,43 @@ class AdvancedSettingsView extends StatelessWidget {
               const SizedBox(
                 height: 8,
               ),
+              RoundedWhiteContainer(
+                padding: const EdgeInsets.all(0),
+                child: RawMaterialButton(
+                  // splashColor: Theme.of(context).extension<StackColors>()!.highlight,
+                  materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(
+                      Constants.size.circularBorderRadius,
+                    ),
+                  ),
+                  onPressed: () {
+                    Navigator.of(context).pushNamed(ChooseCoinView.routeName,
+                        arguments: const Tuple3<String, String, String>(
+                            "Manage block explorers",
+                            "block explorer",
+                            ManageExplorerView.routeName));
+                  },
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 12,
+                      vertical: 20,
+                    ),
+                    child: Row(
+                      children: [
+                        Text(
+                          "Change block explorer",
+                          style: STextStyles.titleBold12(context),
+                          textAlign: TextAlign.left,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+              const SizedBox(
+                height: 8,
+              ),
               RoundedWhiteContainer(
                 padding: const EdgeInsets.all(0),
                 child: RawMaterialButton(
@@ -239,12 +277,7 @@ class AdvancedSettingsView extends StatelessWidget {
                   ),
                   onPressed: () {
                     Navigator.of(context).pushNamed(
-                      ChooseCoinView.routeName,
-                      arguments: const Tuple3<String, String, String>(
-                        "Manage block explorers",
-                        "block explorer",
-                        ManageExplorerView.routeName,
-                      ),
+                      ManageCoinUnitsView.routeName,
                     );
                   },
                   child: Padding(
@@ -255,7 +288,7 @@ class AdvancedSettingsView extends StatelessWidget {
                     child: Row(
                       children: [
                         Text(
-                          "Change block explorer",
+                          "Units",
                           style: STextStyles.titleBold12(context),
                           textAlign: TextAlign.left,
                         ),
diff --git a/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/choose_unit_sheet.dart b/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/choose_unit_sheet.dart
new file mode 100644
index 000000000..4aecfc4b8
--- /dev/null
+++ b/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/choose_unit_sheet.dart
@@ -0,0 +1,144 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
+import 'package:stackduo/utilities/amount/amount_unit.dart';
+import 'package:stackduo/utilities/constants.dart';
+import 'package:stackduo/utilities/enums/coin_enum.dart';
+import 'package:stackduo/utilities/text_styles.dart';
+
+class ChooseUnitSheet extends ConsumerStatefulWidget {
+  const ChooseUnitSheet({
+    Key? key,
+    required this.coin,
+  }) : super(key: key);
+
+  final Coin coin;
+
+  @override
+  ConsumerState<ChooseUnitSheet> createState() => _ChooseUnitSheetState();
+}
+
+class _ChooseUnitSheetState extends ConsumerState<ChooseUnitSheet> {
+  late AmountUnit _current;
+  late final List<AmountUnit> values;
+
+  @override
+  void initState() {
+    values = AmountUnit.valuesForCoin(widget.coin);
+    _current = ref.read(pAmountUnit(widget.coin));
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: Theme.of(context).extension<StackColors>()!.popupBG,
+        borderRadius: const BorderRadius.vertical(
+          top: Radius.circular(20),
+        ),
+      ),
+      child: Padding(
+        padding: const EdgeInsets.only(
+          left: 24,
+          right: 24,
+          top: 10,
+          bottom: 0,
+        ),
+        child: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Center(
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: Theme.of(context)
+                        .extension<StackColors>()!
+                        .textFieldDefaultBG,
+                    borderRadius: BorderRadius.circular(
+                      Constants.size.circularBorderRadius,
+                    ),
+                  ),
+                  width: 60,
+                  height: 4,
+                ),
+              ),
+              const SizedBox(
+                height: 36,
+              ),
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    "Coin units",
+                    style: STextStyles.pageTitleH2(context),
+                    textAlign: TextAlign.left,
+                  ),
+                  const SizedBox(
+                    height: 16,
+                  ),
+                  for (int i = 0; i < values.length; i++)
+                    Column(
+                      children: [
+                        GestureDetector(
+                          onTap: () {
+                            setState(() {
+                              _current = values[i];
+                            });
+
+                            Navigator.of(context).pop(_current);
+                          },
+                          child: Container(
+                            color: Colors.transparent,
+                            child: Row(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                SizedBox(
+                                  width: 20,
+                                  height: 20,
+                                  child: Radio(
+                                    activeColor: Theme.of(context)
+                                        .extension<StackColors>()!
+                                        .radioButtonIconEnabled,
+                                    value: values[i],
+                                    groupValue: _current,
+                                    onChanged: (x) {
+                                      setState(() {
+                                        _current = values[i];
+                                      });
+
+                                      Navigator.of(context).pop(_current);
+                                    },
+                                  ),
+                                ),
+                                const SizedBox(
+                                  width: 12,
+                                ),
+                                Text(
+                                  values[i].unitForCoin(widget.coin),
+                                  style: STextStyles.titleBold12(context),
+                                  textAlign: TextAlign.left,
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        const SizedBox(
+                          height: 16,
+                        ),
+                      ],
+                    ),
+                  const SizedBox(
+                    height: 8,
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/edit_coin_units_view.dart b/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/edit_coin_units_view.dart
new file mode 100644
index 000000000..e83e5aa4d
--- /dev/null
+++ b/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/edit_coin_units_view.dart
@@ -0,0 +1,343 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/choose_unit_sheet.dart';
+import 'package:stackduo/providers/global/prefs_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
+import 'package:stackduo/utilities/amount/amount_unit.dart';
+import 'package:stackduo/utilities/assets.dart';
+import 'package:stackduo/utilities/constants.dart';
+import 'package:stackduo/utilities/enums/coin_enum.dart';
+import 'package:stackduo/utilities/text_styles.dart';
+import 'package:stackduo/utilities/util.dart';
+import 'package:stackduo/widgets/background.dart';
+import 'package:stackduo/widgets/conditional_parent.dart';
+import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackduo/widgets/desktop/desktop_dialog.dart';
+import 'package:stackduo/widgets/desktop/desktop_dialog_close_button.dart';
+import 'package:stackduo/widgets/desktop/primary_button.dart';
+import 'package:stackduo/widgets/desktop/secondary_button.dart';
+import 'package:stackduo/widgets/icon_widgets/x_icon.dart';
+import 'package:stackduo/widgets/stack_text_field.dart';
+import 'package:stackduo/widgets/textfield_icon_button.dart';
+
+class EditCoinUnitsView extends ConsumerStatefulWidget {
+  const EditCoinUnitsView({
+    Key? key,
+    required this.coin,
+  }) : super(key: key);
+
+  final Coin coin;
+
+  static const String routeName = "/editCoinUnitsView";
+
+  @override
+  ConsumerState<EditCoinUnitsView> createState() => _EditCoinUnitsViewState();
+}
+
+class _EditCoinUnitsViewState extends ConsumerState<EditCoinUnitsView> {
+  late final TextEditingController _decimalsController;
+  late final FocusNode _decimalsFocusNode;
+
+  late AmountUnit _currentUnit;
+
+  void onSave() {
+    final maxDecimals = int.tryParse(_decimalsController.text);
+
+    if (maxDecimals == null) {
+      // TODO show dialog error thing
+      return;
+    }
+
+    ref.read(prefsChangeNotifierProvider).updateAmountUnit(
+          coin: widget.coin,
+          amountUnit: _currentUnit,
+        );
+    ref.read(prefsChangeNotifierProvider).updateMaxDecimals(
+          coin: widget.coin,
+          maxDecimals: maxDecimals,
+        );
+
+    Navigator.of(context).pop();
+  }
+
+  Future<void> chooseUnit() async {
+    final chosenUnit = await showModalBottomSheet<AmountUnit?>(
+      backgroundColor: Colors.transparent,
+      context: context,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(
+          top: Radius.circular(20),
+        ),
+      ),
+      builder: (_) {
+        return ChooseUnitSheet(
+          coin: widget.coin,
+        );
+      },
+    );
+
+    if (chosenUnit != null) {
+      setState(() {
+        _currentUnit = chosenUnit;
+      });
+    }
+  }
+
+  @override
+  void initState() {
+    _decimalsFocusNode = FocusNode();
+    _decimalsController = TextEditingController()
+      ..text = ref.read(pMaxDecimals(widget.coin)).toString();
+    _currentUnit = ref.read(pAmountUnit(widget.coin));
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _decimalsFocusNode.dispose();
+    _decimalsController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ConditionalParent(
+      condition: Util.isDesktop,
+      builder: (child) => DesktopDialog(
+        maxHeight: 350,
+        maxWidth: 500,
+        child: Column(
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.only(left: 32),
+                  child: Text(
+                    "Edit ${widget.coin.prettyName} units",
+                    style: STextStyles.desktopH3(context),
+                  ),
+                ),
+                const DesktopDialogCloseButton(),
+              ],
+            ),
+            Expanded(
+              child: Padding(
+                padding: const EdgeInsets.only(
+                  left: 32,
+                  right: 32,
+                  bottom: 32,
+                ),
+                child: child,
+              ),
+            ),
+          ],
+        ),
+      ),
+      child: ConditionalParent(
+        condition: !Util.isDesktop,
+        builder: (child) => Background(
+          child: Scaffold(
+            backgroundColor:
+                Theme.of(context).extension<StackColors>()!.background,
+            appBar: AppBar(
+              leading: AppBarBackButton(
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+              title: Text(
+                "Edit ${widget.coin.prettyName} units",
+                style: STextStyles.navBarTitle(context),
+              ),
+            ),
+            body: Padding(
+              padding: const EdgeInsets.all(16),
+              child: child,
+            ),
+          ),
+        ),
+        child: Column(
+          children: [
+            if (Util.isDesktop)
+              DropdownButtonHideUnderline(
+                child: DropdownButton2<AmountUnit>(
+                  value: _currentUnit,
+                  items: [
+                    ...AmountUnit.valuesForCoin(widget.coin).map(
+                      (e) => DropdownMenuItem(
+                        value: e,
+                        child: Text(
+                          e.unitForCoin(widget.coin),
+                          style: STextStyles.desktopTextMedium(context),
+                        ),
+                      ),
+                    ),
+                  ],
+                  onChanged: (value) {
+                    if (value is AmountUnit) {
+                      _currentUnit = value;
+                    }
+                  },
+                  isExpanded: true,
+                  iconStyleData: IconStyleData(
+                    icon: SvgPicture.asset(
+                      Assets.svg.chevronDown,
+                      width: 12,
+                      height: 6,
+                      color: Theme.of(context)
+                          .extension<StackColors>()!
+                          .textFieldActiveSearchIconRight,
+                    ),
+                  ),
+                  dropdownStyleData: DropdownStyleData(
+                    offset: const Offset(0, -10),
+                    elevation: 0,
+                    decoration: BoxDecoration(
+                      color: Theme.of(context)
+                          .extension<StackColors>()!
+                          .textFieldDefaultBG,
+                      borderRadius: BorderRadius.circular(
+                        Constants.size.circularBorderRadius,
+                      ),
+                    ),
+                  ),
+                  menuItemStyleData: const MenuItemStyleData(
+                    padding: EdgeInsets.symmetric(
+                      horizontal: 16,
+                      vertical: 8,
+                    ),
+                  ),
+                ),
+              ),
+            if (!Util.isDesktop)
+              Stack(
+                children: [
+                  TextField(
+                    autocorrect: Util.isDesktop ? false : true,
+                    enableSuggestions: Util.isDesktop ? false : true,
+                    // controller: _lengthController,
+                    readOnly: true,
+                    textInputAction: TextInputAction.none,
+                  ),
+                  Positioned.fill(
+                    child: RawMaterialButton(
+                      splashColor:
+                          Theme.of(context).extension<StackColors>()!.highlight,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(
+                          Constants.size.circularBorderRadius,
+                        ),
+                      ),
+                      onPressed: chooseUnit,
+                      child: Padding(
+                        padding: const EdgeInsets.only(
+                          left: 12,
+                          right: 17,
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Text(
+                              _currentUnit.unitForCoin(widget.coin),
+                              style: STextStyles.itemSubtitle12(context),
+                            ),
+                            SvgPicture.asset(
+                              Assets.svg.chevronDown,
+                              width: 14,
+                              height: 6,
+                              color: Theme.of(context)
+                                  .extension<StackColors>()!
+                                  .textFieldActiveSearchIconRight,
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  )
+                ],
+              ),
+            SizedBox(
+              height: Util.isDesktop ? 24 : 8,
+            ),
+            ClipRRect(
+              borderRadius: BorderRadius.circular(
+                Constants.size.circularBorderRadius,
+              ),
+              child: TextField(
+                autocorrect: Util.isDesktop ? false : true,
+                enableSuggestions: Util.isDesktop ? false : true,
+                key: const Key("addCustomNodeNodeNameFieldKey"),
+                controller: _decimalsController,
+                focusNode: _decimalsFocusNode,
+                keyboardType: const TextInputType.numberWithOptions(
+                  signed: false,
+                  decimal: false,
+                ),
+                style: STextStyles.field(context),
+                decoration: standardInputDecoration(
+                  "Maximum precision",
+                  _decimalsFocusNode,
+                  context,
+                ).copyWith(
+                  labelStyle:
+                      Util.isDesktop ? STextStyles.fieldLabel(context) : null,
+                  suffixIcon: _decimalsController.text.isNotEmpty
+                      ? Padding(
+                          padding: const EdgeInsets.only(right: 0),
+                          child: UnconstrainedBox(
+                            child: Row(
+                              children: [
+                                TextFieldIconButton(
+                                  child: const XIcon(),
+                                  onTap: () async {
+                                    _decimalsController.text = "";
+                                    setState(() {});
+                                  },
+                                ),
+                              ],
+                            ),
+                          ),
+                        )
+                      : null,
+                ),
+              ),
+            ),
+            const SizedBox(
+              height: 24,
+            ),
+            const Spacer(),
+            ConditionalParent(
+              condition: Util.isDesktop,
+              builder: (child) => Row(
+                children: [
+                  Expanded(
+                    child: SecondaryButton(
+                      label: "Cancel",
+                      buttonHeight: ButtonHeight.l,
+                      onPressed: Navigator.of(context).pop,
+                    ),
+                  ),
+                  const SizedBox(
+                    width: 16,
+                  ),
+                  Expanded(
+                    child: child,
+                  ),
+                ],
+              ),
+              child: PrimaryButton(
+                label: "Save",
+                buttonHeight: Util.isDesktop ? ButtonHeight.l : ButtonHeight.xl,
+                onPressed: onSave,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart b/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart
new file mode 100644
index 000000000..3ffee2af1
--- /dev/null
+++ b/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart
@@ -0,0 +1,177 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/edit_coin_units_view.dart';
+import 'package:stackduo/providers/global/prefs_provider.dart';
+import 'package:stackduo/themes/coin_icon_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/assets.dart';
+import 'package:stackduo/utilities/enums/coin_enum.dart';
+import 'package:stackduo/utilities/text_styles.dart';
+import 'package:stackduo/utilities/util.dart';
+import 'package:stackduo/widgets/background.dart';
+import 'package:stackduo/widgets/conditional_parent.dart';
+import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackduo/widgets/desktop/desktop_dialog.dart';
+import 'package:stackduo/widgets/desktop/desktop_dialog_close_button.dart';
+import 'package:stackduo/widgets/rounded_white_container.dart';
+
+class ManageCoinUnitsView extends ConsumerWidget {
+  const ManageCoinUnitsView({Key? key}) : super(key: key);
+
+  static const String routeName = "/manageCoinUnitsView";
+
+  void onEditPressed(Coin coin, BuildContext context) {
+    if (Util.isDesktop) {
+      showDialog<void>(
+        context: context,
+        builder: (context) => EditCoinUnitsView(coin: coin),
+      );
+    } else {
+      Navigator.of(context).pushNamed(
+        EditCoinUnitsView.routeName,
+        arguments: coin,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    bool showTestNet = ref.watch(
+      prefsChangeNotifierProvider.select((value) => value.showTestNetCoins),
+    );
+
+    final _coins =
+        Coin.values /*.where((e) => e != Coin.firoTestNet)*/ .toList();
+
+    List<Coin> coins = showTestNet
+        ? _coins
+        : _coins.sublist(0, _coins.length - kTestNetCoinCount);
+
+    return ConditionalParent(
+      condition: Util.isDesktop,
+      builder: (child) => DesktopDialog(
+        maxHeight: 850,
+        maxWidth: 600,
+        child: Column(
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.only(left: 32),
+                  child: Text(
+                    "Units",
+                    style: STextStyles.desktopH3(context),
+                  ),
+                ),
+                const DesktopDialogCloseButton(),
+              ],
+            ),
+            Expanded(
+              child: Padding(
+                padding: const EdgeInsets.only(
+                  left: 32,
+                  right: 32,
+                  bottom: 32,
+                ),
+                child: child,
+              ),
+            ),
+          ],
+        ),
+      ),
+      child: ConditionalParent(
+        condition: !Util.isDesktop,
+        builder: (child) => Background(
+          child: Scaffold(
+            backgroundColor:
+                Theme.of(context).extension<StackColors>()!.background,
+            appBar: AppBar(
+              leading: AppBarBackButton(
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+              title: Text(
+                "Units",
+                style: STextStyles.navBarTitle(context),
+              ),
+            ),
+            body: child,
+          ),
+        ),
+        child: ListView.separated(
+          itemCount: Util.isDesktop ? coins.length : coins.length + 2,
+          separatorBuilder: (_, __) => const SizedBox(
+            height: 12,
+          ),
+          itemBuilder: (_, index) {
+            if (!Util.isDesktop) {
+              if (index == 0) {
+                return const SizedBox(height: 0);
+              } else if (index > coins.length) {
+                return const SizedBox(height: 10);
+              }
+            }
+
+            final coin = coins[Util.isDesktop ? index : index - 1];
+            return Padding(
+              padding: Util.isDesktop
+                  ? EdgeInsets.zero
+                  : const EdgeInsets.symmetric(
+                      horizontal: 16,
+                    ),
+              child: RoundedWhiteContainer(
+                padding: Util.isDesktop
+                    ? const EdgeInsets.symmetric(
+                        vertical: 16,
+                        horizontal: 14,
+                      )
+                    : const EdgeInsets.all(12),
+                borderColor: Util.isDesktop
+                    ? Theme.of(context).extension<StackColors>()!.textSubtitle6
+                    : null,
+                onPressed: () {
+                  onEditPressed(coin, context);
+                },
+                child: Row(
+                  children: [
+                    SvgPicture.file(
+                      File(
+                        ref.watch(
+                          coinIconProvider(coin),
+                        ),
+                      ),
+                      width: 24,
+                      height: 24,
+                    ),
+                    const SizedBox(
+                      width: 12,
+                    ),
+                    Expanded(
+                      child: Text(
+                        "Edit ${coin.prettyName} units",
+                        style: STextStyles.titleBold12(context),
+                      ),
+                    ),
+                    const SizedBox(
+                      width: 12,
+                    ),
+                    SvgPicture.asset(
+                      Assets.svg.chevronRight,
+                      width: Util.isDesktop ? 20 : 14,
+                      height: Util.isDesktop ? 20 : 14,
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart
index ee4da4467..f55356792 100644
--- a/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart
+++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/edit_auto_backup_view.dart
@@ -616,9 +616,7 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
           if (isDesktop)
             DropdownButtonHideUnderline(
               child: DropdownButton2(
-                offset: const Offset(0, -10),
                 isExpanded: true,
-                dropdownElevation: 0,
                 value: _currentDropDownValue,
                 items: [
                   ..._dropDownItems.map(
@@ -662,30 +660,31 @@ class _EditAutoBackupViewState extends ConsumerState<EditAutoBackupView> {
                     });
                   }
                 },
-                icon: SvgPicture.asset(
-                  Assets.svg.chevronDown,
-                  width: 10,
-                  height: 5,
-                  color: Theme.of(context).extension<StackColors>()!.textDark3,
-                ),
-                buttonPadding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 8,
+                iconStyleData: IconStyleData(
+                  icon: SvgPicture.asset(
+                    Assets.svg.chevronDown,
+                    width: 10,
+                    height: 5,
+                    color:
+                        Theme.of(context).extension<StackColors>()!.textDark3,
+                  ),
                 ),
-                buttonDecoration: BoxDecoration(
-                  color: Theme.of(context)
-                      .extension<StackColors>()!
-                      .textFieldDefaultBG,
-                  borderRadius: BorderRadius.circular(
-                    Constants.size.circularBorderRadius,
+                dropdownStyleData: DropdownStyleData(
+                  offset: const Offset(0, -10),
+                  elevation: 0,
+                  decoration: BoxDecoration(
+                    color: Theme.of(context)
+                        .extension<StackColors>()!
+                        .textFieldDefaultBG,
+                    borderRadius: BorderRadius.circular(
+                      Constants.size.circularBorderRadius,
+                    ),
                   ),
                 ),
-                dropdownDecoration: BoxDecoration(
-                  color: Theme.of(context)
-                      .extension<StackColors>()!
-                      .textFieldDefaultBG,
-                  borderRadius: BorderRadius.circular(
-                    Constants.size.circularBorderRadius,
+                menuItemStyleData: const MenuItemStyleData(
+                  padding: EdgeInsets.symmetric(
+                    horizontal: 16,
+                    vertical: 8,
                   ),
                 ),
               ),
diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart
index a2b115159..b1b57748c 100644
--- a/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart
+++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:stack_wallet_backup/stack_wallet_backup.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/exchange/change_now/exchange_transaction.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
 import 'package:stackduo/models/isar/models/contact_entry.dart';
diff --git a/lib/pages/settings_views/global_settings_view/syncing_preferences_views/wallet_syncing_options_view.dart b/lib/pages/settings_views/global_settings_view/syncing_preferences_views/wallet_syncing_options_view.dart
index b070384ea..59fe27a04 100644
--- a/lib/pages/settings_views/global_settings_view/syncing_preferences_views/wallet_syncing_options_view.dart
+++ b/lib/pages/settings_views/global_settings_view/syncing_preferences_views/wallet_syncing_options_view.dart
@@ -6,8 +6,8 @@ import 'package:flutter_svg/svg.dart';
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/constants.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/enums/sync_type_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
 import 'package:stackduo/utilities/util.dart';
@@ -147,14 +147,10 @@ class WalletSyncingOptionsView extends ConsumerWidget {
                                           height: 2,
                                         ),
                                         Text(
-                                          "${manager.balance.total.localizedStringAsFixed(
-                                            locale: ref.watch(
-                                              localeServiceChangeNotifierProvider
-                                                  .select(
-                                                (value) => value.locale,
-                                              ),
-                                            ),
-                                          )} ${manager.coin.ticker}",
+                                          ref
+                                              .watch(pAmountFormatter(
+                                                  manager.coin))
+                                              .format(manager.balance.total),
                                           style:
                                               STextStyles.itemSubtitle(context),
                                         )
@@ -191,9 +187,9 @@ class WalletSyncingOptionsView extends ConsumerWidget {
                                               }
                                               break;
                                             case SyncingType
-                                                .selectedWalletsAtStartup:
+                                                  .selectedWalletsAtStartup:
                                             case SyncingType
-                                                .allWalletsOnStartup:
+                                                  .allWalletsOnStartup:
                                               manager.shouldAutoSync = value;
                                               break;
                                           }
diff --git a/lib/pages/settings_views/global_settings_view/xpub_view.dart b/lib/pages/settings_views/global_settings_view/xpub_view.dart
index d5b77d2b4..b98d9915d 100644
--- a/lib/pages/settings_views/global_settings_view/xpub_view.dart
+++ b/lib/pages/settings_views/global_settings_view/xpub_view.dart
@@ -243,7 +243,7 @@ class _XPub extends StatelessWidget {
             builder: (child) => RoundedWhiteContainer(
               child: child,
             ),
-            child: QrImage(
+            child: QrImageView(
               data: xpub,
               size: isDesktop ? 280 : MediaQuery.of(context).size.width / 1.5,
               foregroundColor:
diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart
index 23ebc9c2c..4d8cb6cfd 100644
--- a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart
+++ b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart
@@ -6,10 +6,10 @@ import 'package:flutter_windowmanager/flutter_windowmanager.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:stackduo/pages/add_wallet_views/new_wallet_recovery_phrase_view/sub_widgets/mnemonic_table.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/address_utils.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackduo/widgets/stack_dialog.dart';
@@ -162,7 +162,7 @@ class _WalletBackupViewState extends ConsumerState<WalletBackupView> {
                                 child: SizedBox(
                                   width: width + 20,
                                   height: width + 20,
-                                  child: QrImage(
+                                  child: QrImageView(
                                       data: data,
                                       size: width,
                                       backgroundColor: Theme.of(context)
diff --git a/lib/pages/stack_privacy_calls.dart b/lib/pages/stack_privacy_calls.dart
index 2a95a89c4..cd511e3fd 100644
--- a/lib/pages/stack_privacy_calls.dart
+++ b/lib/pages/stack_privacy_calls.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/pages/pinpad_views/create_pin_view.dart';
 import 'package:stackduo/pages_desktop_specific/password/create_password_view.dart';
 import 'package:stackduo/providers/global/prefs_provider.dart';
diff --git a/lib/pages/wallet_view/sub_widgets/wallet_balance_toggle_sheet.dart b/lib/pages/wallet_view/sub_widgets/wallet_balance_toggle_sheet.dart
index 28b5dfd52..7954516b4 100644
--- a/lib/pages/wallet_view/sub_widgets/wallet_balance_toggle_sheet.dart
+++ b/lib/pages/wallet_view/sub_widgets/wallet_balance_toggle_sheet.dart
@@ -2,12 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/providers/wallet/wallet_balance_toggle_state_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/enums/wallet_balance_toggle_state.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 
 enum _BalanceType {
   available,
@@ -199,13 +200,7 @@ class BalanceSelector<T> extends ConsumerWidget {
                   height: 2,
                 ),
                 Text(
-                  "${balance.localizedStringAsFixed(
-                    locale: ref.watch(
-                      localeServiceChangeNotifierProvider.select(
-                        (value) => value.locale,
-                      ),
-                    ),
-                  )} ${coin.ticker}",
+                  ref.watch(pAmountFormatter(coin)).format(balance),
                   style: STextStyles.itemSubtitle12(context).copyWith(
                     color: Theme.of(context)
                         .extension<StackColors>()!
diff --git a/lib/pages/wallet_view/sub_widgets/wallet_refresh_button.dart b/lib/pages/wallet_view/sub_widgets/wallet_refresh_button.dart
index 8c3db8085..3a2dc0735 100644
--- a/lib/pages/wallet_view/sub_widgets/wallet_refresh_button.dart
+++ b/lib/pages/wallet_view/sub_widgets/wallet_refresh_button.dart
@@ -52,13 +52,19 @@ class _RefreshButtonState extends ConsumerState<WalletRefreshButton> {
         if (event.walletId == widget.walletId) {
           switch (event.newStatus) {
             case WalletSyncStatus.unableToSync:
-              _spinController.stop?.call();
+              if (_spinController.hasLoadedAnimation) {
+                _spinController.stop?.call();
+              }
               break;
             case WalletSyncStatus.synced:
-              _spinController.stop?.call();
+              if (_spinController.hasLoadedAnimation) {
+                _spinController.stop?.call();
+              }
               break;
             case WalletSyncStatus.syncing:
-              _spinController.repeat?.call();
+              if (_spinController.hasLoadedAnimation) {
+                _spinController.repeat?.call();
+              }
               break;
           }
         }
@@ -84,6 +90,7 @@ class _RefreshButtonState extends ConsumerState<WalletRefreshButton> {
         width: isDesktop ? 22 : 36,
         child: Semantics(
           label: "Refresh Button. Refreshes The Values In Summary.",
+          excludeSemantics: true,
           child: MaterialButton(
             color: isDesktop
                 ? Theme.of(context)
diff --git a/lib/pages/wallet_view/sub_widgets/wallet_summary.dart b/lib/pages/wallet_view/sub_widgets/wallet_summary.dart
index 9d2486146..27979d7ce 100644
--- a/lib/pages/wallet_view/sub_widgets/wallet_summary.dart
+++ b/lib/pages/wallet_view/sub_widgets/wallet_summary.dart
@@ -1,18 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:stackduo/pages/wallet_view/sub_widgets/wallet_summary_info.dart';
-import 'package:stackduo/services/coins/manager.dart';
 import 'package:stackduo/services/event_bus/events/global/wallet_sync_status_changed_event.dart';
-import 'package:stackduo/utilities/assets.dart';
-import 'package:stackduo/utilities/constants.dart';
-import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/widgets/coin_card.dart';
 
 class WalletSummary extends StatelessWidget {
   const WalletSummary({
     Key? key,
     required this.walletId,
-    required this.managerProvider,
     required this.initialSyncStatus,
     this.aspectRatio = 2.0,
     this.minHeight = 100.0,
@@ -22,7 +16,6 @@ class WalletSummary extends StatelessWidget {
   }) : super(key: key);
 
   final String walletId;
-  final ChangeNotifierProvider<Manager> managerProvider;
   final WalletSyncStatus initialSyncStatus;
 
   final double aspectRatio;
@@ -42,83 +35,25 @@ class WalletSummary extends StatelessWidget {
           maxHeight: maxHeight,
           maxWidth: minWidth,
         ),
-        child: Stack(
-          children: [
-            Consumer(
-              builder: (_, ref, __) {
-                return Container(
-                  decoration: BoxDecoration(
-                    color: Theme.of(context)
-                        .extension<StackColors>()!
-                        .colorForCoin(ref.watch(
-                            managerProvider.select((value) => value.coin))),
-                    borderRadius: BorderRadius.circular(
-                      Constants.size.circularBorderRadius,
-                    ),
-                  ),
-                );
-              },
-            ),
-            Positioned.fill(
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const Spacer(
-                    flex: 5,
-                  ),
-                  Expanded(
-                    flex: 6,
-                    child: SvgPicture.asset(
-                      Assets.svg.ellipse1,
-                      // fit: BoxFit.fitWidth,
-                      // clipBehavior: Clip.none,
-                    ),
-                  ),
-                  const SizedBox(
-                    width: 25,
-                  ),
-                ],
+        child: LayoutBuilder(
+          builder: (_, constraints) => Stack(
+            children: [
+              CoinCard(
+                walletId: walletId,
+                width: constraints.maxWidth,
+                height: constraints.maxHeight,
               ),
-            ),
-            // Positioned.fill(
-            //   child:
-            // Column(
-            //   mainAxisAlignment: MainAxisAlignment.end,
-            //   children: [
-            Align(
-              alignment: Alignment.bottomCenter,
-              child: Row(
-                children: [
-                  const Spacer(
-                    flex: 1,
+              Positioned.fill(
+                child: Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: WalletSummaryInfo(
+                    walletId: walletId,
+                    initialSyncStatus: initialSyncStatus,
                   ),
-                  Expanded(
-                    flex: 3,
-                    child: SvgPicture.asset(
-                      Assets.svg.ellipse2,
-                      // fit: BoxFit.f,
-                      // clipBehavior: Clip.none,
-                    ),
-                  ),
-                  const SizedBox(
-                    width: 13,
-                  ),
-                ],
-              ),
-            ),
-            //   ],
-            // ),
-            // ),
-            Positioned.fill(
-              child: Padding(
-                padding: const EdgeInsets.all(16.0),
-                child: WalletSummaryInfo(
-                  walletId: walletId,
-                  initialSyncStatus: initialSyncStatus,
                 ),
               ),
-            ),
-          ],
+            ],
+          ),
         ),
       ),
     );
diff --git a/lib/pages/wallet_view/sub_widgets/wallet_summary_info.dart b/lib/pages/wallet_view/sub_widgets/wallet_summary_info.dart
index 705792b63..c6d10e300 100644
--- a/lib/pages/wallet_view/sub_widgets/wallet_summary_info.dart
+++ b/lib/pages/wallet_view/sub_widgets/wallet_summary_info.dart
@@ -14,8 +14,8 @@ import 'package:stackduo/services/event_bus/global_event_bus.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/enums/wallet_balance_toggle_state.dart';
 import 'package:stackduo/utilities/text_styles.dart';
 
@@ -131,9 +131,7 @@ class _WalletSummaryInfoState extends ConsumerState<WalletSummaryInfo> {
               FittedBox(
                 fit: BoxFit.scaleDown,
                 child: SelectableText(
-                  "${balanceToShow.localizedStringAsFixed(
-                    locale: locale,
-                  )} ${coin.ticker}",
+                  ref.watch(pAmountFormatter(coin)).format(balanceToShow),
                   style: STextStyles.pageTitleH1(context).copyWith(
                     fontSize: 24,
                     color: Theme.of(context)
@@ -146,7 +144,7 @@ class _WalletSummaryInfoState extends ConsumerState<WalletSummaryInfo> {
                 Text(
                   "${(priceTuple.item1 * balanceToShow.decimal).toAmount(
                         fractionDigits: 2,
-                      ).localizedStringAsFixed(
+                      ).fiatString(
                         locale: locale,
                       )} $baseCurrency",
                   style: STextStyles.subtitle500(context).copyWith(
diff --git a/lib/pages/wallet_view/transaction_views/all_transactions_view.dart b/lib/pages/wallet_view/transaction_views/all_transactions_view.dart
index 7d486c40c..934d36ae6 100644
--- a/lib/pages/wallet_view/transaction_views/all_transactions_view.dart
+++ b/lib/pages/wallet_view/transaction_views/all_transactions_view.dart
@@ -14,6 +14,7 @@ import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/providers/ui/transaction_filter_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
@@ -941,9 +942,7 @@ class _DesktopTransactionCardRowState
                   builder: (_) {
                     final amount = _transaction.realAmount;
                     return Text(
-                      "$prefix${amount.localizedStringAsFixed(
-                        locale: locale,
-                      )} ${coin.ticker}",
+                      "$prefix${ref.watch(pAmountFormatter(coin)).format(amount)}",
                       style: STextStyles.desktopTextExtraExtraSmall(context)
                           .copyWith(
                         color: Theme.of(context)
@@ -965,7 +964,7 @@ class _DesktopTransactionCardRowState
                       return Text(
                         "$prefix${(amount.decimal * price).toAmount(
                               fractionDigits: 2,
-                            ).localizedStringAsFixed(
+                            ).fiatString(
                               locale: locale,
                             )} $baseCurrency",
                         style: STextStyles.desktopTextExtraExtraSmall(context),
diff --git a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart
index 326e0c4f2..04380421e 100644
--- a/lib/pages/wallet_view/transaction_views/transaction_details_view.dart
+++ b/lib/pages/wallet_view/transaction_views/transaction_details_view.dart
@@ -1,16 +1,20 @@
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:stackduo/models/isar/models/blockchain_data/transaction.dart';
 import 'package:stackduo/notifications/show_flush_bar.dart';
+import 'package:stackduo/pages/receive_view/addresses/address_details_view.dart';
 import 'package:stackduo/pages/wallet_view/sub_widgets/tx_icon.dart';
 import 'package:stackduo/pages/wallet_view/transaction_views/edit_note_view.dart';
 import 'package:stackduo/providers/global/address_book_service_provider.dart';
 import 'package:stackduo/providers/providers.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/block_explorers.dart';
 import 'package:stackduo/utilities/constants.dart';
@@ -18,7 +22,6 @@ import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/format.dart';
 import 'package:stackduo/utilities/logger.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
@@ -66,6 +69,7 @@ class _TransactionDetailsViewState
   late final String amountPrefix;
   late final String unit;
   late final bool isTokenTx;
+  late final dynamic? ethContract;
 
   bool showFeePending = false;
 
@@ -73,17 +77,33 @@ class _TransactionDetailsViewState
   void initState() {
     isDesktop = Util.isDesktop;
     _transaction = widget.transaction;
-    isTokenTx = false;
+    isTokenTx = _transaction.subType == TransactionSubType.ethToken;
     walletId = widget.walletId;
 
     coin = widget.coin;
     amount = _transaction.realAmount;
     fee = _transaction.fee.toAmountAsRaw(fractionDigits: coin.decimals);
 
+    // if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+    //     _transaction.subType == TransactionSubType.mint) {
+    //   amountPrefix = "";
+    // } else {
     amountPrefix = _transaction.type == TransactionType.outgoing ? "-" : "+";
+    // }
+
+    ethContract =
+        // isTokenTx
+        //     ? ref.read(mainDBProvider).getEthContractSync(_transaction.otherData!)
+        //     :
+        null;
 
-    unit = coin.ticker;
+    unit = /*isTokenTx ? ethContract!.symbol :*/ coin.ticker;
 
+    // if (coin == Coin.firo || coin == Coin.firoTestNet) {
+    //   showFeePending = true;
+    // } else {
+    //   showFeePending = false;
+    // }
     super.initState();
   }
 
@@ -92,18 +112,59 @@ class _TransactionDetailsViewState
     super.dispose();
   }
 
-  String whatIsIt(TransactionType type, int height) {
+  String whatIsIt(Transaction tx, int height) {
+    final type = tx.type;
+    // if (coin == Coin.firo || coin == Coin.firoTestNet) {
+    //   if (tx.subType == TransactionSubType.mint) {
+    //     if (tx.isConfirmed(height, coin.requiredConfirmations)) {
+    //       return "Minted";
+    //     } else {
+    //       return "Minting";
+    //     }
+    //   }
+    // }
+
+    // if (coin == Coin.epicCash) {
+    //   if (_transaction.isCancelled) {
+    //     return "Cancelled";
+    //   } else if (type == TransactionType.incoming) {
+    //     if (tx.isConfirmed(height, coin.requiredConfirmations)) {
+    //       return "Received";
+    //     } else {
+    //       if (_transaction.numberOfMessages == 1) {
+    //         return "Receiving (waiting for sender)";
+    //       } else if ((_transaction.numberOfMessages ?? 0) > 1) {
+    //         return "Receiving (waiting for confirmations)"; // TODO test if the sender still has to open again after the receiver has 2 messages present, ie. sender->receiver->sender->node (yes) vs. sender->receiver->node (no)
+    //       } else {
+    //         return "Receiving";
+    //       }
+    //     }
+    //   } else if (type == TransactionType.outgoing) {
+    //     if (tx.isConfirmed(height, coin.requiredConfirmations)) {
+    //       return "Sent (confirmed)";
+    //     } else {
+    //       if (_transaction.numberOfMessages == 1) {
+    //         return "Sending (waiting for receiver)";
+    //       } else if ((_transaction.numberOfMessages ?? 0) > 1) {
+    //         return "Sending (waiting for confirmations)";
+    //       } else {
+    //         return "Sending";
+    //       }
+    //     }
+    //   }
+    // }
+
     if (type == TransactionType.incoming) {
       // if (_transaction.isMinting) {
       //   return "Minting";
       // } else
-      if (_transaction.isConfirmed(height, coin.requiredConfirmations)) {
+      if (tx.isConfirmed(height, coin.requiredConfirmations)) {
         return "Received";
       } else {
         return "Receiving";
       }
     } else if (type == TransactionType.outgoing) {
-      if (_transaction.isConfirmed(height, coin.requiredConfirmations)) {
+      if (tx.isConfirmed(height, coin.requiredConfirmations)) {
         return "Sent";
       } else {
         return "Sending";
@@ -398,7 +459,7 @@ class _TransactionDetailsViewState
                                               _transaction.isCancelled
                                                   ? "Cancelled"
                                                   : whatIsIt(
-                                                      _transaction.type,
+                                                      _transaction,
                                                       currentHeight,
                                                     ),
                                               style:
@@ -413,13 +474,7 @@ class _TransactionDetailsViewState
                                             : CrossAxisAlignment.start,
                                         children: [
                                           SelectableText(
-                                            "$amountPrefix${amount.localizedStringAsFixed(
-                                              locale: ref.watch(
-                                                localeServiceChangeNotifierProvider
-                                                    .select((value) =>
-                                                        value.locale),
-                                              ),
-                                            )} $unit",
+                                            "$amountPrefix${ref.watch(pAmountFormatter(coin)).format(amount, ethContract: ethContract)}",
                                             style: isDesktop
                                                 ? STextStyles
                                                         .desktopTextExtraExtraSmall(
@@ -444,11 +499,18 @@ class _TransactionDetailsViewState
                                               "$amountPrefix${(amount.decimal * ref.watch(
                                                         priceAnd24hChangeNotifierProvider
                                                             .select((value) =>
+                                                                // isTokenTx
+                                                                //     ? value
+                                                                //         .getTokenPrice(
+                                                                //             _transaction
+                                                                //                 .otherData!)
+                                                                //         .item1
+                                                                //     :
                                                                 value
                                                                     .getPrice(
                                                                         coin)
                                                                     .item1),
-                                                      )).toAmount(fractionDigits: 2).localizedStringAsFixed(
+                                                      )).toAmount(fractionDigits: 2).fiatString(
                                                     locale: ref.watch(
                                                       localeServiceChangeNotifierProvider
                                                           .select(
@@ -510,7 +572,7 @@ class _TransactionDetailsViewState
                                     _transaction.isCancelled
                                         ? "Cancelled"
                                         : whatIsIt(
-                                            _transaction.type,
+                                            _transaction,
                                             currentHeight,
                                           ),
                                     style: isDesktop
@@ -534,21 +596,37 @@ class _TransactionDetailsViewState
                                 ],
                               ),
                             ),
-                            if (!((coin == Coin.monero) &&
+                            if (!((coin ==
+                                        Coin
+                                            .monero /* ||
+                                        coin == Coin.wownero*/
+                                    ) &&
                                     _transaction.type ==
-                                        TransactionType.outgoing) &&
-                                !(_transaction.subType ==
-                                    TransactionSubType.mint))
+                                        TransactionType.outgoing)
+                                // &&
+                                // !((coin == Coin.firo ||
+                                //         coin == Coin.firoTestNet) &&
+                                //     _transaction.subType ==
+                                //         TransactionSubType.mint)
+                                )
                               isDesktop
                                   ? const _Divider()
                                   : const SizedBox(
                                       height: 12,
                                     ),
-                            if (!((coin == Coin.monero) &&
+                            if (!((coin ==
+                                        Coin
+                                            .monero /*||
+                                        coin == Coin.wownero*/
+                                    ) &&
                                     _transaction.type ==
-                                        TransactionType.outgoing) &&
-                                !(_transaction.subType ==
-                                    TransactionSubType.mint))
+                                        TransactionType.outgoing)
+                                // &&
+                                // !((coin == Coin.firo ||
+                                //         coin == Coin.firoTestNet) &&
+                                //     _transaction.subType ==
+                                //         TransactionSubType.mint)
+                                )
                               RoundedWhiteContainer(
                                 padding: isDesktop
                                     ? const EdgeInsets.all(16)
@@ -563,17 +641,66 @@ class _TransactionDetailsViewState
                                         crossAxisAlignment:
                                             CrossAxisAlignment.start,
                                         children: [
-                                          Text(
-                                            _transaction.type ==
-                                                    TransactionType.outgoing
-                                                ? "Sent to"
-                                                : "Receiving address",
-                                            style: isDesktop
-                                                ? STextStyles
-                                                    .desktopTextExtraExtraSmall(
-                                                        context)
-                                                : STextStyles.itemSubtitle(
-                                                    context),
+                                          ConditionalParent(
+                                            condition: kDebugMode,
+                                            builder: (child) {
+                                              return Row(
+                                                mainAxisAlignment:
+                                                    MainAxisAlignment
+                                                        .spaceBetween,
+                                                children: [
+                                                  child,
+                                                  CustomTextButton(
+                                                    text: "Info",
+                                                    onTap: () {
+                                                      if (isDesktop) {
+                                                        showDialog<void>(
+                                                          context: context,
+                                                          builder: (_) =>
+                                                              DesktopDialog(
+                                                            maxHeight:
+                                                                double.infinity,
+                                                            child:
+                                                                AddressDetailsView(
+                                                              addressId:
+                                                                  _transaction
+                                                                      .address
+                                                                      .value!
+                                                                      .id,
+                                                              walletId: widget
+                                                                  .walletId,
+                                                            ),
+                                                          ),
+                                                        );
+                                                      } else {
+                                                        Navigator.of(context)
+                                                            .pushNamed(
+                                                          AddressDetailsView
+                                                              .routeName,
+                                                          arguments: Tuple2(
+                                                            _transaction.address
+                                                                .value!.id,
+                                                            widget.walletId,
+                                                          ),
+                                                        );
+                                                      }
+                                                    },
+                                                  )
+                                                ],
+                                              );
+                                            },
+                                            child: Text(
+                                              _transaction.type ==
+                                                      TransactionType.outgoing
+                                                  ? "Sent to"
+                                                  : "Receiving address",
+                                              style: isDesktop
+                                                  ? STextStyles
+                                                      .desktopTextExtraExtraSmall(
+                                                          context)
+                                                  : STextStyles.itemSubtitle(
+                                                      context),
+                                            ),
                                           ),
                                           const SizedBox(
                                             height: 8,
@@ -833,11 +960,13 @@ class _TransactionDetailsViewState
                                 ],
                               ),
                             ),
+                            // if (coin != Coin.banano && coin != Coin.nano)
                             isDesktop
                                 ? const _Divider()
                                 : const SizedBox(
                                     height: 12,
                                   ),
+                            // if (coin != Coin.banano && coin != Coin.nano)
                             RoundedWhiteContainer(
                               padding: isDesktop
                                   ? const EdgeInsets.all(16)
@@ -848,23 +977,17 @@ class _TransactionDetailsViewState
                                         currentHeight,
                                         coin.requiredConfirmations,
                                       )
-                                        ? fee.localizedStringAsFixed(
-                                            locale: ref.watch(
-                                              localeServiceChangeNotifierProvider
-                                                  .select(
-                                                      (value) => value.locale),
-                                            ),
-                                          )
+                                        ? ref
+                                            .watch(pAmountFormatter(coin))
+                                            .format(
+                                              fee,
+                                              withUnitName: isTokenTx,
+                                            )
                                         : "Pending"
-                                    : fee.localizedStringAsFixed(
-                                        locale: ref.watch(
-                                          localeServiceChangeNotifierProvider
-                                              .select((value) => value.locale),
-                                        ),
-                                      );
-                                if (isTokenTx) {
-                                  feeString += " ${coin.ticker}";
-                                }
+                                    : ref.watch(pAmountFormatter(coin)).format(
+                                          fee,
+                                          withUnitName: isTokenTx,
+                                        );
 
                                 return Row(
                                   mainAxisAlignment:
@@ -937,16 +1060,28 @@ class _TransactionDetailsViewState
                                   ? const EdgeInsets.all(16)
                                   : const EdgeInsets.all(12),
                               child: Builder(builder: (context) {
-                                final height = _transaction.isConfirmed(
-                                  currentHeight,
-                                  coin.requiredConfirmations,
-                                )
-                                    ? "${_transaction.height == 0 ? "Unknown" : _transaction.height}"
-                                    : _transaction.getConfirmations(
+                                final String height;
+
+                                // if (widget.coin == Coin.bitcoincash ||
+                                //     widget.coin == Coin.eCash ||
+                                //     widget.coin == Coin.bitcoincashTestnet) {
+                                //   height =
+                                //       "${_transaction.height != null && _transaction.height! > 0 ? _transaction.height! : "Pending"}";
+                                // } else {
+                                height =
+                                    // widget.coin != Coin.epicCash &&
+                                    //         _transaction.isConfirmed(
+                                    //           currentHeight,
+                                    //           coin.requiredConfirmations,
+                                    //         )
+                                    //     ? "${_transaction.height == 0 ? "Unknown" : _transaction.height}"
+                                    //     :
+                                    _transaction.getConfirmations(
                                                 currentHeight) >
                                             0
                                         ? "${_transaction.height}"
                                         : "Pending";
+                                // }
 
                                 return Row(
                                   mainAxisAlignment:
@@ -1008,6 +1143,86 @@ class _TransactionDetailsViewState
                                 );
                               }),
                             ),
+                            // if (coin == Coin.ethereum)
+                            //   isDesktop
+                            //       ? const _Divider()
+                            //       : const SizedBox(
+                            //           height: 12,
+                            //         ),
+                            // if (coin == Coin.ethereum)
+                            //   RoundedWhiteContainer(
+                            //     padding: isDesktop
+                            //         ? const EdgeInsets.all(16)
+                            //         : const EdgeInsets.all(12),
+                            //     child: Row(
+                            //       crossAxisAlignment: CrossAxisAlignment.start,
+                            //       mainAxisAlignment:
+                            //           MainAxisAlignment.spaceBetween,
+                            //       children: [
+                            //         Text(
+                            //           "Nonce",
+                            //           style: isDesktop
+                            //               ? STextStyles
+                            //                   .desktopTextExtraExtraSmall(
+                            //                       context)
+                            //               : STextStyles.itemSubtitle(context),
+                            //         ),
+                            //         SelectableText(
+                            //           _transaction.nonce.toString(),
+                            //           style: isDesktop
+                            //               ? STextStyles
+                            //                       .desktopTextExtraExtraSmall(
+                            //                           context)
+                            //                   .copyWith(
+                            //                   color: Theme.of(context)
+                            //                       .extension<StackColors>()!
+                            //                       .textDark,
+                            //                 )
+                            //               : STextStyles.itemSubtitle12(context),
+                            //         ),
+                            //       ],
+                            //     ),
+                            //   ),
+                            if (kDebugMode)
+                              isDesktop
+                                  ? const _Divider()
+                                  : const SizedBox(
+                                      height: 12,
+                                    ),
+                            if (kDebugMode)
+                              RoundedWhiteContainer(
+                                padding: isDesktop
+                                    ? const EdgeInsets.all(16)
+                                    : const EdgeInsets.all(12),
+                                child: Row(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Text(
+                                      "Tx sub type",
+                                      style: isDesktop
+                                          ? STextStyles
+                                              .desktopTextExtraExtraSmall(
+                                                  context)
+                                          : STextStyles.itemSubtitle(context),
+                                    ),
+                                    SelectableText(
+                                      _transaction.subType.toString(),
+                                      style: isDesktop
+                                          ? STextStyles
+                                                  .desktopTextExtraExtraSmall(
+                                                      context)
+                                              .copyWith(
+                                              color: Theme.of(context)
+                                                  .extension<StackColors>()!
+                                                  .textDark,
+                                            )
+                                          : STextStyles.itemSubtitle12(context),
+                                    ),
+                                  ],
+                                ),
+                              ),
                             isDesktop
                                 ? const _Divider()
                                 : const SizedBox(
@@ -1057,11 +1272,11 @@ class _TransactionDetailsViewState
                                               : STextStyles.itemSubtitle12(
                                                   context),
                                         ),
-                                        //   ),
-                                        // ),
+                                        // if (coin != Coin.epicCash)
                                         const SizedBox(
                                           height: 8,
                                         ),
+                                        // if (coin != Coin.epicCash)
                                         CustomTextButton(
                                           text: "Open in block explorer",
                                           onTap: () async {
@@ -1123,6 +1338,8 @@ class _TransactionDetailsViewState
                                             }
                                           },
                                         ),
+                                        //   ),
+                                        // ),
                                       ],
                                     ),
                                   ),
diff --git a/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart b/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart
index 48795142d..466a726a0 100644
--- a/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart
+++ b/lib/pages/wallet_view/transaction_views/transaction_search_filter_view.dart
@@ -1,6 +1,5 @@
 import 'package:decimal/decimal.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_rounded_date_picker/flutter_rounded_date_picker.dart';
 import 'package:flutter_svg/svg.dart';
@@ -10,6 +9,8 @@ import 'package:stackduo/providers/ui/transaction_filter_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/themes/theme_providers.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
+import 'package:stackduo/utilities/amount/amount_input_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
@@ -76,11 +77,12 @@ class _TransactionSearchViewState
       _toDateString =
           _selectedToDate == null ? "" : Format.formatDate(_selectedToDate!);
 
-      final String amount = filterState.amount?.localizedStringAsFixed(
-            locale: ref.read(localeServiceChangeNotifierProvider).locale,
-            decimalPlaces: widget.coin.decimals,
-          ) ??
-          "";
+      final String amount = filterState.amount == null
+          ? ""
+          : ref.read(pAmountFormatter(widget.coin)).format(
+                filterState.amount!,
+                withUnitName: false,
+              );
 
       _amountTextEditingController.text = amount;
     }
@@ -746,12 +748,20 @@ class _TransactionSearchViewState
                       decimal: true,
                     ),
               inputFormatters: [
-                // regex to validate a crypto amount with 8 decimal places
-                TextInputFormatter.withFunction((oldValue, newValue) =>
-                    RegExp(r'^([0-9]*[,.]?[0-9]{0,8}|[,.][0-9]{0,8})$')
-                            .hasMatch(newValue.text)
-                        ? newValue
-                        : oldValue),
+                AmountInputFormatter(
+                  decimals: widget.coin.decimals,
+                  unit: ref.watch(pAmountUnit(widget.coin)),
+                  locale: ref.watch(
+                    localeServiceChangeNotifierProvider
+                        .select((value) => value.locale),
+                  ),
+                ),
+                // // regex to validate a crypto amount with 8 decimal places
+                // TextInputFormatter.withFunction((oldValue, newValue) =>
+                //     RegExp(r'^([0-9]*[,.]?[0-9]{0,8}|[,.][0-9]{0,8})$')
+                //             .hasMatch(newValue.text)
+                //         ? newValue
+                //         : oldValue),
               ],
               style: isDesktop
                   ? STextStyles.desktopTextExtraSmall(context).copyWith(
diff --git a/lib/pages/wallet_view/wallet_view.dart b/lib/pages/wallet_view/wallet_view.dart
index 792742fd4..124c28c59 100644
--- a/lib/pages/wallet_view/wallet_view.dart
+++ b/lib/pages/wallet_view/wallet_view.dart
@@ -572,7 +572,7 @@ class _WalletViewState extends ConsumerState<WalletView> {
                             padding: const EdgeInsets.symmetric(horizontal: 16),
                             child: WalletSummary(
                               walletId: walletId,
-                              managerProvider: managerProvider,
+                              aspectRatio: 1.75,
                               initialSyncStatus: ref.watch(managerProvider
                                       .select((value) => value.isRefreshing))
                                   ? WalletSyncStatus.syncing
@@ -678,15 +678,11 @@ class _WalletViewState extends ConsumerState<WalletView> {
                     label: "Receive",
                     icon: const ReceiveNavIcon(),
                     onTap: () {
-                      final coin = ref.read(managerProvider).coin;
                       if (mounted) {
                         unawaited(
                           Navigator.of(context).pushNamed(
                             ReceiveView.routeName,
-                            arguments: Tuple2(
-                              walletId,
-                              coin,
-                            ),
+                            arguments: walletId,
                           ),
                         );
                       }
diff --git a/lib/pages/wallets_view/sub_widgets/favorite_card.dart b/lib/pages/wallets_view/sub_widgets/favorite_card.dart
index 2f8c6de2a..629ad62d5 100644
--- a/lib/pages/wallets_view/sub_widgets/favorite_card.dart
+++ b/lib/pages/wallets_view/sub_widgets/favorite_card.dart
@@ -9,11 +9,12 @@ import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/assets.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
 import 'package:stackduo/utilities/util.dart';
+import 'package:stackduo/widgets/coin_card.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
 import 'package:tuple/tuple.dart';
 
@@ -133,66 +134,10 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
           width: widget.width,
           height: widget.height,
           child: CardOverlayStack(
-            background: Stack(
-              children: [
-                Container(
-                  width: widget.width,
-                  height: widget.height,
-                  decoration: BoxDecoration(
-                    color: Theme.of(context)
-                        .extension<StackColors>()!
-                        .colorForCoin(coin),
-                    borderRadius: BorderRadius.circular(
-                      Constants.size.circularBorderRadius,
-                    ),
-                  ),
-                ),
-                Column(
-                  children: [
-                    const Spacer(),
-                    SizedBox(
-                      height: widget.width * 0.3,
-                      child: Row(
-                        children: [
-                          const Spacer(
-                            flex: 9,
-                          ),
-                          SvgPicture.asset(
-                            Assets.svg.ellipse2,
-                            height: widget.width * 0.3,
-                          ),
-                          // ),
-                          const Spacer(
-                            flex: 2,
-                          ),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-                Row(
-                  children: [
-                    const Spacer(
-                      flex: 5,
-                    ),
-                    SizedBox(
-                      width: widget.width * 0.45,
-                      child: Column(
-                        children: [
-                          SvgPicture.asset(
-                            Assets.svg.ellipse1,
-                            width: widget.width * 0.45,
-                          ),
-                          const Spacer(),
-                        ],
-                      ),
-                    ),
-                    const Spacer(
-                      flex: 1,
-                    ),
-                  ],
-                ),
-              ],
+            background: CoinCard(
+              walletId: widget.walletId,
+              width: widget.width,
+              height: widget.height,
             ),
             child: Padding(
               padding: const EdgeInsets.all(12.0),
@@ -260,14 +205,7 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
                           FittedBox(
                             fit: BoxFit.scaleDown,
                             child: Text(
-                              "${total.localizedStringAsFixed(
-                                locale: ref.watch(
-                                  localeServiceChangeNotifierProvider.select(
-                                    (value) => value.locale,
-                                  ),
-                                ),
-                                decimalPlaces: coin.decimals,
-                              )} ${coin.ticker}",
+                              ref.watch(pAmountFormatter(coin)).format(total),
                               style: STextStyles.titleBold12(context).copyWith(
                                 fontSize: 16,
                                 color: Theme.of(context)
@@ -282,13 +220,12 @@ class _FavoriteCardState extends ConsumerState<FavoriteCard> {
                             ),
                           if (externalCalls)
                             Text(
-                              "${fiatTotal.localizedStringAsFixed(
+                              "${fiatTotal.fiatString(
                                 locale: ref.watch(
                                   localeServiceChangeNotifierProvider.select(
                                     (value) => value.locale,
                                   ),
                                 ),
-                                decimalPlaces: 2,
                               )} ${ref.watch(
                                 prefsChangeNotifierProvider.select(
                                   (value) => value.currency,
diff --git a/lib/pages/wallets_view/sub_widgets/wallet_list_item.dart b/lib/pages/wallets_view/sub_widgets/wallet_list_item.dart
index b28010bb8..971e17fb4 100644
--- a/lib/pages/wallets_view/sub_widgets/wallet_list_item.dart
+++ b/lib/pages/wallets_view/sub_widgets/wallet_list_item.dart
@@ -98,12 +98,12 @@ class WalletListItem extends ConsumerWidget {
                   final calls =
                       ref.watch(prefsChangeNotifierProvider).externalCalls;
 
-                  final priceString = tuple.item1
-                      .toAmount(fractionDigits: 2)
-                      .localizedStringAsFixed(
-                        locale: ref.watch(localeServiceChangeNotifierProvider
-                            .select((value) => value.locale)),
-                      );
+                  final priceString =
+                      tuple.item1.toAmount(fractionDigits: 2).fiatString(
+                            locale: ref.watch(
+                                localeServiceChangeNotifierProvider
+                                    .select((value) => value.locale)),
+                          );
 
                   final double percentChange = tuple.item2;
 
diff --git a/lib/pages/wallets_view/wallets_overview.dart b/lib/pages/wallets_view/wallets_overview.dart
index 92194af35..2ae47352a 100644
--- a/lib/pages/wallets_view/wallets_overview.dart
+++ b/lib/pages/wallets_view/wallets_overview.dart
@@ -1,19 +1,22 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:stackduo/models/add_wallet_list_entity/sub_classes/coin_entity.dart';
 import 'package:stackduo/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart';
+import 'package:stackduo/pages_desktop_specific/my_stack_view/dialogs/desktop_expanding_wallet_card.dart';
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/services/coins/manager.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/background.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackduo/widgets/icon_widgets/x_icon.dart';
+import 'package:stackduo/widgets/master_wallet_card.dart';
 import 'package:stackduo/widgets/rounded_white_container.dart';
 import 'package:stackduo/widgets/stack_text_field.dart';
 import 'package:stackduo/widgets/textfield_icon_button.dart';
@@ -170,7 +173,7 @@ class _EthWalletsOverviewState extends ConsumerState<WalletsOverview> {
                   onPressed: () {
                     Navigator.of(context).pushNamed(
                       CreateOrRestoreWalletView.routeName,
-                      arguments: widget.coin,
+                      arguments: CoinEntity(widget.coin),
                     );
                   },
                 ),
@@ -260,40 +263,40 @@ class _EthWalletsOverviewState extends ConsumerState<WalletsOverview> {
                   itemBuilder: (_, index) {
                     final element = data[index];
 
-                    // if (element.item1.hasTokenSupport) {
-                    //   if (isDesktop) {
-                    //     return DesktopExpandingWalletCard(
-                    //       key: Key(
-                    //           "${element.item1.walletName}_${element.item2.map((e) => e.address).join()}"),
-                    //       data: element,
-                    //       navigatorState: widget.navigatorState!,
-                    //     );
-                    //   } else {
-                    //     return MasterWalletCard(
-                    //       walletId: element.item1.walletId,
-                    //     );
-                    //   }
-                    // } else {
-                    return ConditionalParent(
-                      condition: isDesktop,
-                      builder: (child) => RoundedWhiteContainer(
-                        padding: const EdgeInsets.symmetric(
-                          vertical: 14,
-                          horizontal: 20,
+                    if (element.item1.hasTokenSupport) {
+                      if (isDesktop) {
+                        return DesktopExpandingWalletCard(
+                          key: Key(
+                              "${element.item1.walletName}_${element.item2.map((e) => e.address).join()}"),
+                          data: element,
+                          navigatorState: widget.navigatorState!,
+                        );
+                      } else {
+                        return MasterWalletCard(
+                          walletId: element.item1.walletId,
+                        );
+                      }
+                    } else {
+                      return ConditionalParent(
+                        condition: isDesktop,
+                        builder: (child) => RoundedWhiteContainer(
+                          padding: const EdgeInsets.symmetric(
+                            vertical: 14,
+                            horizontal: 20,
+                          ),
+                          borderColor: Theme.of(context)
+                              .extension<StackColors>()!
+                              .backgroundAppBar,
+                          child: child,
                         ),
-                        borderColor: Theme.of(context)
-                            .extension<StackColors>()!
-                            .backgroundAppBar,
-                        child: child,
-                      ),
-                      child: SimpleWalletCard(
-                        walletId: element.item1.walletId,
-                        popPrevious: isDesktop,
-                        desktopNavigatorState:
-                            isDesktop ? widget.navigatorState : null,
-                      ),
-                    );
-                    // }
+                        child: SimpleWalletCard(
+                          walletId: element.item1.walletId,
+                          popPrevious: isDesktop,
+                          desktopNavigatorState:
+                              isDesktop ? widget.navigatorState : null,
+                        ),
+                      );
+                    }
                   },
                   separatorBuilder: (_, __) => SizedBox(
                     height: isDesktop ? 10 : 8,
diff --git a/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart b/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart
index a81284895..b5f34f857 100644
--- a/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart
+++ b/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/contact_entry.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
 import 'package:stackduo/pages/address_book_views/subviews/add_new_contact_address_view.dart';
diff --git a/lib/pages_desktop_specific/coin_control/desktop_coin_control_use_dialog.dart b/lib/pages_desktop_specific/coin_control/desktop_coin_control_use_dialog.dart
index b66d5758c..b475dca83 100644
--- a/lib/pages_desktop_specific/coin_control/desktop_coin_control_use_dialog.dart
+++ b/lib/pages_desktop_specific/coin_control/desktop_coin_control_use_dialog.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/blockchain_data/utxo.dart';
 import 'package:stackduo/pages_desktop_specific/coin_control/utxo_row.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
diff --git a/lib/pages_desktop_specific/coin_control/desktop_coin_control_view.dart b/lib/pages_desktop_specific/coin_control/desktop_coin_control_view.dart
index bfda3654f..a57246cb0 100644
--- a/lib/pages_desktop_specific/coin_control/desktop_coin_control_view.dart
+++ b/lib/pages_desktop_specific/coin_control/desktop_coin_control_view.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/blockchain_data/utxo.dart';
 import 'package:stackduo/pages_desktop_specific/coin_control/freeze_button.dart';
 import 'package:stackduo/pages_desktop_specific/coin_control/utxo_row.dart';
diff --git a/lib/pages_desktop_specific/coin_control/freeze_button.dart b/lib/pages_desktop_specific/coin_control/freeze_button.dart
index 21b3ba11e..5c79d881e 100644
--- a/lib/pages_desktop_specific/coin_control/freeze_button.dart
+++ b/lib/pages_desktop_specific/coin_control/freeze_button.dart
@@ -1,7 +1,7 @@
 import 'package:async/async.dart';
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/blockchain_data/utxo.dart';
 import 'package:stackduo/pages_desktop_specific/coin_control/utxo_row.dart';
 import 'package:stackduo/utilities/logger.dart';
diff --git a/lib/pages_desktop_specific/coin_control/utxo_row.dart b/lib/pages_desktop_specific/coin_control/utxo_row.dart
index fce3bb710..426327d83 100644
--- a/lib/pages_desktop_specific/coin_control/utxo_row.dart
+++ b/lib/pages_desktop_specific/coin_control/utxo_row.dart
@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
 import 'package:stackduo/pages/coin_control/utxo_details_view.dart';
-import 'package:stackduo/providers/global/locale_provider.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/conditional_parent.dart';
 import 'package:stackduo/widgets/custom_buttons/blue_text_button.dart';
 import 'package:stackduo/widgets/desktop/secondary_button.dart';
@@ -144,16 +144,12 @@ class _UtxoRowState extends ConsumerState<UtxoRow> {
               ),
               if (!widget.compact)
                 Text(
-                  "${Amount(
-                    rawValue: BigInt.from(utxo.value),
-                    fractionDigits: coin.decimals,
-                  ).localizedStringAsFixed(
-                    locale: ref.watch(
-                      localeServiceChangeNotifierProvider.select(
-                        (value) => value.locale,
+                  ref.watch(pAmountFormatter(coin)).format(
+                        Amount(
+                          rawValue: BigInt.from(utxo.value),
+                          fractionDigits: coin.decimals,
+                        ),
                       ),
-                    ),
-                  )} ${coin.ticker}",
                   textAlign: TextAlign.right,
                   style: STextStyles.w600_14(context),
                 ),
@@ -170,16 +166,12 @@ class _UtxoRowState extends ConsumerState<UtxoRow> {
                       mainAxisSize: MainAxisSize.min,
                       children: [
                         Text(
-                          "${Amount(
-                            rawValue: BigInt.from(utxo.value),
-                            fractionDigits: coin.decimals,
-                          ).localizedStringAsFixed(
-                            locale: ref.watch(
-                              localeServiceChangeNotifierProvider.select(
-                                (value) => value.locale,
+                          ref.watch(pAmountFormatter(coin)).format(
+                                Amount(
+                                  rawValue: BigInt.from(utxo.value),
+                                  fractionDigits: coin.decimals,
+                                ),
                               ),
-                            ),
-                          )} ${coin.ticker}",
                           textAlign: TextAlign.right,
                           style: STextStyles.w600_14(context),
                         ),
diff --git a/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart b/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart
index 9c411ddf3..e4fc11709 100644
--- a/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart
+++ b/lib/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/exchange/change_now/exchange_transaction_status.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart';
diff --git a/lib/pages_desktop_specific/desktop_exchange/exchange_steps/step_scaffold.dart b/lib/pages_desktop_specific/desktop_exchange/exchange_steps/step_scaffold.dart
index 768f19b19..d176b210b 100644
--- a/lib/pages_desktop_specific/desktop_exchange/exchange_steps/step_scaffold.dart
+++ b/lib/pages_desktop_specific/desktop_exchange/exchange_steps/step_scaffold.dart
@@ -374,7 +374,7 @@ class _StepScaffoldState extends ConsumerState<StepScaffold> {
                                   height: 48,
                                 ),
                                 Center(
-                                  child: QrImage(
+                                  child: QrImageView(
                                     // TODO: grab coin uri scheme from somewhere
                                     // data: "${coin.uriScheme}:$receivingAddress",
                                     data: ref.watch(desktopExchangeModelProvider
diff --git a/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart b/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
index 6c60a6c29..0ea21f721 100644
--- a/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
+++ b/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_choose_from_stack.dart
@@ -2,12 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:stackduo/providers/providers.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/custom_buttons/blue_text_button.dart';
 import 'package:stackduo/widgets/desktop/secondary_button.dart';
 import 'package:stackduo/widgets/icon_widgets/x_icon.dart';
@@ -278,14 +279,11 @@ class _BalanceDisplay extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final manager = ref.watch(walletsChangeNotifierProvider
         .select((value) => value.getManager(walletId)));
-    final locale = ref.watch(
-        localeServiceChangeNotifierProvider.select((value) => value.locale));
 
     final Amount total = manager.balance.total;
 
     return Text(
-      "${total.localizedStringAsFixed(locale: locale)} "
-      "${manager.coin.ticker}",
+      ref.watch(pAmountFormatter(manager.coin)).format(total),
       style: STextStyles.desktopTextExtraSmall(context).copyWith(
         color: Theme.of(context).extension<StackColors>()!.textSubtitle1,
       ),
diff --git a/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_trade_history.dart b/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_trade_history.dart
index 712426990..69f9e8ee5 100644
--- a/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_trade_history.dart
+++ b/lib/pages_desktop_specific/desktop_exchange/subwidgets/desktop_trade_history.dart
@@ -5,21 +5,19 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:isar/isar.dart';
 import 'package:stackduo/models/isar/models/blockchain_data/transaction.dart';
 import 'package:stackduo/pages/exchange_view/trade_details_view.dart';
-import 'package:stackduo/pages_desktop_specific/desktop_exchange/desktop_all_trades_view.dart';
 import 'package:stackduo/providers/exchange/trade_sent_from_stack_lookup_provider.dart';
 import 'package:stackduo/providers/global/trades_service_provider.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
 import 'package:stackduo/route_generator.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
-import 'package:stackduo/widgets/custom_buttons/blue_text_button.dart';
 import 'package:stackduo/widgets/desktop/desktop_dialog.dart';
 import 'package:stackduo/widgets/desktop/desktop_dialog_close_button.dart';
 import 'package:stackduo/widgets/rounded_white_container.dart';
 import 'package:stackduo/widgets/trade_card.dart';
 
-import '../../../db/main_db.dart';
+import '../../../db/isar/main_db.dart';
 
 class DesktopTradeHistory extends ConsumerStatefulWidget {
   const DesktopTradeHistory({Key? key}) : super(key: key);
diff --git a/lib/pages_desktop_specific/my_stack_view/paynym/desktop_paynym_send_dialog.dart b/lib/pages_desktop_specific/my_stack_view/paynym/desktop_paynym_send_dialog.dart
index 6501d57bd..7fc2aef69 100644
--- a/lib/pages_desktop_specific/my_stack_view/paynym/desktop_paynym_send_dialog.dart
+++ b/lib/pages_desktop_specific/my_stack_view/paynym/desktop_paynym_send_dialog.dart
@@ -13,6 +13,7 @@ import 'package:stackduo/providers/global/wallets_provider.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/barcode_scanner_interface.dart';
 import 'package:stackduo/utilities/clipboard_interface.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
@@ -118,9 +119,26 @@ class _DesktopPaynymSendDialogState
                       crossAxisAlignment: CrossAxisAlignment.end,
                       children: [
                         Text(
-                          "${manager.balance.spendable.localizedStringAsFixed(
-                            locale: locale,
-                          )} ${coin.ticker}",
+                          // !isFiro
+                          //     ?
+                          ref
+                              .watch(pAmountFormatter(coin))
+                              .format(manager.balance.spendable)
+                          // : ref
+                          //             .watch(
+                          //               publicPrivateBalanceStateProvider
+                          //                   .state,
+                          //             )
+                          //             .state ==
+                          //         "Private"
+                          //     ? ref.watch(pAmountFormatter(coin)).format(
+                          //         (manager.wallet as FiroWallet)
+                          //             .availablePrivateBalance())
+                          //     : ref.watch(pAmountFormatter(coin)).format(
+                          //           (manager.wallet as FiroWallet)
+                          //               .availablePublicBalance(),
+                          //         )
+                          ,
                           style: STextStyles.titleBold12(context),
                           textAlign: TextAlign.right,
                         ),
@@ -128,19 +146,15 @@ class _DesktopPaynymSendDialogState
                           height: 2,
                         ),
                         Text(
-                          "${(manager.balance.spendable.decimal * ref.watch(
+                          "${((/*!isFiro ?*/ manager.balance.spendable.decimal /*: ref.watch(publicPrivateBalanceStateProvider.state).state == "Private" ? (manager.wallet as FiroWallet).availablePrivateBalance().decimal : (manager.wallet as FiroWallet).availablePublicBalance().decimal*/) * ref.watch(
                                     priceAnd24hChangeNotifierProvider.select(
                                       (value) => value.getPrice(coin).item1,
                                     ),
-                                  )).toAmount(
-                                fractionDigits: 2,
-                              ).localizedStringAsFixed(
+                                  )).toAmount(fractionDigits: 2).fiatString(
                                 locale: locale,
-                              )} ${ref.watch(
-                            prefsChangeNotifierProvider.select(
-                              (value) => value.currency,
-                            ),
-                          )}",
+                              )} ${ref.watch(prefsChangeNotifierProvider.select(
+                            (value) => value.currency,
+                          ))}",
                           style: STextStyles.baseXS(context).copyWith(
                             color: Theme.of(context)
                                 .extension<StackColors>()!
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_summary_table.dart b/lib/pages_desktop_specific/my_stack_view/wallet_summary_table.dart
index aa26b837d..58470932c 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_summary_table.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_summary_table.dart
@@ -214,13 +214,12 @@ class TablePriceInfo extends ConsumerWidget {
     final priceString = Amount.fromDecimal(
       tuple.item1,
       fractionDigits: 2,
-    ).localizedStringAsFixed(
+    ).fiatString(
       locale: ref
           .watch(
             localeServiceChangeNotifierProvider.notifier,
           )
           .locale,
-      decimalPlaces: 2,
     );
 
     final double percentChange = tuple.item2;
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_fee_dropdown.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_fee_dropdown.dart
index 9cb346724..c57032014 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_fee_dropdown.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_fee_dropdown.dart
@@ -7,22 +7,25 @@ import 'package:stackduo/models/models.dart';
 import 'package:stackduo/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
 import 'package:stackduo/providers/ui/fee_rate_type_state_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/enums/fee_rate_type_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/animated_text.dart';
 
 class DesktopFeeDropDown extends ConsumerStatefulWidget {
   const DesktopFeeDropDown({
     Key? key,
     required this.walletId,
+    this.isToken = false,
   }) : super(key: key);
 
   final String walletId;
+  final bool isToken;
 
   @override
   ConsumerState<DesktopFeeDropDown> createState() => _DesktopFeeDropDownState();
@@ -49,55 +52,114 @@ class _DesktopFeeDropDownState extends ConsumerState<DesktopFeeDropDown> {
   }) async {
     switch (feeRateType) {
       case FeeRateType.fast:
-        if (ref.read(feeSheetSessionCacheProvider).fast[amount] == null) {
+        if (ref.read(
+            // widget.isToken
+            //         ? tokenFeeSessionCacheProvider
+            //         :
+            feeSheetSessionCacheProvider).fast[amount] == null) {
+          // if (widget.isToken == false) {
           final manager =
               ref.read(walletsChangeNotifierProvider).getManager(walletId);
 
-          if (coin == Coin.monero) {
+          if (coin == Coin.monero /*|| coin == Coin.wownero*/) {
             final fee = await manager.estimateFeeFor(
                 amount, MoneroTransactionPriority.fast.raw!);
             ref.read(feeSheetSessionCacheProvider).fast[amount] = fee;
+            // } else if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+            //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+            //         "Private") {
+            //   ref.read(feeSheetSessionCacheProvider).fast[amount] =
+            //       await (manager.wallet as FiroWallet)
+            //           .estimateFeeForPublic(amount, feeRate);
           } else {
             ref.read(feeSheetSessionCacheProvider).fast[amount] =
                 await manager.estimateFeeFor(amount, feeRate);
           }
+          // } else {
+          //   final tokenWallet = ref.read(tokenServiceProvider)!;
+          //   final fee = tokenWallet.estimateFeeFor(feeRate);
+          //   ref.read(tokenFeeSessionCacheProvider).fast[amount] = fee;
+          // }
         }
-
-        return ref.read(feeSheetSessionCacheProvider).fast[amount]!;
+        return ref.read(
+            // widget.isToken
+            //     ? tokenFeeSessionCacheProvider
+            //     :
+            feeSheetSessionCacheProvider).fast[amount]!;
 
       case FeeRateType.average:
-        if (ref.read(feeSheetSessionCacheProvider).average[amount] == null) {
+        if (ref.read(
+            // widget.isToken
+            //         ? tokenFeeSessionCacheProvider
+            //         :
+            feeSheetSessionCacheProvider).average[amount] == null) {
+          // if (widget.isToken == false) {
           final manager =
               ref.read(walletsChangeNotifierProvider).getManager(walletId);
 
-          if (coin == Coin.monero) {
+          if (coin == Coin.monero /*|| coin == Coin.wownero*/) {
             final fee = await manager.estimateFeeFor(
                 amount, MoneroTransactionPriority.regular.raw!);
             ref.read(feeSheetSessionCacheProvider).average[amount] = fee;
+            // } else if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+            //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+            //         "Private") {
+            //   ref.read(feeSheetSessionCacheProvider).average[amount] =
+            //       await (manager.wallet as FiroWallet)
+            //           .estimateFeeForPublic(amount, feeRate);
           } else {
             ref.read(feeSheetSessionCacheProvider).average[amount] =
                 await manager.estimateFeeFor(amount, feeRate);
           }
+          // } else {
+          //   final tokenWallet = ref.read(tokenServiceProvider)!;
+          //   final fee = tokenWallet.estimateFeeFor(feeRate);
+          //   ref.read(tokenFeeSessionCacheProvider).average[amount] = fee;
+          // }
         }
-
-        return ref.read(feeSheetSessionCacheProvider).average[amount]!;
+        return ref.read(
+            // widget.isToken
+            //     ? tokenFeeSessionCacheProvider
+            //     :
+            feeSheetSessionCacheProvider).average[amount]!;
 
       case FeeRateType.slow:
-        if (ref.read(feeSheetSessionCacheProvider).slow[amount] == null) {
+        if (ref.read(
+            // widget.isToken
+            //         ? tokenFeeSessionCacheProvider
+            //         :
+            feeSheetSessionCacheProvider).slow[amount] == null) {
+          // if (widget.isToken == false) {
           final manager =
               ref.read(walletsChangeNotifierProvider).getManager(walletId);
 
-          if (coin == Coin.monero) {
+          if (coin == Coin.monero /*|| coin == Coin.wownero*/) {
             final fee = await manager.estimateFeeFor(
                 amount, MoneroTransactionPriority.slow.raw!);
             ref.read(feeSheetSessionCacheProvider).slow[amount] = fee;
+            // } else if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+            //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+            //         "Private") {
+            //   ref.read(feeSheetSessionCacheProvider).slow[amount] =
+            //       await (manager.wallet as FiroWallet)
+            //           .estimateFeeForPublic(amount, feeRate);
           } else {
             ref.read(feeSheetSessionCacheProvider).slow[amount] =
                 await manager.estimateFeeFor(amount, feeRate);
           }
+          // } else {
+          //   final tokenWallet = ref.read(tokenServiceProvider)!;
+          //   final fee = tokenWallet.estimateFeeFor(feeRate);
+          //   ref.read(tokenFeeSessionCacheProvider).slow[amount] = fee;
+          // }
         }
-
-        return ref.read(feeSheetSessionCacheProvider).slow[amount]!;
+        return ref.read(
+            // widget.isToken
+            //     ? tokenFeeSessionCacheProvider
+            //     :
+            feeSheetSessionCacheProvider).slow[amount]!;
+      default:
+        return Amount.zero;
     }
   }
 
@@ -119,65 +181,47 @@ class _DesktopFeeDropDownState extends ConsumerState<DesktopFeeDropDown> {
         .select((value) => value.getManager(walletId)));
 
     return FutureBuilder(
-        future: manager.fees,
-        builder: (context, AsyncSnapshot<FeeObject> snapshot) {
-          if (snapshot.connectionState == ConnectionState.done &&
-              snapshot.hasData) {
-            feeObject = snapshot.data!;
-          }
-          return DropdownButtonHideUnderline(
-            child: DropdownButton2(
-              offset: const Offset(0, -10),
-              isExpanded: true,
-              dropdownElevation: 0,
-              value: ref.watch(feeRateTypeStateProvider.state).state,
-              // selectedItemBuilder: (s) {
-              //   return [
-              //     ...FeeRateType.values.map(
-              //       (e) => DropdownMenuItem(
-              //         value: e,
-              //         child: FeeDropDownChild(
-              //           feeObject: feeObject,
-              //           feeRateType: e,
-              //           walletId: walletId,
-              //           amount: amount,
-              //           feeFor: feeFor,
-              //           isSelected: true,
-              //         ),
-              //       ),
-              //     ),
-              //   ];
-              // },
-              items: [
-                ...FeeRateType.values.map(
-                  (e) => DropdownMenuItem(
-                    value: e,
-                    child: FeeDropDownChild(
-                      feeObject: feeObject,
-                      feeRateType: e,
-                      walletId: walletId,
-                      feeFor: feeFor,
-                      isSelected: false,
-                    ),
+      future: manager.fees,
+      builder: (context, AsyncSnapshot<FeeObject> snapshot) {
+        if (snapshot.connectionState == ConnectionState.done &&
+            snapshot.hasData) {
+          feeObject = snapshot.data!;
+        }
+        return DropdownButtonHideUnderline(
+          child: DropdownButton2(
+            isExpanded: true,
+            value: ref.watch(feeRateTypeStateProvider.state).state,
+            items: [
+              ...FeeRateType.values.map(
+                (e) => DropdownMenuItem(
+                  value: e,
+                  child: FeeDropDownChild(
+                    feeObject: feeObject,
+                    feeRateType: e,
+                    walletId: walletId,
+                    feeFor: feeFor,
+                    isSelected: false,
                   ),
                 ),
-              ],
-              onChanged: (newRateType) {
-                if (newRateType is FeeRateType) {
-                  ref.read(feeRateTypeStateProvider.state).state = newRateType;
-                }
-              },
+              ),
+            ],
+            onChanged: (newRateType) {
+              if (newRateType is FeeRateType) {
+                ref.read(feeRateTypeStateProvider.state).state = newRateType;
+              }
+            },
+            iconStyleData: IconStyleData(
               icon: SvgPicture.asset(
                 Assets.svg.chevronDown,
                 width: 12,
                 height: 6,
                 color: Theme.of(context).extension<StackColors>()!.textDark3,
               ),
-              buttonPadding: const EdgeInsets.symmetric(
-                horizontal: 16,
-                vertical: 8,
-              ),
-              buttonDecoration: BoxDecoration(
+            ),
+            dropdownStyleData: DropdownStyleData(
+              offset: const Offset(0, -10),
+              elevation: 0,
+              decoration: BoxDecoration(
                 color: Theme.of(context)
                     .extension<StackColors>()!
                     .textFieldDefaultBG,
@@ -185,17 +229,17 @@ class _DesktopFeeDropDownState extends ConsumerState<DesktopFeeDropDown> {
                   Constants.size.circularBorderRadius,
                 ),
               ),
-              dropdownDecoration: BoxDecoration(
-                color: Theme.of(context)
-                    .extension<StackColors>()!
-                    .textFieldDefaultBG,
-                borderRadius: BorderRadius.circular(
-                  Constants.size.circularBorderRadius,
-                ),
+            ),
+            menuItemStyleData: const MenuItemStyleData(
+              padding: EdgeInsets.symmetric(
+                horizontal: 16,
+                vertical: 8,
               ),
             ),
-          );
-        });
+          ),
+        );
+      },
+    );
   }
 }
 
@@ -290,10 +334,10 @@ class FeeDropDownChild extends ConsumerWidget {
               children: [
                 Text(
                   "${feeRateType.prettyName} "
-                  "(~${snapshot.data!.decimal.toStringAsFixed(
-                    manager.coin.decimals,
-                  )} "
-                  "${manager.coin.ticker})",
+                  "(~${ref.watch(pAmountFormatter(manager.coin)).format(
+                        snapshot.data!,
+                        indicatePrecisionLoss: false,
+                      )})",
                   style:
                       STextStyles.desktopTextExtraExtraSmall(context).copyWith(
                     color: Theme.of(context)
@@ -304,6 +348,9 @@ class FeeDropDownChild extends ConsumerWidget {
                 ),
                 if (feeObject != null)
                   Text(
+                    // manager.coin == Coin.ethereum
+                    //     ? ""
+                    //     :
                     estimatedTimeToBeIncludedInNextBlock(
                       Constants.targetBlockTimeInSeconds(manager.coin),
                       feeRateType == FeeRateType.fast
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
index efa1cb4e1..521b50f6e 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
@@ -27,10 +27,12 @@ class DesktopReceive extends ConsumerStatefulWidget {
   const DesktopReceive({
     Key? key,
     required this.walletId,
+    this.contractAddress,
     this.clipboard = const ClipboardWrapper(),
   }) : super(key: key);
 
   final String walletId;
+  final String? contractAddress;
   final ClipboardInterface clipboard;
 
   @override
@@ -148,7 +150,15 @@ class _DesktopReceiveState extends ConsumerState<DesktopReceive> {
                     Row(
                       children: [
                         Text(
-                          "Your ${coin.ticker} address",
+                          "Your ${
+                          // widget.contractAddress == null ?
+                          coin.ticker
+                          // : ref.watch(
+                          // tokenServiceProvider.select(
+                          //   (value) => value!.tokenContract.symbol,
+                          // ),
+                          // )
+                          } address",
                           style: STextStyles.itemSubtitle(context),
                         ),
                         const Spacer(),
@@ -210,7 +220,7 @@ class _DesktopReceiveState extends ConsumerState<DesktopReceive> {
           height: 32,
         ),
         Center(
-          child: QrImage(
+          child: QrImageView(
             data: "${coin.uriScheme}:$receivingAddress",
             size: 200,
             foregroundColor:
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart
index 690aace10..64ef3d428 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
+import 'dart:math';
 
 import 'package:bip47/bip47.dart';
+import 'package:cw_core/monero_transaction_priority.dart';
 import 'package:decimal/decimal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -23,20 +25,27 @@ import 'package:stackduo/services/mixins/paynym_wallet_interface.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/address_utils.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
+import 'package:stackduo/utilities/amount/amount_input_formatter.dart';
+import 'package:stackduo/utilities/amount/amount_unit.dart';
 import 'package:stackduo/utilities/barcode_scanner_interface.dart';
 import 'package:stackduo/utilities/clipboard_interface.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
+import 'package:stackduo/utilities/enums/fee_rate_type_enum.dart';
 import 'package:stackduo/utilities/logger.dart';
 import 'package:stackduo/utilities/prefs.dart';
 import 'package:stackduo/utilities/text_styles.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/animated_text.dart';
+import 'package:stackduo/widgets/conditional_parent.dart';
 import 'package:stackduo/widgets/custom_buttons/blue_text_button.dart';
 import 'package:stackduo/widgets/desktop/desktop_dialog.dart';
 import 'package:stackduo/widgets/desktop/desktop_dialog_close_button.dart';
+import 'package:stackduo/widgets/desktop/desktop_fee_dialog.dart';
 import 'package:stackduo/widgets/desktop/primary_button.dart';
 import 'package:stackduo/widgets/desktop/secondary_button.dart';
+import 'package:stackduo/widgets/fee_slider.dart';
 import 'package:stackduo/widgets/icon_widgets/addressbook_icon.dart';
 import 'package:stackduo/widgets/icon_widgets/clipboard_icon.dart';
 import 'package:stackduo/widgets/icon_widgets/x_icon.dart';
@@ -97,6 +106,17 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
 
   bool get isPaynymSend => widget.accountLite != null;
 
+  bool isCustomFee = false;
+  int customFeeRate = 1;
+  (FeeRateType, String?, String?)? feeSelectionResult;
+
+  final stringsToLoopThrough = [
+    "Calculating",
+    "Calculating.",
+    "Calculating..",
+    "Calculating...",
+  ];
+
   Future<void> previewSend() async {
     final manager =
         ref.read(walletsChangeNotifierProvider).getManager(walletId);
@@ -253,6 +273,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
           isSegwit: widget.accountLite!.segwit,
           amount: amount,
           args: {
+            "satsPerVByte": isCustomFee ? customFeeRate : null,
             "feeRate": feeRate,
             "UTXOs": (manager.hasCoinControlSupport &&
                     coinControlEnabled &&
@@ -267,6 +288,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
           amount: amount,
           args: {
             "feeRate": ref.read(feeRateTypeStateProvider),
+            "satsPerVByte": isCustomFee ? customFeeRate : null,
             "UTXOs": (manager.hasCoinControlSupport &&
                     coinControlEnabled &&
                     ref.read(desktopUseUTXOs).isNotEmpty)
@@ -397,14 +419,26 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
 
   void _cryptoAmountChanged() async {
     if (!_cryptoAmountChangeLock) {
-      final String cryptoAmount = cryptoAmountController.text;
+      String cryptoAmount = cryptoAmountController.text;
       if (cryptoAmount.isNotEmpty &&
           cryptoAmount != "." &&
           cryptoAmount != ",") {
+        if (cryptoAmount.startsWith("~")) {
+          cryptoAmount = cryptoAmount.substring(1);
+        }
+        if (cryptoAmount.contains(" ")) {
+          cryptoAmount = cryptoAmount.split(" ").first;
+        }
+
+        // ensure we don't shift past minimum atomic value
+        final shift = min(ref.read(pAmountUnit(coin)).shift, coin.decimals);
+
         _amountToSend = cryptoAmount.contains(",")
             ? Decimal.parse(cryptoAmount.replaceFirst(",", "."))
+                .shift(0 - shift)
                 .toAmount(fractionDigits: coin.decimals)
             : Decimal.parse(cryptoAmount)
+                .shift(0 - shift)
                 .toAmount(fractionDigits: coin.decimals);
         if (_cachedAmountToSend != null &&
             _cachedAmountToSend == _amountToSend) {
@@ -420,7 +454,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
         if (price > Decimal.zero) {
           final String fiatAmountString = (_amountToSend!.decimal * price)
               .toAmount(fractionDigits: 2)
-              .localizedStringAsFixed(
+              .fiatString(
                 locale: ref.read(localeServiceChangeNotifierProvider).locale,
               );
 
@@ -474,22 +508,17 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
     }
     if (private && _privateBalanceString != null) {
       return Text(
-        "$_privateBalanceString ${coin.ticker}",
+        "$_privateBalanceString",
         style: STextStyles.itemSubtitle(context),
       );
     } else if (!private && _publicBalanceString != null) {
       return Text(
-        "$_publicBalanceString ${coin.ticker}",
+        "$_publicBalanceString",
         style: STextStyles.itemSubtitle(context),
       );
     } else {
       return AnimatedText(
-        stringsToLoopThrough: const [
-          "Loading balance",
-          "Loading balance.",
-          "Loading balance..",
-          "Loading balance...",
-        ],
+        stringsToLoopThrough: stringsToLoopThrough,
         style: STextStyles.itemSubtitle(context),
       );
     }
@@ -528,11 +557,9 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
           final amount = Decimal.parse(results["amount"]!).toAmount(
             fractionDigits: coin.decimals,
           );
-          cryptoAmountController.text = amount.localizedStringAsFixed(
-            locale: ref.read(localeServiceChangeNotifierProvider).locale,
-            decimalPlaces: Constants.decimalPlacesForCoin(coin),
-          );
-          amount.toString();
+          cryptoAmountController.text = ref
+              .read(pAmountFormatter(coin))
+              .format(amount, withUnitName: false);
           _amountToSend = amount;
         }
 
@@ -609,10 +636,10 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
       Logging.instance.log("it changed $_amountToSend $_cachedAmountToSend",
           level: LogLevel.Info);
 
-      final amountString = _amountToSend!.localizedStringAsFixed(
-        locale: ref.read(localeServiceChangeNotifierProvider).locale,
-        decimalPlaces: coin.decimals,
-      );
+      final amountString = ref.read(pAmountFormatter(coin)).format(
+            _amountToSend!,
+            withUnitName: false,
+          );
 
       _cryptoAmountChangeLock = true;
       cryptoAmountController.text = amountString;
@@ -815,12 +842,21 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
                 ),
           textAlign: TextAlign.right,
           inputFormatters: [
-            // regex to validate a crypto amount with 8 decimal places
-            TextInputFormatter.withFunction((oldValue, newValue) =>
-                RegExp(r'^([0-9]*[,.]?[0-9]{0,8}|[,.][0-9]{0,8})$')
-                        .hasMatch(newValue.text)
-                    ? newValue
-                    : oldValue),
+            AmountInputFormatter(
+              decimals: coin.decimals,
+              unit: ref.watch(pAmountUnit(coin)),
+              locale: ref.watch(
+                localeServiceChangeNotifierProvider.select(
+                  (value) => value.locale,
+                ),
+              ),
+            ),
+            // // regex to validate a crypto amount with 8 decimal places
+            // TextInputFormatter.withFunction((oldValue, newValue) =>
+            //     RegExp(r'^([0-9]*[,.]?[0-9]{0,8}|[,.][0-9]{0,8})$')
+            //             .hasMatch(newValue.text)
+            //         ? newValue
+            //         : oldValue),
           ],
           onChanged: (newValue) {},
           decoration: InputDecoration(
@@ -840,7 +876,7 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
               child: Padding(
                 padding: const EdgeInsets.all(12),
                 child: Text(
-                  coin.ticker,
+                  ref.watch(pAmountUnit(coin)).unitForCoin(coin),
                   style: STextStyles.smallMed14(context).copyWith(
                       color: Theme.of(context)
                           .extension<StackColors>()!
@@ -872,12 +908,20 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
                   ),
             textAlign: TextAlign.right,
             inputFormatters: [
-              // regex to validate a fiat amount with 2 decimal places
-              TextInputFormatter.withFunction((oldValue, newValue) =>
-                  RegExp(r'^([0-9]*[,.]?[0-9]{0,2}|[,.][0-9]{0,2})$')
-                          .hasMatch(newValue.text)
-                      ? newValue
-                      : oldValue),
+              AmountInputFormatter(
+                decimals: 2,
+                locale: ref.watch(
+                  localeServiceChangeNotifierProvider.select(
+                    (value) => value.locale,
+                  ),
+                ),
+              ),
+              // // regex to validate a fiat amount with 2 decimal places
+              // TextInputFormatter.withFunction((oldValue, newValue) =>
+              //     RegExp(r'^([0-9]*[,.]?[0-9]{0,2}|[,.][0-9]{0,2})$')
+              //             .hasMatch(newValue.text)
+              //         ? newValue
+              //         : oldValue),
             ],
             onChanged: fiatTextFieldOnChanged,
             decoration: InputDecoration(
@@ -1134,77 +1178,179 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
               }
             },
           ),
-        // const SizedBox(
-        //   height: 20,
-        // ),
-        // Text(
-        //   "Note (optional)",
-        //   style: STextStyles.desktopTextExtraSmall(context).copyWith(
-        //     color: Theme.of(context)
-        //         .extension<StackColors>()!
-        //         .textFieldActiveSearchIconRight,
-        //   ),
-        //   textAlign: TextAlign.left,
-        // ),
-        // const SizedBox(
-        //   height: 10,
-        // ),
-        // ClipRRect(
-        //   borderRadius: BorderRadius.circular(
-        //     Constants.size.circularBorderRadius,
-        //   ),
-        //   child: TextField(
-        //     minLines: 1,
-        //     maxLines: 5,
-        //     autocorrect: Util.isDesktop ? false : true,
-        //     enableSuggestions: Util.isDesktop ? false : true,
-        //     controller: noteController,
-        //     focusNode: _noteFocusNode,
-        //     style: STextStyles.desktopTextExtraSmall(context).copyWith(
-        //       color: Theme.of(context)
-        //           .extension<StackColors>()!
-        //           .textFieldActiveText,
-        //       height: 1.8,
-        //     ),
-        //     onChanged: (_) => setState(() {}),
-        //     decoration: standardInputDecoration(
-        //       "Type something...",
-        //       _noteFocusNode,
-        //       context,
-        //       desktopMed: true,
-        //     ).copyWith(
-        //       contentPadding: const EdgeInsets.only(
-        //         left: 16,
-        //         top: 11,
-        //         bottom: 12,
-        //         right: 5,
-        //       ),
-        //       suffixIcon: noteController.text.isNotEmpty
-        //           ? Padding(
-        //               padding: const EdgeInsets.only(right: 0),
-        //               child: UnconstrainedBox(
-        //                 child: Row(
-        //                   children: [
-        //                     TextFieldIconButton(
-        //                       child: const XIcon(),
-        //                       onTap: () async {
-        //                         setState(() {
-        //                           noteController.text = "";
-        //                         });
-        //                       },
-        //                     ),
-        //                   ],
-        //                 ),
-        //               ),
-        //             )
-        //           : null,
-        //     ),
-        //   ),
-        // ),
         if (!isPaynymSend)
           const SizedBox(
             height: 20,
           ),
+        // if (!([Coin.nano, Coin.banano, Coin.epicCash].contains(coin)))
+        ConditionalParent(
+          condition: coin.isElectrumXCoin,
+          builder: (child) => Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              child,
+              CustomTextButton(
+                text: "Edit",
+                onTap: () async {
+                  feeSelectionResult = await showDialog<
+                      (
+                        FeeRateType,
+                        String?,
+                        String?,
+                      )?>(
+                    context: context,
+                    builder: (_) => DesktopFeeDialog(
+                      walletId: walletId,
+                    ),
+                  );
+
+                  if (feeSelectionResult != null) {
+                    if (isCustomFee &&
+                        feeSelectionResult!.$1 != FeeRateType.custom) {
+                      isCustomFee = false;
+                    } else if (!isCustomFee &&
+                        feeSelectionResult!.$1 == FeeRateType.custom) {
+                      isCustomFee = true;
+                    }
+                  }
+
+                  setState(() {});
+                },
+              ),
+            ],
+          ),
+          child: Text(
+            "Transaction fee"
+            "${isCustomFee ? "" : " (${/*coin == Coin.ethereum ? "max" : */ "estimated"})"}",
+            style: STextStyles.desktopTextExtraSmall(context).copyWith(
+              color: Theme.of(context)
+                  .extension<StackColors>()!
+                  .textFieldActiveSearchIconRight,
+            ),
+            textAlign: TextAlign.left,
+          ),
+        ),
+        // if (!([Coin.nano, Coin.banano, Coin.epicCash].contains(coin)))
+        const SizedBox(
+          height: 10,
+        ),
+        // if (!([Coin.nano, Coin.banano, Coin.epicCash].contains(coin)))
+        if (!isCustomFee)
+          (feeSelectionResult?.$2 == null)
+              ? FutureBuilder(
+                  future: ref.watch(
+                    walletsChangeNotifierProvider.select(
+                      (value) => value.getManager(walletId).fees,
+                    ),
+                  ),
+                  builder: (context, snapshot) {
+                    if (snapshot.connectionState == ConnectionState.done &&
+                        snapshot.hasData) {
+                      return DesktopFeeItem(
+                        feeObject: snapshot.data,
+                        feeRateType: FeeRateType.average,
+                        walletId: walletId,
+                        feeFor: ({
+                          required Amount amount,
+                          required FeeRateType feeRateType,
+                          required int feeRate,
+                          required Coin coin,
+                        }) async {
+                          if (ref
+                                  .read(feeSheetSessionCacheProvider)
+                                  .average[amount] ==
+                              null) {
+                            final manager = ref
+                                .read(walletsChangeNotifierProvider)
+                                .getManager(walletId);
+
+                            if (coin ==
+                                Coin.monero /* || coin == Coin.wownero*/) {
+                              final fee = await manager.estimateFeeFor(amount,
+                                  MoneroTransactionPriority.regular.raw!);
+                              ref
+                                  .read(feeSheetSessionCacheProvider)
+                                  .average[amount] = fee;
+                              // } else if ((coin == Coin.firo ||
+                              //         coin == Coin.firoTestNet) &&
+                              //     ref
+                              //             .read(
+                              //                 publicPrivateBalanceStateProvider
+                              //                     .state)
+                              //             .state !=
+                              //         "Private") {
+                              //   ref
+                              //           .read(feeSheetSessionCacheProvider)
+                              //           .average[amount] =
+                              //       await (manager.wallet as FiroWallet)
+                              //           .estimateFeeForPublic(amount, feeRate);
+                            } else {
+                              ref
+                                      .read(feeSheetSessionCacheProvider)
+                                      .average[amount] =
+                                  await manager.estimateFeeFor(amount, feeRate);
+                            }
+                          }
+                          return ref
+                              .read(feeSheetSessionCacheProvider)
+                              .average[amount]!;
+                        },
+                        isSelected: true,
+                      );
+                    } else {
+                      return Row(
+                        children: [
+                          AnimatedText(
+                            stringsToLoopThrough: stringsToLoopThrough,
+                            style:
+                                STextStyles.desktopTextExtraExtraSmall(context)
+                                    .copyWith(
+                              color: Theme.of(context)
+                                  .extension<StackColors>()!
+                                  .textFieldActiveText,
+                            ),
+                          ),
+                        ],
+                      );
+                    }
+                  },
+                )
+              : Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Text(
+                      feeSelectionResult?.$2 ?? "",
+                      style: STextStyles.desktopTextExtraExtraSmall(context)
+                          .copyWith(
+                        color: Theme.of(context)
+                            .extension<StackColors>()!
+                            .textFieldActiveText,
+                      ),
+                      textAlign: TextAlign.left,
+                    ),
+                    Text(
+                      feeSelectionResult?.$3 ?? "",
+                      style: STextStyles.desktopTextExtraExtraSmall(context)
+                          .copyWith(
+                        color: Theme.of(context)
+                            .extension<StackColors>()!
+                            .textFieldActiveSearchIconRight,
+                      ),
+                    ),
+                  ],
+                ),
+        if (isCustomFee)
+          Padding(
+            padding: const EdgeInsets.only(
+              bottom: 12,
+              top: 16,
+            ),
+            child: FeeSlider(
+              onSatVByteChanged: (rate) {
+                customFeeRate = rate;
+              },
+            ),
+          ),
         const SizedBox(
           height: 36,
         ),
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart
index 7f1839987..a6db300ee 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart
@@ -134,7 +134,12 @@ class _DesktopWalletFeaturesState extends ConsumerState<DesktopWalletFeatures> {
     );
 
     final showMore = manager.hasPaynymSupport ||
-        manager.hasCoinControlSupport ||
+        (manager.hasCoinControlSupport &&
+            ref.watch(
+              prefsChangeNotifierProvider.select(
+                (value) => value.enableCoinControl,
+              ),
+            )) ||
         manager.hasWhirlpoolSupport;
 
     return Row(
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart
index 49b0e3068..3d02fcbcb 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart
@@ -6,21 +6,23 @@ import 'package:stackduo/pages_desktop_specific/my_stack_view/wallet_view/sub_wi
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/providers/wallet/wallet_balance_toggle_state_provider.dart';
 import 'package:stackduo/services/event_bus/events/global/wallet_sync_status_changed_event.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/enums/wallet_balance_toggle_state.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 
 class DesktopWalletSummary extends ConsumerStatefulWidget {
   const DesktopWalletSummary({
     Key? key,
     required this.walletId,
     required this.initialSyncStatus,
+    this.isToken = false,
   }) : super(key: key);
 
   final String walletId;
   final WalletSyncStatus initialSyncStatus;
+  final bool isToken;
 
   @override
   ConsumerState<DesktopWalletSummary> createState() =>
@@ -56,26 +58,59 @@ class _WDesktopWalletSummaryState extends ConsumerState<DesktopWalletSummary> {
     final baseCurrency = ref
         .watch(prefsChangeNotifierProvider.select((value) => value.currency));
 
-    final priceTuple = ref.watch(priceAnd24hChangeNotifierProvider
-        .select((value) => value.getPrice(coin)));
+    final tokenContract =
+        // widget.isToken
+        //     ? ref
+        //         .watch(tokenServiceProvider.select((value) => value!.tokenContract))
+        //     :
+        null;
+
+    final priceTuple =
+        // widget.isToken
+        //     ? ref.watch(priceAnd24hChangeNotifierProvider
+        //         .select((value) => value.getTokenPrice(tokenContract!.address)))
+        //     :
+        ref.watch(priceAnd24hChangeNotifierProvider
+            .select((value) => value.getPrice(coin)));
 
     final _showAvailable =
         ref.watch(walletBalanceToggleStateProvider.state).state ==
             WalletBalanceToggleState.available;
 
-    final unit = coin.ticker;
-    final decimalPlaces = coin.decimals;
-
-    Balance balance = ref.watch(walletsChangeNotifierProvider
-        .select((value) => value.getManager(walletId).balance));
+    Balance balance =
+        // widget.isToken
+        //     ? ref.watch(tokenServiceProvider.select((value) => value!.balance))
+        //     :
+        ref.watch(walletsChangeNotifierProvider
+            .select((value) => value.getManager(walletId).balance));
 
     Amount balanceToShow;
-
+    // if (coin == Coin.firo || coin == Coin.firoTestNet) {
+    //   Balance? balanceSecondary = ref
+    //       .watch(
+    //         walletsChangeNotifierProvider.select(
+    //           (value) =>
+    //               value.getManager(widget.walletId).wallet as FiroWallet?,
+    //         ),
+    //       )
+    //       ?.balancePrivate;
+    //   final showPrivate =
+    //       ref.watch(walletPrivateBalanceToggleStateProvider.state).state ==
+    //           WalletBalanceToggleState.available;
+    //
+    //   if (_showAvailable) {
+    //     balanceToShow =
+    //         showPrivate ? balanceSecondary!.spendable : balance.spendable;
+    //   } else {
+    //     balanceToShow = showPrivate ? balanceSecondary!.total : balance.total;
+    //   }
+    // } else {
     if (_showAvailable) {
       balanceToShow = balance.spendable;
     } else {
       balanceToShow = balance.total;
     }
+    // }
 
     return Consumer(
       builder: (context, ref, __) {
@@ -88,10 +123,9 @@ class _WDesktopWalletSummaryState extends ConsumerState<DesktopWalletSummary> {
                 FittedBox(
                   fit: BoxFit.scaleDown,
                   child: Text(
-                    "${balanceToShow.localizedStringAsFixed(
-                      locale: locale,
-                      decimalPlaces: decimalPlaces,
-                    )} $unit",
+                    ref
+                        .watch(pAmountFormatter(coin))
+                        .format(balanceToShow, ethContract: tokenContract),
                     style: STextStyles.desktopH3(context),
                   ),
                 ),
@@ -100,9 +134,8 @@ class _WDesktopWalletSummaryState extends ConsumerState<DesktopWalletSummary> {
                     "${Amount.fromDecimal(
                       priceTuple.item1 * balanceToShow.decimal,
                       fractionDigits: 2,
-                    ).localizedStringAsFixed(
+                    ).fiatString(
                       locale: locale,
-                      decimalPlaces: 2,
                     )} $baseCurrency",
                     style: STextStyles.desktopTextExtraSmall(context).copyWith(
                       color: Theme.of(context)
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/my_wallet.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/my_wallet.dart
index 325759e29..e4bff727e 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/my_wallet.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/my_wallet.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:stackduo/pages/wallet_view/sub_widgets/transactions_list.dart';
 import 'package:stackduo/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart';
 import 'package:stackduo/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart';
+import 'package:stackduo/providers/global/wallets_provider.dart';
 import 'package:stackduo/widgets/custom_tab_view.dart';
 import 'package:stackduo/widgets/rounded_white_container.dart';
 
@@ -9,9 +11,11 @@ class MyWallet extends ConsumerStatefulWidget {
   const MyWallet({
     Key? key,
     required this.walletId,
+    this.contractAddress,
   }) : super(key: key);
 
   final String walletId;
+  final String? contractAddress;
 
   @override
   ConsumerState<MyWallet> createState() => _MyWalletState();
@@ -27,7 +31,8 @@ class _MyWalletState extends ConsumerState<MyWallet> {
 
   @override
   void initState() {
-    // isEth = ref
+    isEth = false;
+    //ref
     //         .read(walletsChangeNotifierProvider)
     //         .getManager(widget.walletId)
     //         .coin ==
@@ -50,37 +55,47 @@ class _MyWalletState extends ConsumerState<MyWallet> {
           child: CustomTabView(
             titles: titles,
             children: [
+              // widget.contractAddress == null
+              //     ?
               Padding(
                 padding: const EdgeInsets.all(20),
                 child: DesktopSend(
                   walletId: widget.walletId,
                 ),
-              ),
+              )
+              // : Padding(
+              //     padding: const EdgeInsets.all(20),
+              //     child: DesktopTokenSend(
+              //       walletId: widget.walletId,
+              //     ),
+              //   )
+              ,
               Padding(
                 padding: const EdgeInsets.all(20),
                 child: DesktopReceive(
                   walletId: widget.walletId,
+                  contractAddress: widget.contractAddress,
                 ),
               ),
-              // if (isEth && widget.contractAddress == null)
-              //   Padding(
-              //     padding: const EdgeInsets.only(top: 8.0),
-              //     child: ConstrainedBox(
-              //       constraints: BoxConstraints(
-              //         maxHeight: MediaQuery.of(context).size.height - 362,
-              //       ),
-              //       child: TransactionsList(
-              //         walletId: widget.walletId,
-              //         managerProvider: ref.watch(
-              //           walletsChangeNotifierProvider.select(
-              //             (value) => value.getManagerProvider(
-              //               widget.walletId,
-              //             ),
-              //           ),
-              //         ),
-              //       ),
-              //     ),
-              //   ),
+              if (isEth && widget.contractAddress == null)
+                Padding(
+                  padding: const EdgeInsets.only(top: 8.0),
+                  child: ConstrainedBox(
+                    constraints: BoxConstraints(
+                      maxHeight: MediaQuery.of(context).size.height - 362,
+                    ),
+                    child: TransactionsList(
+                      walletId: widget.walletId,
+                      managerProvider: ref.watch(
+                        walletsChangeNotifierProvider.select(
+                          (value) => value.getManagerProvider(
+                            widget.walletId,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
             ],
           ),
         ),
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/qr_code_desktop_popup_content.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/qr_code_desktop_popup_content.dart
index 8dadd748a..7c7ac6381 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/qr_code_desktop_popup_content.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/qr_code_desktop_popup_content.dart
@@ -20,16 +20,16 @@ class QRCodeDesktopPopupContent extends StatelessWidget {
       maxWidth: 614,
       child: Column(
         children: [
-          Row(
+          const Row(
             mainAxisAlignment: MainAxisAlignment.end,
-            children: const [
+            children: [
               DesktopDialogCloseButton(),
             ],
           ),
           const SizedBox(
             height: 14,
           ),
-          QrImage(
+          QrImageView(
             data: value,
             size: 300,
             foregroundColor:
diff --git a/lib/pages_desktop_specific/password/delete_password_warning_view.dart b/lib/pages_desktop_specific/password/delete_password_warning_view.dart
index 0e08f5e8f..7677165e5 100644
--- a/lib/pages_desktop_specific/password/delete_password_warning_view.dart
+++ b/lib/pages_desktop_specific/password/delete_password_warning_view.dart
@@ -5,7 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hive/hive.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:isar/isar.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/notifications/show_flush_bar.dart';
 import 'package:stackduo/pages/intro_view.dart';
 import 'package:stackduo/utilities/assets.dart';
@@ -42,7 +43,17 @@ class _ForgotPasswordDesktopViewState
 
     try {
       await Hive.close();
-      if (Platform.isWindows || Platform.isLinux) {
+      if (Platform.isWindows) {
+        final xmrDir = Directory("${appRoot.path}/wallets");
+        if (xmrDir.existsSync()) {
+          await xmrDir.delete(recursive: true);
+        }
+
+        await Isar.getInstance("desktopStore")?.close(deleteFromDisk: true);
+
+        await (await StackFileSystem.applicationHiveDirectory())
+            .delete(recursive: true);
+      } else if (Platform.isLinux) {
         await appRoot.delete(recursive: true);
       } else {
         // macos in ipad mode
diff --git a/lib/pages_desktop_specific/password/desktop_login_view.dart b/lib/pages_desktop_specific/password/desktop_login_view.dart
index 5df99914c..c069c205a 100644
--- a/lib/pages_desktop_specific/password/desktop_login_view.dart
+++ b/lib/pages_desktop_specific/password/desktop_login_view.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/notifications/show_flush_bar.dart';
 import 'package:stackduo/pages_desktop_specific/desktop_home_view.dart';
 import 'package:stackduo/pages_desktop_specific/password/forgot_password_desktop_view.dart';
diff --git a/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart b/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart
index bd08a438d..72e9f2081 100644
--- a/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart
+++ b/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hive_flutter/hive_flutter.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/notifications/show_flush_bar.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/stack_backup_views/helpers/swb_file_system.dart';
diff --git a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart
index 9a2a1d1d4..dec46f390 100644
--- a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/providers/global/prefs_provider.dart';
 import 'package:stackduo/providers/global/price_provider.dart';
 import 'package:stackduo/services/exchange/exchange_data_loading_service.dart';
diff --git a/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart
index fe9c38aac..e8340f7c8 100644
--- a/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu/appearance_settings/appearance_settings.dart
@@ -167,7 +167,7 @@ class ThemeToggle extends ConsumerStatefulWidget {
 
 class _ThemeToggle extends ConsumerState<ThemeToggle> {
   late final StreamSubscription<void> _subscription;
-  late int _current;
+  int _current = 0;
 
   List<Tuple3<String, String, String>> installedThemeIdNames = [];
 
diff --git a/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/create_auto_backup.dart b/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/create_auto_backup.dart
index a9b1bfdd5..cf495d824 100644
--- a/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/create_auto_backup.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu/backup_and_restore/create_auto_backup.dart
@@ -469,9 +469,7 @@ class _CreateAutoBackup extends ConsumerState<CreateAutoBackup> {
             child: isDesktop
                 ? DropdownButtonHideUnderline(
                     child: DropdownButton2(
-                      offset: const Offset(0, -10),
                       isExpanded: true,
-                      dropdownElevation: 0,
                       value: _currentDropDownValue,
                       items: [
                         ..._dropDownItems.map(
@@ -516,32 +514,32 @@ class _CreateAutoBackup extends ConsumerState<CreateAutoBackup> {
                           });
                         }
                       },
-                      icon: SvgPicture.asset(
-                        Assets.svg.chevronDown,
-                        width: 10,
-                        height: 5,
-                        color: Theme.of(context)
-                            .extension<StackColors>()!
-                            .textDark3,
-                      ),
-                      buttonPadding: const EdgeInsets.symmetric(
-                        horizontal: 16,
-                        vertical: 8,
+                      iconStyleData: IconStyleData(
+                        icon: SvgPicture.asset(
+                          Assets.svg.chevronDown,
+                          width: 10,
+                          height: 5,
+                          color: Theme.of(context)
+                              .extension<StackColors>()!
+                              .textDark3,
+                        ),
                       ),
-                      buttonDecoration: BoxDecoration(
-                        color: Theme.of(context)
-                            .extension<StackColors>()!
-                            .textFieldDefaultBG,
-                        borderRadius: BorderRadius.circular(
-                          Constants.size.circularBorderRadius,
+                      dropdownStyleData: DropdownStyleData(
+                        offset: const Offset(0, -10),
+                        elevation: 0,
+                        decoration: BoxDecoration(
+                          color: Theme.of(context)
+                              .extension<StackColors>()!
+                              .textFieldDefaultBG,
+                          borderRadius: BorderRadius.circular(
+                            Constants.size.circularBorderRadius,
+                          ),
                         ),
                       ),
-                      dropdownDecoration: BoxDecoration(
-                        color: Theme.of(context)
-                            .extension<StackColors>()!
-                            .textFieldDefaultBG,
-                        borderRadius: BorderRadius.circular(
-                          Constants.size.circularBorderRadius,
+                      menuItemStyleData: const MenuItemStyleData(
+                        padding: EdgeInsets.symmetric(
+                          horizontal: 16,
+                          vertical: 8,
                         ),
                       ),
                     ),
diff --git a/lib/providers/db/main_db_provider.dart b/lib/providers/db/main_db_provider.dart
index f447287e0..183615305 100644
--- a/lib/providers/db/main_db_provider.dart
+++ b/lib/providers/db/main_db_provider.dart
@@ -1,4 +1,4 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 
 final mainDBProvider = Provider((ref) => MainDB.instance);
diff --git a/lib/providers/ui/add_wallet_selected_coin_provider.dart b/lib/providers/ui/add_wallet_selected_coin_provider.dart
index 49d117c69..093207a5f 100644
--- a/lib/providers/ui/add_wallet_selected_coin_provider.dart
+++ b/lib/providers/ui/add_wallet_selected_coin_provider.dart
@@ -1,14 +1,5 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
+import 'package:stackduo/models/add_wallet_list_entity/add_wallet_list_entity.dart';
 
-int _count = 0;
-
-final addWalletSelectedCoinStateProvider =
-    StateProvider.autoDispose<Coin?>((_) {
-  if (kDebugMode) {
-    _count++;
-  }
-
-  return null;
-});
+final addWalletSelectedEntityStateProvider =
+    StateProvider.autoDispose<AddWalletListEntity?>((_) => null);
diff --git a/lib/route_generator.dart b/lib/route_generator.dart
index b9ff2d771..99adf7358 100644
--- a/lib/route_generator.dart
+++ b/lib/route_generator.dart
@@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:isar/isar.dart';
+import 'package:stackduo/models/add_wallet_list_entity/add_wallet_list_entity.dart';
 import 'package:stackduo/models/exchange/incomplete_exchange.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
 import 'package:stackduo/models/isar/models/contact_entry.dart';
@@ -53,6 +54,8 @@ import 'package:stackduo/pages/send_view/send_view.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/about_view.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/advanced_settings_view.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/debug_view.dart';
+import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/edit_coin_units_view.dart';
+import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/manage_explorer_view.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/appearance_settings/appearance_settings_view.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/appearance_settings/manage_themes.dart';
@@ -138,6 +141,11 @@ import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/widgets/choose_coin_view.dart';
 import 'package:tuple/tuple.dart';
 
+/*
+ * This file contains all the routes for the app.
+ * To add a new route, add it to the switch statement in the generateRoute method.
+ */
+
 class RouteGenerator {
   static const bool useMaterialPageRoute = true;
 
@@ -194,18 +202,6 @@ class RouteGenerator {
             builder: (_) => const StackPrivacyCalls(isSettings: false),
             settings: RouteSettings(name: settings.name));
 
-      case WalletsView.routeName:
-        return getRoute(
-            shouldUseMaterialRoute: useMaterialPageRoute,
-            builder: (_) => const WalletsView(),
-            settings: RouteSettings(name: settings.name));
-
-      case AddWalletView.routeName:
-        return getRoute(
-            shouldUseMaterialRoute: useMaterialPageRoute,
-            builder: (_) => const AddWalletView(),
-            settings: RouteSettings(name: settings.name));
-
       case ChooseCoinView.routeName:
         if (args is Tuple3<String, String, String>) {
           return getRoute(
@@ -236,6 +232,18 @@ class RouteGenerator {
         }
         return _routeError("${settings.name} invalid args: ${args.toString()}");
 
+      case WalletsView.routeName:
+        return getRoute(
+            shouldUseMaterialRoute: useMaterialPageRoute,
+            builder: (_) => const WalletsView(),
+            settings: RouteSettings(name: settings.name));
+
+      case AddWalletView.routeName:
+        return getRoute(
+            shouldUseMaterialRoute: useMaterialPageRoute,
+            builder: (_) => const AddWalletView(),
+            settings: RouteSettings(name: settings.name));
+
       case WalletsOverview.routeName:
         if (args is Coin) {
           return getRoute(
@@ -534,6 +542,26 @@ class RouteGenerator {
         }
         return _routeError("${settings.name} invalid args: ${args.toString()}");
 
+      case ManageCoinUnitsView.routeName:
+        return getRoute(
+            shouldUseMaterialRoute: useMaterialPageRoute,
+            builder: (_) => const ManageCoinUnitsView(),
+            settings: RouteSettings(name: settings.name));
+
+      case EditCoinUnitsView.routeName:
+        if (args is Coin) {
+          return getRoute(
+            shouldUseMaterialRoute: useMaterialPageRoute,
+            builder: (_) => EditCoinUnitsView(
+              coin: args,
+            ),
+            settings: RouteSettings(
+              name: settings.name,
+            ),
+          );
+        }
+        return _routeError("${settings.name} invalid args: ${args.toString()}");
+
       case CreateBackupInfoView.routeName:
         return getRoute(
             shouldUseMaterialRoute: useMaterialPageRoute,
@@ -784,11 +812,11 @@ class RouteGenerator {
         return _routeError("${settings.name} invalid args: ${args.toString()}");
 
       case CreateOrRestoreWalletView.routeName:
-        if (args is Coin) {
+        if (args is AddWalletListEntity) {
           return getRoute(
             shouldUseMaterialRoute: useMaterialPageRoute,
             builder: (_) => CreateOrRestoreWalletView(
-              coin: args,
+              entity: args,
             ),
             settings: RouteSettings(
               name: settings.name,
@@ -954,12 +982,11 @@ class RouteGenerator {
         return _routeError("${settings.name} invalid args: ${args.toString()}");
 
       case ReceiveView.routeName:
-        if (args is Tuple2<String, Coin>) {
+        if (args is String) {
           return getRoute(
             shouldUseMaterialRoute: useMaterialPageRoute,
             builder: (_) => ReceiveView(
-              walletId: args.item1,
-              coin: args.item2,
+              walletId: args,
             ),
             settings: RouteSettings(
               name: settings.name,
diff --git a/lib/services/address_book_service.dart b/lib/services/address_book_service.dart
index 91dfa08d4..96e33a7cf 100644
--- a/lib/services/address_book_service.dart
+++ b/lib/services/address_book_service.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/contact_entry.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 
diff --git a/lib/services/coins/bitcoin/bitcoin_wallet.dart b/lib/services/coins/bitcoin/bitcoin_wallet.dart
index 0fa906a9e..55e7634c8 100644
--- a/lib/services/coins/bitcoin/bitcoin_wallet.dart
+++ b/lib/services/coins/bitcoin/bitcoin_wallet.dart
@@ -11,7 +11,7 @@ import 'package:bs58check/bs58check.dart' as bs58check;
 import 'package:decimal/decimal.dart';
 import 'package:flutter/foundation.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/electrumx_rpc/cached_electrumx.dart';
 import 'package:stackduo/electrumx_rpc/electrumx.dart';
 import 'package:stackduo/exceptions/electrumx/no_such_transaction.dart';
@@ -277,8 +277,8 @@ class BitcoinWallet extends CoinServiceAPI
   @override
   Future<int> get maxFee async {
     final fee = (await fees).fast as String;
-    final satsFee =
-        Decimal.parse(fee) * Decimal.fromInt(Constants.satsPerCoin(coin));
+    final satsFee = Decimal.parse(fee) *
+        Decimal.fromInt(Constants.satsPerCoin(coin).toInt());
     return satsFee.floor().toBigInt().toInt();
   }
 
@@ -1060,9 +1060,60 @@ class BitcoinWallet extends CoinServiceAPI
   }) async {
     try {
       final feeRateType = args?["feeRate"];
+      final customSatsPerVByte = args?["satsPerVByte"] as int?;
       final feeRateAmount = args?["feeRateAmount"];
       final utxos = args?["UTXOs"] as Set<isar_models.UTXO>?;
-      if (feeRateType is FeeRateType || feeRateAmount is int) {
+
+      if (customSatsPerVByte != null) {
+        // check for send all
+        bool isSendAll = false;
+        if (amount == balance.spendable) {
+          isSendAll = true;
+        }
+
+        final bool coinControl = utxos != null;
+
+        final result = await coinSelection(
+          satoshiAmountToSend: amount.raw.toInt(),
+          selectedTxFeeRate: -1,
+          satsPerVByte: customSatsPerVByte,
+          recipientAddress: address,
+          isSendAll: isSendAll,
+          utxos: utxos?.toList(),
+          coinControl: coinControl,
+        );
+
+        Logging.instance
+            .log("PREPARE SEND RESULT: $result", level: LogLevel.Info);
+        if (result is int) {
+          switch (result) {
+            case 1:
+              throw Exception("Insufficient balance!");
+            case 2:
+              throw Exception("Insufficient funds to pay for transaction fee!");
+            default:
+              throw Exception("Transaction failed with error code $result");
+          }
+        } else {
+          final hex = result["hex"];
+          if (hex is String) {
+            final fee = result["fee"] as int;
+            final vSize = result["vSize"] as int;
+
+            Logging.instance.log("txHex: $hex", level: LogLevel.Info);
+            Logging.instance.log("fee: $fee", level: LogLevel.Info);
+            Logging.instance.log("vsize: $vSize", level: LogLevel.Info);
+            // fee should never be less than vSize sanity check
+            if (fee < vSize) {
+              throw Exception(
+                  "Error in fee calculation: Transaction fee cannot be less than vSize");
+            }
+            return result as Map<String, dynamic>;
+          } else {
+            throw Exception("sent hex is not a String!!!");
+          }
+        }
+      } else if (feeRateType is FeeRateType || feeRateAmount is int) {
         late final int rate;
         if (feeRateType is FeeRateType) {
           int fee = 0;
@@ -1077,6 +1128,8 @@ class BitcoinWallet extends CoinServiceAPI
             case FeeRateType.slow:
               fee = feeObject.slow;
               break;
+            default:
+              throw ArgumentError("Invalid use of custom fee");
           }
           rate = fee;
         } else {
@@ -1293,6 +1346,7 @@ class BitcoinWallet extends CoinServiceAPI
       nonce: null,
       inputs: [],
       outputs: [],
+      numberOfMessages: null,
     );
 
     final address = txData["address"] is String
@@ -2190,6 +2244,7 @@ class BitcoinWallet extends CoinServiceAPI
     required String recipientAddress,
     required bool coinControl,
     required bool isSendAll,
+    int? satsPerVByte,
     int additionalOutputs = 0,
     List<isar_models.UTXO>? utxos,
   }) async {
@@ -2297,18 +2352,22 @@ class BitcoinWallet extends CoinServiceAPI
         recipients: [recipientAddress],
         satoshiAmounts: [satoshisBeingUsed - 1],
       ))["vSize"] as int;
-      int feeForOneOutput = estimateTxFee(
-        vSize: vSizeForOneOutput,
-        feeRatePerKB: selectedTxFeeRate,
-      );
+      int feeForOneOutput = satsPerVByte != null
+          ? (satsPerVByte * vSizeForOneOutput)
+          : estimateTxFee(
+              vSize: vSizeForOneOutput,
+              feeRatePerKB: selectedTxFeeRate,
+            );
 
-      final int roughEstimate = roughFeeEstimate(
-        spendableOutputs.length,
-        1,
-        selectedTxFeeRate,
-      ).raw.toInt();
-      if (feeForOneOutput < roughEstimate) {
-        feeForOneOutput = roughEstimate;
+      if (satsPerVByte == null) {
+        final int roughEstimate = roughFeeEstimate(
+          spendableOutputs.length,
+          1,
+          selectedTxFeeRate,
+        ).raw.toInt();
+        if (feeForOneOutput < roughEstimate) {
+          feeForOneOutput = roughEstimate;
+        }
       }
 
       final int amount = satoshiAmountToSend - feeForOneOutput;
@@ -2362,15 +2421,19 @@ class BitcoinWallet extends CoinServiceAPI
     }
 
     // Assume 1 output, only for recipient and no change
-    final feeForOneOutput = estimateTxFee(
-      vSize: vSizeForOneOutput,
-      feeRatePerKB: selectedTxFeeRate,
-    );
+    final feeForOneOutput = satsPerVByte != null
+        ? (satsPerVByte * vSizeForOneOutput)
+        : estimateTxFee(
+            vSize: vSizeForOneOutput,
+            feeRatePerKB: selectedTxFeeRate,
+          );
     // Assume 2 outputs, one for recipient and one for change
-    final feeForTwoOutputs = estimateTxFee(
-      vSize: vSizeForTwoOutPuts,
-      feeRatePerKB: selectedTxFeeRate,
-    );
+    final feeForTwoOutputs = satsPerVByte != null
+        ? (satsPerVByte * vSizeForTwoOutPuts)
+        : estimateTxFee(
+            vSize: vSizeForTwoOutPuts,
+            feeRatePerKB: selectedTxFeeRate,
+          );
 
     Logging.instance
         .log("feeForTwoOutputs: $feeForTwoOutputs", level: LogLevel.Info);
@@ -2565,6 +2628,7 @@ class BitcoinWallet extends CoinServiceAPI
         return coinSelection(
           satoshiAmountToSend: satoshiAmountToSend,
           selectedTxFeeRate: selectedTxFeeRate,
+          satsPerVByte: satsPerVByte,
           recipientAddress: recipientAddress,
           isSendAll: isSendAll,
           additionalOutputs: additionalOutputs + 1,
diff --git a/lib/services/coins/manager.dart b/lib/services/coins/manager.dart
index 932ac9ddb..94dfe5577 100644
--- a/lib/services/coins/manager.dart
+++ b/lib/services/coins/manager.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/material.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/balance.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart' as isar_models;
 import 'package:stackduo/models/models.dart';
@@ -234,6 +234,8 @@ class Manager with ChangeNotifier {
 
   bool get hasCoinControlSupport => _currentWallet is CoinControlInterface;
 
+  bool get hasTokenSupport => false;
+
   bool get hasWhirlpoolSupport => false;
 
   int get rescanOnOpenVersion =>
diff --git a/lib/services/coins/monero/monero_wallet.dart b/lib/services/coins/monero/monero_wallet.dart
index d58ea882a..947c3958d 100644
--- a/lib/services/coins/monero/monero_wallet.dart
+++ b/lib/services/coins/monero/monero_wallet.dart
@@ -23,8 +23,8 @@ import 'package:flutter_libmonero/monero/monero.dart';
 import 'package:flutter_libmonero/view_model/send/output.dart' as monero_output;
 import 'package:isar/isar.dart';
 import 'package:mutex/mutex.dart';
-import 'package:stackduo/db/main_db.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/balance.dart';
 import 'package:stackduo/models/isar/models/isar_models.dart' as isar_models;
 import 'package:stackduo/models/node_model.dart';
@@ -448,6 +448,8 @@ class MoneroWallet extends CoinServiceAPI with WalletCache, WalletDB {
           case FeeRateType.slow:
             feePriority = MoneroTransactionPriority.slow;
             break;
+          default:
+            throw ArgumentError("Invalid use of custom fee");
         }
 
         Future<PendingTransaction>? awaitPendingTransaction;
@@ -854,6 +856,10 @@ class MoneroWallet extends CoinServiceAPI with WalletCache, WalletDB {
     //
     String address = walletBase!.getTransactionAddress(chain, index);
 
+    if (address.contains("111")) {
+      return await _generateAddressForChain(chain, index + 1);
+    }
+
     return isar_models.Address(
       walletId: walletId,
       derivationIndex: index,
@@ -954,6 +960,7 @@ class MoneroWallet extends CoinServiceAPI with WalletCache, WalletDB {
           nonce: null,
           inputs: [],
           outputs: [],
+          numberOfMessages: null,
         );
 
         txnsData.add(Tuple2(txn, address));
diff --git a/lib/services/debug_service.dart b/lib/services/debug_service.dart
index 3909cd541..295403d55 100644
--- a/lib/services/debug_service.dart
+++ b/lib/services/debug_service.dart
@@ -34,7 +34,7 @@ class DebugService extends ChangeNotifier {
     // });
   }
 
-  List<Log> get recentLogs => isar.logs.where().limit(200).findAllSync();
+  List<Log> get recentLogs => isar.logs.where().sortByTimestampInMillisUTCDesc().limit(100).findAllSync();
 
   // Future<void> updateRecentLogs() async {
   //   int totalCount = await isar.logs.count();
diff --git a/lib/services/exchange/change_now/change_now_api.dart b/lib/services/exchange/change_now/change_now_api.dart
index f6246d30c..d3dd088f9 100644
--- a/lib/services/exchange/change_now/change_now_api.dart
+++ b/lib/services/exchange/change_now/change_now_api.dart
@@ -201,6 +201,89 @@ class ChangeNowAPI {
     }
   }
 
+  Future<ExchangeResponse<List<Currency>>> getCurrenciesV2(
+      //     {
+      //   bool? fixedRate,
+      //   bool? active,
+      // }
+      ) async {
+    Map<String, dynamic>? params;
+
+    // if (active != null || fixedRate != null) {
+    //   params = {};
+    //   if (fixedRate != null) {
+    //     params.addAll({"fixedRate": fixedRate.toString()});
+    //   }
+    //   if (active != null) {
+    //     params.addAll({"active": active.toString()});
+    //   }
+    // }
+
+    final uri = _buildUriV2("/exchange/currencies", params);
+
+    try {
+      // json array is expected here
+      final jsonArray = await _makeGetRequest(uri);
+
+      try {
+        final result = await compute(
+          _parseV2CurrenciesJson,
+          jsonArray as List<dynamic>,
+        );
+        return result;
+      } catch (e, s) {
+        Logging.instance.log("getAvailableCurrencies exception: $e\n$s",
+            level: LogLevel.Error);
+        return ExchangeResponse(
+          exception: ExchangeException(
+            "Error: $jsonArray",
+            ExchangeExceptionType.serializeResponseError,
+          ),
+        );
+      }
+    } catch (e, s) {
+      Logging.instance.log("getAvailableCurrencies exception: $e\n$s",
+          level: LogLevel.Error);
+      return ExchangeResponse(
+        exception: ExchangeException(
+          e.toString(),
+          ExchangeExceptionType.generic,
+        ),
+      );
+    }
+  }
+
+  ExchangeResponse<List<Currency>> _parseV2CurrenciesJson(
+    List<dynamic> args,
+  ) {
+    try {
+      List<Currency> currencies = [];
+
+      for (final json in args) {
+        try {
+          final map = Map<String, dynamic>.from(json as Map);
+          currencies.add(
+            Currency.fromJson(
+              map,
+              rateType: (map["supportsFixedRate"] as bool)
+                  ? SupportedRateType.both
+                  : SupportedRateType.estimated,
+              exchangeName: ChangeNowExchange.exchangeName,
+            ),
+          );
+        } catch (_) {
+          return ExchangeResponse(
+              exception: ExchangeException("Failed to serialize $json",
+                  ExchangeExceptionType.serializeResponseError));
+        }
+      }
+
+      return ExchangeResponse(value: currencies);
+    } catch (_) {
+      rethrow;
+    }
+  }
+
   /// This API endpoint returns the array of markets available for the specified currency be default.
   /// The availability of a particular pair is determined by the 'isAvailable' field.
   ///
diff --git a/lib/services/exchange/change_now/change_now_exchange.dart b/lib/services/exchange/change_now/change_now_exchange.dart
index 391851a40..4dc52e830 100644
--- a/lib/services/exchange/change_now/change_now_exchange.dart
+++ b/lib/services/exchange/change_now/change_now_exchange.dart
@@ -82,10 +82,11 @@ class ChangeNowExchange extends Exchange {
   Future<ExchangeResponse<List<Currency>>> getAllCurrencies(
     bool fixedRate,
   ) async {
-    return await ChangeNowAPI.instance.getAvailableCurrencies(
-      fixedRate: fixedRate ? true : null,
-      active: true,
-    );
+    return await ChangeNowAPI.instance.getCurrenciesV2();
+    // return await ChangeNowAPI.instance.getAvailableCurrencies(
+    //   fixedRate: fixedRate ? true : null,
+    //   active: true,
+    // );
   }
 
   @override
diff --git a/lib/services/exchange/exchange_data_loading_service.dart b/lib/services/exchange/exchange_data_loading_service.dart
index 62edcadf1..7a9ac144b 100644
--- a/lib/services/exchange/exchange_data_loading_service.dart
+++ b/lib/services/exchange/exchange_data_loading_service.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/exchange/active_pair.dart';
 import 'package:stackduo/models/exchange/aggregate_currency.dart';
 import 'package:stackduo/models/isar/exchange_cache/currency.dart';
diff --git a/lib/services/mixins/coin_control_interface.dart b/lib/services/mixins/coin_control_interface.dart
index dd0a99194..c4f25e2ab 100644
--- a/lib/services/mixins/coin_control_interface.dart
+++ b/lib/services/mixins/coin_control_interface.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/balance.dart';
 import 'package:stackduo/services/event_bus/events/global/balance_refreshed_event.dart';
 import 'package:stackduo/services/event_bus/global_event_bus.dart';
diff --git a/lib/services/mixins/electrum_x_parsing.dart b/lib/services/mixins/electrum_x_parsing.dart
index 0865cb8ee..31bb51b24 100644
--- a/lib/services/mixins/electrum_x_parsing.dart
+++ b/lib/services/mixins/electrum_x_parsing.dart
@@ -258,6 +258,7 @@ mixin ElectrumXParsing {
       nonce: null,
       inputs: ins,
       outputs: outs,
+      numberOfMessages: null,
     );
 
     return Tuple2(tx, transactionAddress);
diff --git a/lib/services/mixins/paynym_wallet_interface.dart b/lib/services/mixins/paynym_wallet_interface.dart
index bb09e2622..179a55388 100644
--- a/lib/services/mixins/paynym_wallet_interface.dart
+++ b/lib/services/mixins/paynym_wallet_interface.dart
@@ -10,7 +10,7 @@ import 'package:bitcoindart/src/utils/constants/op.dart' as op;
 import 'package:bitcoindart/src/utils/script.dart' as bscript;
 import 'package:isar/isar.dart';
 import 'package:pointycastle/digests/sha256.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/electrumx_rpc/electrumx.dart';
 import 'package:stackduo/exceptions/wallet/insufficient_balance_exception.dart';
 import 'package:stackduo/exceptions/wallet/paynym_send_exception.dart';
diff --git a/lib/services/mixins/wallet_cache.dart b/lib/services/mixins/wallet_cache.dart
index da18230cd..9ad5a7eb5 100644
--- a/lib/services/mixins/wallet_cache.dart
+++ b/lib/services/mixins/wallet_cache.dart
@@ -1,4 +1,4 @@
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/balance.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
diff --git a/lib/services/mixins/wallet_db.dart b/lib/services/mixins/wallet_db.dart
index 5958521a7..4b4ba4b52 100644
--- a/lib/services/mixins/wallet_db.dart
+++ b/lib/services/mixins/wallet_db.dart
@@ -1,4 +1,4 @@
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 
 mixin WalletDB {
   MainDB? _db;
diff --git a/lib/services/node_service.dart b/lib/services/node_service.dart
index fccc0de69..779ccba56 100644
--- a/lib/services/node_service.dart
+++ b/lib/services/node_service.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/node_model.dart';
 import 'package:stackduo/utilities/default_nodes.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
diff --git a/lib/services/notes_service.dart b/lib/services/notes_service.dart
index caeaf2370..d93749293 100644
--- a/lib/services/notes_service.dart
+++ b/lib/services/notes_service.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/utilities/logger.dart';
 
 class NotesService extends ChangeNotifier {
diff --git a/lib/services/notifications_service.dart b/lib/services/notifications_service.dart
index dc54d42fd..c60b8d79a 100644
--- a/lib/services/notifications_service.dart
+++ b/lib/services/notifications_service.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:stackduo/electrumx_rpc/electrumx.dart';
 import 'package:stackduo/exceptions/electrumx/no_such_transaction.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
 import 'package:stackduo/models/notification_model.dart';
 import 'package:stackduo/services/exchange/exchange.dart';
diff --git a/lib/services/price.dart b/lib/services/price.dart
index 3319d55db..ce4c475de 100644
--- a/lib/services/price.dart
+++ b/lib/services/price.dart
@@ -4,7 +4,7 @@ import 'dart:convert';
 import 'package:decimal/decimal.dart';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/logger.dart';
 import 'package:stackduo/utilities/prefs.dart';
diff --git a/lib/services/trade_notes_service.dart b/lib/services/trade_notes_service.dart
index c42e6b4d1..8e02b7528 100644
--- a/lib/services/trade_notes_service.dart
+++ b/lib/services/trade_notes_service.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 
 class TradeNotesService extends ChangeNotifier {
   Map<String, String> get all {
diff --git a/lib/services/trade_sent_from_stack_service.dart b/lib/services/trade_sent_from_stack_service.dart
index 3d796741c..6824f3977 100644
--- a/lib/services/trade_sent_from_stack_service.dart
+++ b/lib/services/trade_sent_from_stack_service.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/trade_wallet_lookup.dart';
 
 class TradeSentFromStackService extends ChangeNotifier {
diff --git a/lib/services/trade_service.dart b/lib/services/trade_service.dart
index 2b13b0105..aa749f63e 100644
--- a/lib/services/trade_service.dart
+++ b/lib/services/trade_service.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/cupertino.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
 
 class TradesService extends ChangeNotifier {
diff --git a/lib/services/transaction_notification_tracker.dart b/lib/services/transaction_notification_tracker.dart
index 5de3777a5..4e4f2acaa 100644
--- a/lib/services/transaction_notification_tracker.dart
+++ b/lib/services/transaction_notification_tracker.dart
@@ -1,4 +1,4 @@
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 
 class TransactionNotificationTracker {
   final String walletId;
diff --git a/lib/services/wallets.dart b/lib/services/wallets.dart
index 7d009f061..a254997ea 100644
--- a/lib/services/wallets.dart
+++ b/lib/services/wallets.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/node_model.dart';
 import 'package:stackduo/services/coins/coin_service.dart';
 import 'package:stackduo/services/coins/manager.dart';
diff --git a/lib/services/wallets_service.dart b/lib/services/wallets_service.dart
index 3024ea284..43d182270 100644
--- a/lib/services/wallets_service.dart
+++ b/lib/services/wallets_service.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_libmonero/monero/monero.dart';
-import 'package:stackduo/db/main_db.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/services/notifications_service.dart';
 import 'package:stackduo/services/trade_sent_from_stack_service.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
diff --git a/lib/themes/coin_card_provider.dart b/lib/themes/coin_card_provider.dart
new file mode 100644
index 000000000..fae5b7d34
--- /dev/null
+++ b/lib/themes/coin_card_provider.dart
@@ -0,0 +1,24 @@
+/*
+ * This file is part of Stack Wallet.
+ *
+ * Copyright (c) 2023 Cypher Stack
+ * All Rights Reserved.
+ * The code is distributed under GPLv3 license, see LICENSE file for details.
+ * Generated by Cypher Stack on 2023-05-26
+ *
+ */
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:stackduo/models/isar/stack_theme.dart';
+import 'package:stackduo/themes/theme_providers.dart';
+import 'package:stackduo/utilities/enums/coin_enum.dart';
+
+final coinCardProvider = Provider.family<String?, Coin>((ref, coin) {
+  final assets = ref.watch(themeAssetsProvider);
+
+  if (assets is ThemeAssetsV3) {
+    return assets.coinCardImages?[coin.mainNetVersion];
+  } else {
+    return null;
+  }
+});
diff --git a/lib/themes/coin_icon_provider.dart b/lib/themes/coin_icon_provider.dart
index 6af8cfc1e..c1d83d627 100644
--- a/lib/themes/coin_icon_provider.dart
+++ b/lib/themes/coin_icon_provider.dart
@@ -14,7 +14,9 @@ final coinIconProvider = Provider.family<String, Coin>((ref, coin) {
       case Coin.monero:
         return assets.monero;
     }
+  } else if (assets is ThemeAssetsV2) {
+    return (assets).coinIcons[coin.mainNetVersion]!;
   } else {
-    return (assets as ThemeAssetsV2).coinIcons[coin.mainNetVersion]!;
+    return (assets as ThemeAssetsV3).coinIcons[coin.mainNetVersion]!;
   }
 });
diff --git a/lib/themes/coin_image_provider.dart b/lib/themes/coin_image_provider.dart
index ca4a19698..3761aab37 100644
--- a/lib/themes/coin_image_provider.dart
+++ b/lib/themes/coin_image_provider.dart
@@ -15,8 +15,10 @@ final coinImageProvider = Provider.family<String, Coin>((ref, coin) {
       case Coin.monero:
         return assets.moneroImage;
     }
+  } else if (assets is ThemeAssetsV2) {
+    return (assets).coinImages[coin.mainNetVersion]!;
   } else {
-    return (assets as ThemeAssetsV2).coinImages[coin.mainNetVersion]!;
+    return (assets as ThemeAssetsV3).coinImages[coin.mainNetVersion]!;
   }
 });
 
@@ -31,8 +33,13 @@ final coinImageSecondaryProvider = Provider.family<String, Coin>((ref, coin) {
 
       case Coin.monero:
         return assets.moneroImageSecondary;
+
+      default:
+        return assets.stackIcon;
     }
+  } else if (assets is ThemeAssetsV2) {
+    return (assets).coinSecondaryImages[coin.mainNetVersion]!;
   } else {
-    return (assets as ThemeAssetsV2).coinSecondaryImages[coin.mainNetVersion]!;
+    return (assets as ThemeAssetsV3).coinSecondaryImages[coin.mainNetVersion]!;
   }
 });
diff --git a/lib/themes/theme_service.dart b/lib/themes/theme_service.dart
index db5b851e1..ad72e491a 100644
--- a/lib/themes/theme_service.dart
+++ b/lib/themes/theme_service.dart
@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:http/http.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/stack_theme.dart';
 import 'package:stackduo/utilities/logger.dart';
 import 'package:stackduo/utilities/stack_file_system.dart';
diff --git a/lib/utilities/amount/amount.dart b/lib/utilities/amount/amount.dart
index 30619bb0d..198b1c5f0 100644
--- a/lib/utilities/amount/amount.dart
+++ b/lib/utilities/amount/amount.dart
@@ -22,6 +22,39 @@ class Amount {
       : assert(fractionDigits >= 0),
         _value = amount.shift(fractionDigits).toBigInt();
 
+  static Amount? tryParseFiatString(
+    String value, {
+    required String locale,
+  }) {
+    final parts = value.split(" ");
+
+    if (parts.first.isEmpty) {
+      return null;
+    }
+
+    String str = parts.first;
+    if (str.startsWith(RegExp(r'[+-]'))) {
+      str = str.substring(1);
+    }
+
+    if (str.isEmpty) {
+      return null;
+    }
+
+    // get number symbols for decimal place and group separator
+    final numberSymbols = numberFormatSymbols[locale] as NumberSymbols? ??
+        numberFormatSymbols[locale.substring(0, 2)] as NumberSymbols?;
+
+    final groupSeparator = numberSymbols?.GROUP_SEP ?? ",";
+    final decimalSeparator = numberSymbols?.DECIMAL_SEP ?? ".";
+
+    str = str.replaceAll(groupSeparator, "");
+
+    final decimalString = str.replaceFirst(decimalSeparator, ".");
+
+    return Decimal.tryParse(decimalString)?.toAmount(fractionDigits: 2);
+  }
+
   // ===========================================================================
   // ======= Instance properties ===============================================
 
@@ -52,29 +85,52 @@ class Amount {
     return jsonEncode(toMap());
   }
 
-  String localizedStringAsFixed({
+  String fiatString({
     required String locale,
-    int? decimalPlaces,
   }) {
-    decimalPlaces ??= fractionDigits;
-    assert(decimalPlaces >= 0);
-
     final wholeNumber = decimal.truncate();
 
-    if (decimalPlaces == 0) {
-      return wholeNumber.toStringAsFixed(0);
-    }
+    // get number symbols for decimal place and group separator
+    final numberSymbols = numberFormatSymbols[locale] as NumberSymbols? ??
+        numberFormatSymbols[locale.substring(0, 2)] as NumberSymbols?;
 
-    final String separator =
-        (numberFormatSymbols[locale] as NumberSymbols?)?.DECIMAL_SEP ??
-            (numberFormatSymbols[locale.substring(0, 2)] as NumberSymbols?)
-                ?.DECIMAL_SEP ??
-            ".";
+    final String separator = numberSymbols?.DECIMAL_SEP ?? ".";
 
     final fraction = decimal - wholeNumber;
 
-    return "${wholeNumber.toStringAsFixed(0)}$separator${fraction.toStringAsFixed(decimalPlaces).substring(2)}";
+    String wholeNumberString = wholeNumber.toStringAsFixed(0);
+    // insert group separator
+    final regex = RegExp(r'\B(?=(\d{3})+(?!\d))');
+    wholeNumberString = wholeNumberString.replaceAllMapped(
+      regex,
+      (m) => "${m.group(0)}${numberSymbols?.GROUP_SEP ?? ","}",
+    );
+
+    return "$wholeNumberString$separator${fraction.toStringAsFixed(2).substring(2)}";
   }
+  // String localizedStringAsFixed({
+  //   required String locale,
+  //   int? decimalPlaces,
+  // }) {
+  //   decimalPlaces ??= fractionDigits;
+  //   assert(decimalPlaces >= 0);
+  //
+  //   final wholeNumber = decimal.truncate();
+  //
+  //   if (decimalPlaces == 0) {
+  //     return wholeNumber.toStringAsFixed(0);
+  //   }
+  //
+  //   final String separator =
+  //       (numberFormatSymbols[locale] as NumberSymbols?)?.DECIMAL_SEP ??
+  //           (numberFormatSymbols[locale.substring(0, 2)] as NumberSymbols?)
+  //               ?.DECIMAL_SEP ??
+  //           ".";
+  //
+  //   final fraction = decimal - wholeNumber;
+  //
+  //   return "${wholeNumber.toStringAsFixed(0)}$separator${fraction.toStringAsFixed(decimalPlaces).substring(2)}";
+  // }
 
   // ===========================================================================
   // ======= Deserialization ===================================================
diff --git a/lib/utilities/amount/amount_formatter.dart b/lib/utilities/amount/amount_formatter.dart
new file mode 100644
index 000000000..db119c537
--- /dev/null
+++ b/lib/utilities/amount/amount_formatter.dart
@@ -0,0 +1,72 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:stackduo/providers/global/locale_provider.dart';
+import 'package:stackduo/providers/global/prefs_provider.dart';
+import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_unit.dart';
+import 'package:stackduo/utilities/enums/coin_enum.dart';
+
+final pAmountUnit = Provider.family<AmountUnit, Coin>(
+  (ref, coin) => ref.watch(
+    prefsChangeNotifierProvider.select(
+      (value) => value.amountUnit(coin),
+    ),
+  ),
+);
+final pMaxDecimals = Provider.family<int, Coin>(
+  (ref, coin) => ref.watch(
+    prefsChangeNotifierProvider.select(
+      (value) => value.maxDecimals(coin),
+    ),
+  ),
+);
+
+final pAmountFormatter = Provider.family<AmountFormatter, Coin>((ref, coin) {
+  return AmountFormatter(
+    unit: ref.watch(pAmountUnit(coin)),
+    locale: ref.watch(
+      localeServiceChangeNotifierProvider.select((value) => value.locale),
+    ),
+    coin: coin,
+    maxDecimals: ref.watch(pMaxDecimals(coin)),
+  );
+});
+
+class AmountFormatter {
+  final AmountUnit unit;
+  final String locale;
+  final Coin coin;
+  final int maxDecimals;
+
+  AmountFormatter({
+    required this.unit,
+    required this.locale,
+    required this.coin,
+    required this.maxDecimals,
+  });
+
+  String format(
+    Amount amount, {
+    String? overrideUnit,
+    dynamic ethContract,
+    bool withUnitName = true,
+    bool indicatePrecisionLoss = true,
+  }) {
+    return unit.displayAmount(
+      amount: amount,
+      locale: locale,
+      coin: coin,
+      maxDecimalPlaces: maxDecimals,
+      withUnitName: withUnitName,
+      indicatePrecisionLoss: indicatePrecisionLoss,
+      overrideUnit: overrideUnit,
+      tokenContract: ethContract,
+    );
+  }
+
+  Amount? tryParse(
+    String string, {
+    dynamic ethContract,
+  }) {
+    return unit.tryParse(string, locale: locale, coin: coin);
+  }
+}
diff --git a/lib/utilities/amount/amount_input_formatter.dart b/lib/utilities/amount/amount_input_formatter.dart
new file mode 100644
index 000000000..99c55e387
--- /dev/null
+++ b/lib/utilities/amount/amount_input_formatter.dart
@@ -0,0 +1,93 @@
+import 'dart:math';
+
+import 'package:flutter/services.dart';
+import 'package:intl/number_symbols.dart';
+import 'package:intl/number_symbols_data.dart';
+import 'package:stackduo/utilities/amount/amount_unit.dart';
+
+class AmountInputFormatter extends TextInputFormatter {
+  final int decimals;
+  final String locale;
+  final AmountUnit? unit;
+
+  AmountInputFormatter({
+    required this.decimals,
+    required this.locale,
+    this.unit,
+  });
+
+  @override
+  TextEditingValue formatEditUpdate(
+      TextEditingValue oldValue, TextEditingValue newValue) {
+    // get number symbols for decimal place and group separator
+    final numberSymbols = numberFormatSymbols[locale] as NumberSymbols? ??
+        numberFormatSymbols[locale.substring(0, 2)] as NumberSymbols?;
+
+    final decimalSeparator = numberSymbols?.DECIMAL_SEP ?? ".";
+    final groupSeparator = numberSymbols?.GROUP_SEP ?? ",";
+
+    String newText = newValue.text.replaceAll(groupSeparator, "");
+
+    final selectionIndexFromTheRight =
+        newValue.text.length - newValue.selection.end;
+
+    String? fraction;
+    if (newText.contains(decimalSeparator)) {
+      final parts = newText.split(decimalSeparator);
+
+      if (parts.length > 2) {
+        return oldValue;
+      }
+      if (newText.startsWith(decimalSeparator)) {
+        return TextEditingValue(
+          text: newText,
+          selection: TextSelection.collapsed(
+            offset: newText.length - selectionIndexFromTheRight,
+          ),
+        );
+      }
+
+      newText = parts.first;
+      if (parts.length == 2) {
+        fraction = parts.last;
+      } else {
+        fraction = "";
+      }
+
+      final fractionDigits =
+          unit == null ? decimals : max(decimals - unit!.shift, 0);
+
+      if (fraction.length > fractionDigits) {
+        return oldValue;
+      }
+    }
+
+    if (newText.trim() == '' || newText.trim() == '0') {
+      return newValue.copyWith(text: '');
+    } else if (BigInt.parse(newText) < BigInt.one) {
+      return newValue.copyWith(text: '');
+    }
+
+    // insert group separator
+    final regex = RegExp(r'\B(?=(\d{3})+(?!\d))');
+
+    String newString = newText.replaceAllMapped(
+      regex,
+      (m) => "${m.group(0)}${numberSymbols?.GROUP_SEP ?? ","}",
+    );
+
+    if (fraction != null) {
+      newString += decimalSeparator;
+      if (fraction.isNotEmpty) {
+        newString += fraction;
+      }
+    }
+
+    return TextEditingValue(
+      text: newString,
+      selection: TextSelection.collapsed(
+        offset: newString.length - selectionIndexFromTheRight,
+      ),
+    );
+  }
+}
diff --git a/lib/utilities/amount/amount_unit.dart b/lib/utilities/amount/amount_unit.dart
index 114fbaa57..afaf31639 100644
--- a/lib/utilities/amount/amount_unit.dart
+++ b/lib/utilities/amount/amount_unit.dart
@@ -6,6 +6,7 @@ import 'package:intl/number_symbols_data.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 
+// preserve index order as index is used to store value in preferences
 enum AmountUnit {
   normal(0),
   milli(3),
@@ -14,10 +15,25 @@ enum AmountUnit {
   pico(12),
   femto(15),
   atto(18),
+  zepto(21),
+  yocto(24),
+  ronto(27),
+  quecto(30),
   ;
 
   const AmountUnit(this.shift);
   final int shift;
+
+  static List<AmountUnit> valuesForCoin(Coin coin) {
+    switch (coin) {
+      case Coin.bitcoinTestNet:
+      case Coin.bitcoin:
+        return AmountUnit.values.sublist(0, 4);
+
+      case Coin.monero:
+        return AmountUnit.values.sublist(0, 5);
+    }
+  }
 }
 
 extension AmountUnitExt on AmountUnit {
@@ -30,21 +46,144 @@ extension AmountUnitExt on AmountUnit {
       case AmountUnit.micro:
         return "µ${coin.ticker}";
       case AmountUnit.nano:
-        if (coin == Coin.monero) {
+        // if (coin == Coin.ethereum) {
+        //   return "gwei";
+        // } else
+        if (
+            // coin == Coin.wownero ||
+            coin == Coin.monero
+            //   ||
+            // coin == Coin.nano ||
+            // coin == Coin.banano
+            ) {
           return "n${coin.ticker}";
         } else {
           return "sats";
         }
       case AmountUnit.pico:
-        if (coin == Coin.monero) {
+        // if (coin == Coin.ethereum) {
+        //   return "mwei";
+        // } else
+        if (
+            // coin == Coin.wownero ||
+            coin == Coin.monero
+            //   ||
+            // coin == Coin.nano ||
+            // coin == Coin.banano
+            ) {
           return "p${coin.ticker}";
         } else {
           return "invalid";
         }
       case AmountUnit.femto:
+      // if (coin == Coin.ethereum) {
+      //   return "kwei";
+      // } else if (coin == Coin.nano || coin == Coin.banano) {
+      //   return "f${coin.ticker}";
+      // } else {
+      //   return "invalid";
+      // }
       case AmountUnit.atto:
+      // if (coin == Coin.ethereum) {
+      //   return "wei";
+      // } else if (coin == Coin.nano || coin == Coin.banano) {
+      //   return "a${coin.ticker}";
+      // } else {
+      //   return "invalid";
+      // }
+      case AmountUnit.zepto:
+      // if (coin == Coin.nano || coin == Coin.banano) {
+      //   return "z${coin.ticker}";
+      // } else {
+      //   return "invalid";
+      // }
+      case AmountUnit.yocto:
+      // if (coin == Coin.nano || coin == Coin.banano) {
+      //   return "y${coin.ticker}";
+      // } else {
+      //   return "invalid";
+      // }
+      case AmountUnit.ronto:
+      // if (coin == Coin.nano || coin == Coin.banano) {
+      //   return "r${coin.ticker}";
+      // } else {
+      //   return "invalid";
+      // }
+      case AmountUnit.quecto:
+        // if (coin == Coin.nano || coin == Coin.banano) {
+        //   return "q${coin.ticker}";
+        // } else {
         return "invalid";
+      // }
+    }
+  }
+
+  String unitForContract(dynamic contract) {
+    switch (this) {
+      // case AmountUnit.normal:
+      //   return contract.symbol;
+      // case AmountUnit.milli:
+      //   return "m${contract.symbol}";
+      // case AmountUnit.micro:
+      //   return "µ${contract.symbol}";
+      // case AmountUnit.nano:
+      //   return "gwei";
+      // case AmountUnit.pico:
+      //   return "mwei";
+      // case AmountUnit.femto:
+      //   return "kwei";
+      // case AmountUnit.atto:
+      //   return "wei";
+      default:
+        throw ArgumentError(
+          "Duo has no eth",
+        );
+    }
+  }
+
+  Amount? tryParse(
+    String value, {
+    required String locale,
+    required Coin coin,
+    dynamic tokenContract,
+  }) {
+    final precisionLost = value.startsWith("~");
+
+    final parts = (precisionLost ? value.substring(1) : value).split(" ");
+
+    if (parts.first.isEmpty) {
+      return null;
+    }
+
+    String str = parts.first;
+    if (str.startsWith(RegExp(r'[+-]'))) {
+      str = str.substring(1);
+    }
+
+    if (str.isEmpty) {
+      return null;
+    }
+
+    // get number symbols for decimal place and group separator
+    final numberSymbols = numberFormatSymbols[locale] as NumberSymbols? ??
+        numberFormatSymbols[locale.substring(0, 2)] as NumberSymbols?;
+
+    final groupSeparator = numberSymbols?.GROUP_SEP ?? ",";
+    final decimalSeparator = numberSymbols?.DECIMAL_SEP ?? ".";
+
+    str = str.replaceAll(groupSeparator, "");
+
+    final decimalString = str.replaceFirst(decimalSeparator, ".");
+    final Decimal? decimal = Decimal.tryParse(decimalString);
+
+    if (decimal == null) {
+      return null;
     }
+
+    final int decimalPlaces = tokenContract?.decimals as int? ?? coin.decimals;
+    final realShift = math.min(shift, decimalPlaces);
+
+    return decimal.shift(0 - realShift).toAmount(fractionDigits: decimalPlaces);
   }
 
   String displayAmount({
@@ -52,8 +191,13 @@ extension AmountUnitExt on AmountUnit {
     required String locale,
     required Coin coin,
     required int maxDecimalPlaces,
+    bool withUnitName = true,
+    bool indicatePrecisionLoss = true,
+    String? overrideUnit,
+    dynamic? tokenContract,
   }) {
     assert(maxDecimalPlaces >= 0);
+
     // ensure we don't shift past minimum atomic value
     final realShift = math.min(shift, amount.fractionDigits);
 
@@ -69,18 +213,55 @@ extension AmountUnitExt on AmountUnit {
     // start building the return value with just the whole value
     String returnValue = wholeNumber.toString();
 
+    // get number symbols for decimal place and group separator
+    final numberSymbols = numberFormatSymbols[locale] as NumberSymbols? ??
+        numberFormatSymbols[locale.substring(0, 2)] as NumberSymbols?;
+
+    // insert group separator
+    final regex = RegExp(r'\B(?=(\d{3})+(?!\d))');
+    returnValue = returnValue.replaceAllMapped(
+      regex,
+      (m) => "${m.group(0)}${numberSymbols?.GROUP_SEP ?? ","}",
+    );
+
+    // if true and withUnitName is true, we will show "~" prepended on amount
+    bool didLosePrecision = false;
+
     // if any decimal places should be shown continue building the return value
     if (places > 0) {
       // get the fractional value
       final Decimal fraction = shifted - shifted.truncate();
 
-      // get final decimal based on max precision wanted
-      final int actualDecimalPlaces = math.min(places, maxDecimalPlaces);
+      // get final decimal based on max precision wanted while ensuring that
+      // maxDecimalPlaces doesn't exceed the max per coin
+      final int updatedMax;
+      if (tokenContract != null) {
+        updatedMax = maxDecimalPlaces > (tokenContract.decimals as int)
+            ? tokenContract.decimals as int
+            : maxDecimalPlaces;
+      } else {
+        updatedMax =
+            maxDecimalPlaces > coin.decimals ? coin.decimals : maxDecimalPlaces;
+      }
+      final int actualDecimalPlaces = math.min(places, updatedMax);
 
       // get remainder string without the prepending "0."
-      String remainder = fraction.toString().substring(2);
+      final fractionString = fraction.toString();
+      String remainder;
+      if (fractionString.length > 2) {
+        remainder = fraction.toString().substring(2);
+      } else {
+        remainder = "0";
+      }
 
       if (remainder.length > actualDecimalPlaces) {
+        // check for loss of precision
+        final remainingRemainder =
+            BigInt.tryParse(remainder.substring(actualDecimalPlaces));
+        if (remainingRemainder != null) {
+          didLosePrecision = remainingRemainder > BigInt.zero;
+        }
+
         // trim unwanted trailing digits
         remainder = remainder.substring(0, actualDecimalPlaces);
       } else if (remainder.length < actualDecimalPlaces) {
@@ -91,17 +272,29 @@ extension AmountUnitExt on AmountUnit {
       }
 
       // get decimal separator based on locale
-      final String separator =
-          (numberFormatSymbols[locale] as NumberSymbols?)?.DECIMAL_SEP ??
-              (numberFormatSymbols[locale.substring(0, 2)] as NumberSymbols?)
-                  ?.DECIMAL_SEP ??
-              ".";
+      final String separator = numberSymbols?.DECIMAL_SEP ?? ".";
 
       // append separator and fractional amount
       returnValue += "$separator$remainder";
     }
 
+    if (!withUnitName && !indicatePrecisionLoss) {
+      return returnValue;
+    }
+
+    if (didLosePrecision && indicatePrecisionLoss) {
+      returnValue = "~$returnValue";
+    }
+
+    if (!withUnitName && indicatePrecisionLoss) {
+      return returnValue;
+    }
+
     // return the value with the proper unit symbol
-    return "$returnValue ${unitForCoin(coin)}";
+    if (tokenContract != null) {
+      overrideUnit = unitForContract(tokenContract);
+    }
+
+    return "$returnValue ${overrideUnit ?? unitForCoin(coin)}";
   }
 }
diff --git a/lib/utilities/block_explorers.dart b/lib/utilities/block_explorers.dart
index 7d3836db7..322ee953c 100644
--- a/lib/utilities/block_explorers.dart
+++ b/lib/utilities/block_explorers.dart
@@ -1,4 +1,4 @@
-import 'package:stackduo/db/main_db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/isar/models/block_explorer.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 
@@ -29,6 +29,7 @@ Future<int> setBlockExplorerForCoin({
   );
 }
 
+// Returns the block explorer URL for the given coin and txid
 Uri getBlockExplorerTransactionUrlFor({
   required Coin coin,
   required String txid,
diff --git a/lib/utilities/clipboard_interface.dart b/lib/utilities/clipboard_interface.dart
index 80cdf8a47..b1451cb31 100644
--- a/lib/utilities/clipboard_interface.dart
+++ b/lib/utilities/clipboard_interface.dart
@@ -23,8 +23,8 @@ class FakeClipboard implements ClipboardInterface {
   String? _value;
 
   @override
-  Future<ClipboardData> getData(String format) async {
-    return ClipboardData(text: _value);
+  Future<ClipboardData?> getData(String format) async {
+    return _value == null ? null : ClipboardData(text: _value!);
   }
 
   @override
diff --git a/lib/utilities/constants.dart b/lib/utilities/constants.dart
index 7285e0a6d..e566caaea 100644
--- a/lib/utilities/constants.dart
+++ b/lib/utilities/constants.dart
@@ -25,9 +25,15 @@ abstract class Constants {
   // static bool enableBuy = enableExchange;
   // // true; // true for development,
 
-  //TODO: correct for monero?
-  static const int _satsPerCoinMonero = 1000000000000;
-  static const int _satsPerCoin = 100000000;
+  static final BigInt _satsPerCoinECash = BigInt.from(100);
+  static final BigInt _satsPerCoinEthereum = BigInt.from(1000000000000000000);
+  static final BigInt _satsPerCoinMonero = BigInt.from(1000000000000);
+  static final BigInt _satsPerCoinWownero = BigInt.from(100000000000);
+  static final BigInt _satsPerCoinNano =
+      BigInt.parse("1000000000000000000000000000000"); // 1*10^30
+  static final BigInt _satsPerCoinBanano =
+      BigInt.parse("100000000000000000000000000000"); // 1*10^29
+  static final BigInt _satsPerCoin = BigInt.from(100000000);
   static const int _decimalPlaces = 8;
   static const int _decimalPlacesWownero = 11;
   static const int _decimalPlacesMonero = 12;
@@ -38,12 +44,11 @@ abstract class Constants {
   // Enable Logger.print statements
   static const bool disableLogger = false;
 
-  static const int currentHiveDbVersion = 9;
   static const int currentDataVersion = 10;
 
   static const int rescanV1 = 1;
 
-  static int satsPerCoin(Coin coin) {
+  static BigInt satsPerCoin(Coin coin) {
     switch (coin) {
       case Coin.bitcoin:
       case Coin.bitcoinTestNet:
@@ -92,8 +97,16 @@ abstract class Constants {
     }
   }
 
-  static const int seedPhraseWordCountBip39 = 12;
-  static const int seedPhraseWordCountMonero = 25;
+  static int defaultSeedPhraseLengthFor({required Coin coin}) {
+    switch (coin) {
+      case Coin.bitcoin:
+      case Coin.bitcoinTestNet:
+        return 12;
+
+      case Coin.monero:
+        return 25;
+    }
+  }
 
   static const Map<int, String> monthMapShort = {
     1: 'Jan',
diff --git a/lib/utilities/db_version_migration.dart b/lib/utilities/db_version_migration.dart
index 4a594ff24..0945e811d 100644
--- a/lib/utilities/db_version_migration.dart
+++ b/lib/utilities/db_version_migration.dart
@@ -1,7 +1,7 @@
 import 'package:hive/hive.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/main_db.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/contact.dart';
 import 'package:stackduo/models/exchange/change_now/exchange_transaction.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
diff --git a/lib/utilities/delete_everything.dart b/lib/utilities/delete_everything.dart
index c8ba5f41c..a5f14415d 100644
--- a/lib/utilities/delete_everything.dart
+++ b/lib/utilities/delete_everything.dart
@@ -1,4 +1,4 @@
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/utilities/logger.dart';
 
 Future<bool> deleteEverything() async {
diff --git a/lib/utilities/desktop_password_service.dart b/lib/utilities/desktop_password_service.dart
index d71dbd7b6..d1c9a1f8c 100644
--- a/lib/utilities/desktop_password_service.dart
+++ b/lib/utilities/desktop_password_service.dart
@@ -1,6 +1,6 @@
 import 'package:hive/hive.dart';
 import 'package:stack_wallet_backup/secure_storage.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/utilities/logger.dart';
 
 const String _kKeyBlobKey = "swbKeyBlobKeyStringID";
diff --git a/lib/utilities/enums/fee_rate_type_enum.dart b/lib/utilities/enums/fee_rate_type_enum.dart
index 95374453e..dafd49e34 100644
--- a/lib/utilities/enums/fee_rate_type_enum.dart
+++ b/lib/utilities/enums/fee_rate_type_enum.dart
@@ -1,4 +1,4 @@
-enum FeeRateType { fast, average, slow }
+enum FeeRateType { fast, average, slow, custom }
 
 extension FeeRateTypeExt on FeeRateType {
   String get prettyName {
@@ -9,6 +9,8 @@ extension FeeRateTypeExt on FeeRateType {
         return "Average";
       case FeeRateType.slow:
         return "Slow";
+      case FeeRateType.custom:
+        return "Custom";
     }
   }
 }
diff --git a/lib/utilities/prefs.dart b/lib/utilities/prefs.dart
index 6e989d49f..6ced2f232 100644
--- a/lib/utilities/prefs.dart
+++ b/lib/utilities/prefs.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/cupertino.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
+import 'package:stackduo/utilities/amount/amount_unit.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/backup_frequency_type.dart';
+import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/enums/languages_enum.dart';
 import 'package:stackduo/utilities/enums/sync_type_enum.dart';
 import 'package:uuid/uuid.dart';
@@ -46,6 +48,8 @@ class Prefs extends ChangeNotifier {
       _themeId = await _getThemeId();
       _systemBrightnessLightThemeId = await _getSystemBrightnessLightThemeId();
       _systemBrightnessDarkThemeId = await _getSystemBrightnessDarkTheme();
+      await _setAmountUnits();
+      await _setMaxDecimals();
 
       _initialized = true;
     }
@@ -796,4 +800,63 @@ class Prefs extends ChangeNotifier {
         ) as String? ??
         "dark";
   }
+
+  // coin amount unit settings
+
+  final Map<Coin, AmountUnit> _amountUnits = {};
+
+  AmountUnit amountUnit(Coin coin) => _amountUnits[coin] ?? AmountUnit.normal;
+
+  void updateAmountUnit({required Coin coin, required AmountUnit amountUnit}) {
+    if (this.amountUnit(coin) != amountUnit) {
+      DB.instance.put<dynamic>(
+        boxName: DB.boxNamePrefs,
+        key: "amountUnitFor${coin.name}",
+        value: amountUnit.index,
+      );
+      _amountUnits[coin] = amountUnit;
+      notifyListeners();
+    }
+  }
+
+  Future<void> _setAmountUnits() async {
+    for (final coin in Coin.values) {
+      final unitIndex = await DB.instance.get<dynamic>(
+            boxName: DB.boxNamePrefs,
+            key: "amountUnitFor${coin.name}",
+          ) as int? ??
+          0; // 0 is "normal"
+      _amountUnits[coin] = AmountUnit.values[unitIndex];
+    }
+  }
+
+  // coin precision setting (max decimal places to show)
+
+  final Map<Coin, int> _amountDecimals = {};
+
+  int maxDecimals(Coin coin) => _amountDecimals[coin] ?? coin.decimals;
+
+  void updateMaxDecimals({required Coin coin, required int maxDecimals}) {
+    if (this.maxDecimals(coin) != maxDecimals) {
+      DB.instance.put<dynamic>(
+        boxName: DB.boxNamePrefs,
+        key: "maxDecimalsFor${coin.name}",
+        value: maxDecimals,
+      );
+      _amountDecimals[coin] = maxDecimals;
+      notifyListeners();
+    }
+  }
+
+  Future<void> _setMaxDecimals() async {
+    for (final coin in Coin.values) {
+      final decimals = await DB.instance.get<dynamic>(
+            boxName: DB.boxNamePrefs,
+            key: "maxDecimalsFor${coin.name}",
+          ) as int? ??
+          (coin.decimals > 18 ? 18 : coin.decimals);
+      // use some sane max rather than up to 30 that nano uses
+      _amountDecimals[coin] = decimals;
+    }
+  }
 }
diff --git a/lib/widgets/address_book_card.dart b/lib/widgets/address_book_card.dart
index 633045af8..fd4f34184 100644
--- a/lib/widgets/address_book_card.dart
+++ b/lib/widgets/address_book_card.dart
@@ -120,29 +120,31 @@ class _AddressBookCardState extends ConsumerState<AddressBookCard> {
             const SizedBox(
               width: 16,
             ),
-          if (isDesktop && !desktopSendFrom) const Spacer(),
-          if (isDesktop)
-            Text(
-              coinsString,
-              style: STextStyles.label(context),
-            ),
-          if (!isDesktop)
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
+          Expanded(
+            child: Column(
+              crossAxisAlignment: isDesktop && !desktopSendFrom
+                  ? CrossAxisAlignment.end
+                  : CrossAxisAlignment.start,
               children: [
-                Text(
-                  contact.name,
-                  style: STextStyles.itemSubtitle12(context),
-                ),
-                const SizedBox(
-                  height: 4,
-                ),
+                if (!isDesktop)
+                  Text(
+                    contact.name,
+                    style: STextStyles.itemSubtitle12(context),
+                  ),
+                if (!isDesktop)
+                  const SizedBox(
+                    height: 4,
+                  ),
                 Text(
                   coinsString,
                   style: STextStyles.label(context),
+                  textAlign: isDesktop && !desktopSendFrom
+                      ? TextAlign.right
+                      : TextAlign.left,
                 ),
               ],
             ),
+          ),
           if (isDesktop && desktopSendFrom) const Spacer(),
           if (isDesktop && desktopSendFrom)
             SvgPicture.asset(
diff --git a/lib/widgets/animated_widgets/rotating_arrows.dart b/lib/widgets/animated_widgets/rotating_arrows.dart
index dc16973b4..6532e94c3 100644
--- a/lib/widgets/animated_widgets/rotating_arrows.dart
+++ b/lib/widgets/animated_widgets/rotating_arrows.dart
@@ -7,6 +7,8 @@ class RotatingArrowsController {
   VoidCallback? forward;
   VoidCallback? repeat;
   VoidCallback? stop;
+
+  bool hasLoadedAnimation = false;
 }
 
 class RotatingArrows extends StatefulWidget {
@@ -76,6 +78,7 @@ class _RotatingArrowsState extends State<RotatingArrows>
       ),
       onLoaded: (composition) {
         animationController.duration = composition.duration;
+        widget.controller?.hasLoadedAnimation = true;
 
         // if controller was not set just assume continuous repeat
         if (widget.spinByDefault) {
diff --git a/lib/widgets/coin_card.dart b/lib/widgets/coin_card.dart
new file mode 100644
index 000000000..421e71ca1
--- /dev/null
+++ b/lib/widgets/coin_card.dart
@@ -0,0 +1,126 @@
+/*
+ * This file is part of Stack Wallet.
+ *
+ * Copyright (c) 2023 Cypher Stack
+ * All Rights Reserved.
+ * The code is distributed under GPLv3 license, see LICENSE file for details.
+ * Generated by Cypher Stack on 2023-05-26
+ *
+ */
+
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:stackduo/providers/providers.dart';
+import 'package:stackduo/themes/coin_card_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/assets.dart';
+import 'package:stackduo/utilities/constants.dart';
+
+class CoinCard extends ConsumerWidget {
+  const CoinCard({
+    super.key,
+    required this.walletId,
+    required this.width,
+    required this.height,
+  });
+
+  final String walletId;
+  final double width;
+  final double height;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final coin = ref.watch(
+      walletsChangeNotifierProvider
+          .select((value) => value.getManager(walletId).coin),
+    );
+
+    final bool hasCardImageBg = ref.watch(coinCardProvider(coin)) != null;
+
+    return Stack(
+      children: [
+        if (hasCardImageBg)
+          Container(
+            width: width,
+            height: height,
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(
+                Constants.size.circularBorderRadius,
+              ),
+              image: DecorationImage(
+                fit: BoxFit.cover,
+                image: FileImage(
+                  File(
+                    ref.watch(coinCardProvider(coin))!,
+                  ),
+                ),
+              ),
+            ),
+          ),
+        if (!hasCardImageBg)
+          Container(
+            width: width,
+            height: height,
+            decoration: BoxDecoration(
+              color: Theme.of(context)
+                  .extension<StackColors>()!
+                  .colorForCoin(coin),
+              borderRadius: BorderRadius.circular(
+                Constants.size.circularBorderRadius,
+              ),
+            ),
+          ),
+        if (!hasCardImageBg)
+          Column(
+            children: [
+              const Spacer(),
+              SizedBox(
+                height: width * 0.3,
+                child: Row(
+                  children: [
+                    const Spacer(
+                      flex: 9,
+                    ),
+                    SvgPicture.asset(
+                      Assets.svg.ellipse2,
+                      height: width * 0.3,
+                    ),
+                    // ),
+                    const Spacer(
+                      flex: 2,
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        if (!hasCardImageBg)
+          Row(
+            children: [
+              const Spacer(
+                flex: 5,
+              ),
+              SizedBox(
+                width: width * 0.45,
+                child: Column(
+                  children: [
+                    SvgPicture.asset(
+                      Assets.svg.ellipse1,
+                      width: width * 0.45,
+                    ),
+                    const Spacer(),
+                  ],
+                ),
+              ),
+              const Spacer(
+                flex: 1,
+              ),
+            ],
+          ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/custom_buttons/app_bar_icon_button.dart b/lib/widgets/custom_buttons/app_bar_icon_button.dart
index 0eba786dd..ab423a9b2 100644
--- a/lib/widgets/custom_buttons/app_bar_icon_button.dart
+++ b/lib/widgets/custom_buttons/app_bar_icon_button.dart
@@ -36,8 +36,8 @@ class AppBarIconButton extends StatelessWidget {
           boxShadow: shadows,
         ),
         child: Semantics(
-          label: semanticsLabel,
           excludeSemantics: true,
+          label: semanticsLabel,
           child: MaterialButton(
             splashColor: Theme.of(context).extension<StackColors>()!.highlight,
             padding: EdgeInsets.zero,
@@ -72,32 +72,32 @@ class AppBarBackButton extends StatelessWidget {
   Widget build(BuildContext context) {
     final isDesktop = Util.isDesktop;
     return Padding(
-      padding: isDesktop
-          ? const EdgeInsets.symmetric(
-              vertical: 20,
-              horizontal: 24,
-            )
-          : const EdgeInsets.all(10),
-      child: AppBarIconButton(
-        semanticsLabel: semanticsLabel,
-        size: size ??
-            (isDesktop
-                ? isCompact
-                    ? 42
-                    : 56
-                : 32),
-        color: isDesktop
-            ? Theme.of(context).extension<StackColors>()!.textFieldDefaultBG
-            : Theme.of(context).extension<StackColors>()!.background,
-        shadows: const [],
-        icon: SvgPicture.asset(
-          Assets.svg.arrowLeft,
-          width: iconSize ?? (isCompact ? 18 : 24),
-          height: iconSize ?? (isCompact ? 18 : 24),
-          color: Theme.of(context).extension<StackColors>()!.topNavIconPrimary,
-        ),
-        onPressed: onPressed ?? Navigator.of(context).pop,
-      ),
-    );
+        padding: isDesktop
+            ? const EdgeInsets.symmetric(
+                vertical: 20,
+                horizontal: 24,
+              )
+            : const EdgeInsets.all(10),
+        child: AppBarIconButton(
+          semanticsLabel: semanticsLabel,
+          size: size ??
+              (isDesktop
+                  ? isCompact
+                      ? 42
+                      : 56
+                  : 32),
+          color: isDesktop
+              ? Theme.of(context).extension<StackColors>()!.textFieldDefaultBG
+              : Theme.of(context).extension<StackColors>()!.background,
+          shadows: const [],
+          icon: SvgPicture.asset(
+            Assets.svg.arrowLeft,
+            width: iconSize ?? (isCompact ? 18 : 24),
+            height: iconSize ?? (isCompact ? 18 : 24),
+            color:
+                Theme.of(context).extension<StackColors>()!.topNavIconPrimary,
+          ),
+          onPressed: onPressed ?? Navigator.of(context).pop,
+        ));
   }
 }
diff --git a/lib/widgets/custom_page_view/custom_page_view.dart b/lib/widgets/custom_page_view/custom_page_view.dart
index e0fe15110..e7e00fd9b 100644
--- a/lib/widgets/custom_page_view/custom_page_view.dart
+++ b/lib/widgets/custom_page_view/custom_page_view.dart
@@ -255,6 +255,7 @@ class PageMetrics extends FixedScrollMetrics {
     required double? pixels,
     required double? viewportDimension,
     required AxisDirection axisDirection,
+    required double devicePixelRatio,
     required this.viewportFraction,
   }) : super(
           minScrollExtent: minScrollExtent,
@@ -262,6 +263,7 @@ class PageMetrics extends FixedScrollMetrics {
           pixels: pixels,
           viewportDimension: viewportDimension,
           axisDirection: axisDirection,
+          devicePixelRatio: devicePixelRatio,
         );
 
   @override
@@ -271,6 +273,7 @@ class PageMetrics extends FixedScrollMetrics {
     double? pixels,
     double? viewportDimension,
     AxisDirection? axisDirection,
+    double? devicePixelRatio,
     double? viewportFraction,
   }) {
     return PageMetrics(
@@ -282,6 +285,7 @@ class PageMetrics extends FixedScrollMetrics {
       viewportDimension: viewportDimension ??
           (hasViewportDimension ? this.viewportDimension : null),
       axisDirection: axisDirection ?? this.axisDirection,
+      devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio,
       viewportFraction: viewportFraction ?? this.viewportFraction,
     );
   }
@@ -397,7 +401,7 @@ class _PagePosition extends ScrollPositionWithSingleContext
 
   @override
   void saveScrollOffset() {
-    PageStorage.of(context.storageContext)?.writeState(context.storageContext,
+    PageStorage.of(context.storageContext).writeState(context.storageContext,
         _cachedPage ?? getPageFromPixels(pixels, viewportDimension));
   }
 
@@ -405,7 +409,7 @@ class _PagePosition extends ScrollPositionWithSingleContext
   void restoreScrollOffset() {
     if (!hasPixels) {
       final double? value = PageStorage.of(context.storageContext)
-          ?.readState(context.storageContext) as double?;
+          .readState(context.storageContext) as double?;
       if (value != null) _pageToUseOnStartup = value;
     }
   }
@@ -472,6 +476,7 @@ class _PagePosition extends ScrollPositionWithSingleContext
     double? pixels,
     double? viewportDimension,
     AxisDirection? axisDirection,
+    double? devicePixelRatio,
     double? viewportFraction,
   }) {
     return PageMetrics(
@@ -483,6 +488,7 @@ class _PagePosition extends ScrollPositionWithSingleContext
       viewportDimension: viewportDimension ??
           (hasViewportDimension ? this.viewportDimension : null),
       axisDirection: axisDirection ?? this.axisDirection,
+      devicePixelRatio: devicePixelRatio ?? this.devicePixelRatio,
       viewportFraction: viewportFraction ?? this.viewportFraction,
     );
   }
diff --git a/lib/widgets/desktop/desktop_fee_dialog.dart b/lib/widgets/desktop/desktop_fee_dialog.dart
new file mode 100644
index 000000000..3b9cf93f2
--- /dev/null
+++ b/lib/widgets/desktop/desktop_fee_dialog.dart
@@ -0,0 +1,381 @@
+import 'package:cw_core/monero_transaction_priority.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:stackduo/models/models.dart';
+import 'package:stackduo/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart';
+import 'package:stackduo/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_fee_dropdown.dart';
+import 'package:stackduo/providers/global/wallets_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
+import 'package:stackduo/utilities/constants.dart';
+import 'package:stackduo/utilities/enums/coin_enum.dart';
+import 'package:stackduo/utilities/enums/fee_rate_type_enum.dart';
+import 'package:stackduo/utilities/text_styles.dart';
+import 'package:stackduo/widgets/animated_text.dart';
+import 'package:stackduo/widgets/desktop/desktop_dialog.dart';
+import 'package:stackduo/widgets/desktop/desktop_dialog_close_button.dart';
+
+class DesktopFeeDialog extends ConsumerStatefulWidget {
+  const DesktopFeeDialog({
+    Key? key,
+    required this.walletId,
+    this.isToken = false,
+  }) : super(key: key);
+
+  final String walletId;
+  final bool isToken;
+
+  @override
+  ConsumerState<DesktopFeeDialog> createState() => _DesktopFeeDialogState();
+}
+
+class _DesktopFeeDialogState extends ConsumerState<DesktopFeeDialog> {
+  late final String walletId;
+
+  FeeObject? feeObject;
+  FeeRateType feeRateType = FeeRateType.average;
+
+  Future<Amount> feeFor({
+    required Amount amount,
+    required FeeRateType feeRateType,
+    required int feeRate,
+    required Coin coin,
+  }) async {
+    switch (feeRateType) {
+      case FeeRateType.fast:
+        if (ref.read(feeSheetSessionCacheProvider).fast[amount] == null) {
+          // if (widget.isToken == false) {
+          final manager =
+              ref.read(walletsChangeNotifierProvider).getManager(walletId);
+
+          if (coin == Coin.monero) {
+            final fee = await manager.estimateFeeFor(
+                amount, MoneroTransactionPriority.fast.raw!);
+            ref.read(feeSheetSessionCacheProvider).fast[amount] = fee;
+            // } else if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+            //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+            //         "Private") {
+            //   ref.read(feeSheetSessionCacheProvider).fast[amount] =
+            //       await (manager.wallet as FiroWallet)
+            //           .estimateFeeForPublic(amount, feeRate);
+          } else {
+            ref.read(feeSheetSessionCacheProvider).fast[amount] =
+                await manager.estimateFeeFor(amount, feeRate);
+          }
+          // } else {
+          //   final tokenWallet = ref.read(tokenServiceProvider)!;
+          //   final fee = tokenWallet.estimateFeeFor(feeRate);
+          //   ref.read(tokenFeeSessionCacheProvider).fast[amount] = fee;
+          // }
+        }
+        return ref.read(feeSheetSessionCacheProvider).fast[amount]!;
+
+      case FeeRateType.average:
+        if (ref.read(feeSheetSessionCacheProvider).average[amount] == null) {
+          // if (widget.isToken == false) {
+          final manager =
+              ref.read(walletsChangeNotifierProvider).getManager(walletId);
+
+          if (coin == Coin.monero) {
+            final fee = await manager.estimateFeeFor(
+                amount, MoneroTransactionPriority.regular.raw!);
+            ref.read(feeSheetSessionCacheProvider).average[amount] = fee;
+            // } else if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+            //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+            //         "Private") {
+            //   ref.read(feeSheetSessionCacheProvider).average[amount] =
+            //       await (manager.wallet as FiroWallet)
+            //           .estimateFeeForPublic(amount, feeRate);
+          } else {
+            ref.read(feeSheetSessionCacheProvider).average[amount] =
+                await manager.estimateFeeFor(amount, feeRate);
+          }
+          // } else {
+          //   final tokenWallet = ref.read(tokenServiceProvider)!;
+          //   final fee = tokenWallet.estimateFeeFor(feeRate);
+          //   ref.read(tokenFeeSessionCacheProvider).average[amount] = fee;
+          // }
+        }
+        return ref.read(feeSheetSessionCacheProvider).average[amount]!;
+
+      case FeeRateType.slow:
+        if (ref.read(feeSheetSessionCacheProvider).slow[amount] == null) {
+          // if (widget.isToken == false) {
+          final manager =
+              ref.read(walletsChangeNotifierProvider).getManager(walletId);
+
+          if (coin == Coin.monero) {
+            final fee = await manager.estimateFeeFor(
+                amount, MoneroTransactionPriority.slow.raw!);
+            ref.read(feeSheetSessionCacheProvider).slow[amount] = fee;
+            // } else if ((coin == Coin.firo || coin == Coin.firoTestNet) &&
+            //     ref.read(publicPrivateBalanceStateProvider.state).state !=
+            //         "Private") {
+            //   ref.read(feeSheetSessionCacheProvider).slow[amount] =
+            //       await (manager.wallet as FiroWallet)
+            //           .estimateFeeForPublic(amount, feeRate);
+          } else {
+            ref.read(feeSheetSessionCacheProvider).slow[amount] =
+                await manager.estimateFeeFor(amount, feeRate);
+          }
+          // } else {
+          //   final tokenWallet = ref.read(tokenServiceProvider)!;
+          //   final fee = tokenWallet.estimateFeeFor(feeRate);
+          //   ref.read(tokenFeeSessionCacheProvider).slow[amount] = fee;
+          // }
+        }
+        return ref.read(feeSheetSessionCacheProvider).slow[amount]!;
+
+      default:
+        return Amount.zero;
+    }
+  }
+
+  @override
+  void initState() {
+    walletId = widget.walletId;
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DesktopDialog(
+      maxWidth: 450,
+      maxHeight: double.infinity,
+      child: FutureBuilder(
+        future: ref.watch(
+          walletsChangeNotifierProvider.select(
+            (value) => value.getManager(walletId).fees,
+          ),
+        ),
+        builder: (context, AsyncSnapshot<FeeObject?> snapshot) {
+          if (snapshot.connectionState == ConnectionState.done &&
+              snapshot.hasData) {
+            feeObject = snapshot.data!;
+          }
+
+          return Column(
+            children: [
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.only(left: 32),
+                    child: Text(
+                      "Choose fee",
+                      style: STextStyles.desktopH3(context),
+                    ),
+                  ),
+                  const DesktopDialogCloseButton(),
+                ],
+              ),
+              ...FeeRateType.values.map(
+                (e) => Padding(
+                  padding: const EdgeInsets.only(
+                    left: 32,
+                    right: 32,
+                    bottom: 16,
+                  ),
+                  child: DesktopFeeItem(
+                    feeObject: feeObject,
+                    feeRateType: e,
+                    walletId: walletId,
+                    feeFor: feeFor,
+                    isSelected: false,
+                  ),
+                ),
+              ),
+              const SizedBox(
+                height: 16,
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
+
+class DesktopFeeItem extends ConsumerStatefulWidget {
+  const DesktopFeeItem({
+    Key? key,
+    required this.feeObject,
+    required this.feeRateType,
+    required this.walletId,
+    required this.feeFor,
+    required this.isSelected,
+  }) : super(key: key);
+
+  final FeeObject? feeObject;
+  final FeeRateType feeRateType;
+  final String walletId;
+  final Future<Amount> Function({
+    required Amount amount,
+    required FeeRateType feeRateType,
+    required int feeRate,
+    required Coin coin,
+  }) feeFor;
+  final bool isSelected;
+
+  @override
+  ConsumerState<DesktopFeeItem> createState() => _DesktopFeeItemState();
+}
+
+class _DesktopFeeItemState extends ConsumerState<DesktopFeeItem> {
+  String? feeString;
+  String? timeString;
+
+  static const stringsToLoopThrough = [
+    "Calculating",
+    "Calculating.",
+    "Calculating..",
+    "Calculating...",
+  ];
+
+  String estimatedTimeToBeIncludedInNextBlock(
+      int targetBlockTime, int estimatedNumberOfBlocks) {
+    int time = targetBlockTime * estimatedNumberOfBlocks;
+
+    int hours = (time / 3600).floor();
+    if (hours > 1) {
+      return "~$hours hours";
+    } else if (hours == 1) {
+      return "~$hours hour";
+    }
+
+    // less than an hour
+
+    final string = (time / 60).toStringAsFixed(1);
+
+    if (string == "1.0") {
+      return "~1 minute";
+    } else {
+      if (string.endsWith(".0")) {
+        return "~${(time / 60).floor()} minutes";
+      }
+      return "~$string minutes";
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    debugPrint("BUILD: $runtimeType : ${widget.feeRateType}");
+
+    return MaterialButton(
+      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+      onPressed: () {
+        Navigator.of(context).pop(
+          (
+            widget.feeRateType,
+            feeString,
+            timeString,
+          ),
+        );
+      },
+      child: Builder(
+        builder: (_) {
+          if (widget.feeRateType == FeeRateType.custom) {
+            return Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  widget.feeRateType.prettyName,
+                  style:
+                      STextStyles.desktopTextExtraExtraSmall(context).copyWith(
+                    color: Theme.of(context)
+                        .extension<StackColors>()!
+                        .textFieldActiveText,
+                  ),
+                  textAlign: TextAlign.left,
+                ),
+              ],
+            );
+          }
+
+          final manager = ref.watch(walletsChangeNotifierProvider
+              .select((value) => value.getManager(widget.walletId)));
+
+          if (widget.feeObject == null) {
+            return AnimatedText(
+              stringsToLoopThrough: stringsToLoopThrough,
+              style: STextStyles.desktopTextExtraExtraSmall(context).copyWith(
+                color: Theme.of(context)
+                    .extension<StackColors>()!
+                    .textFieldActiveText,
+              ),
+            );
+          } else {
+            return FutureBuilder(
+              future: widget.feeFor(
+                coin: manager.coin,
+                feeRateType: widget.feeRateType,
+                feeRate: widget.feeRateType == FeeRateType.fast
+                    ? widget.feeObject!.fast
+                    : widget.feeRateType == FeeRateType.slow
+                        ? widget.feeObject!.slow
+                        : widget.feeObject!.medium,
+                amount: ref.watch(sendAmountProvider.state).state,
+              ),
+              builder: (_, AsyncSnapshot<Amount> snapshot) {
+                if (snapshot.connectionState == ConnectionState.done &&
+                    snapshot.hasData) {
+                  feeString = "${widget.feeRateType.prettyName} "
+                      "(~${ref.watch(pAmountFormatter(manager.coin)).format(
+                            snapshot.data!,
+                            indicatePrecisionLoss: false,
+                          )})";
+
+                  timeString = estimatedTimeToBeIncludedInNextBlock(
+                    Constants.targetBlockTimeInSeconds(manager.coin),
+                    widget.feeRateType == FeeRateType.fast
+                        ? widget.feeObject!.numberOfBlocksFast
+                        : widget.feeRateType == FeeRateType.slow
+                            ? widget.feeObject!.numberOfBlocksSlow
+                            : widget.feeObject!.numberOfBlocksAverage,
+                  );
+
+                  return Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text(
+                        feeString!,
+                        style: STextStyles.desktopTextExtraExtraSmall(context)
+                            .copyWith(
+                          color: Theme.of(context)
+                              .extension<StackColors>()!
+                              .textFieldActiveText,
+                        ),
+                        textAlign: TextAlign.left,
+                      ),
+                      if (widget.feeObject != null)
+                        Text(
+                          timeString!,
+                          style: STextStyles.desktopTextExtraExtraSmall(context)
+                              .copyWith(
+                            color: Theme.of(context)
+                                .extension<StackColors>()!
+                                .textFieldActiveSearchIconRight,
+                          ),
+                        ),
+                    ],
+                  );
+                } else {
+                  return AnimatedText(
+                    stringsToLoopThrough: stringsToLoopThrough,
+                    style: STextStyles.desktopTextExtraExtraSmall(context)
+                        .copyWith(
+                      color: Theme.of(context)
+                          .extension<StackColors>()!
+                          .textFieldActiveText,
+                    ),
+                  );
+                }
+              },
+            );
+          }
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/fee_slider.dart b/lib/widgets/fee_slider.dart
new file mode 100644
index 000000000..7a225063c
--- /dev/null
+++ b/lib/widgets/fee_slider.dart
@@ -0,0 +1,56 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:stackduo/utilities/text_styles.dart';
+
+class FeeSlider extends StatefulWidget {
+  const FeeSlider({
+    super.key,
+    required this.onSatVByteChanged,
+  });
+
+  final void Function(int) onSatVByteChanged;
+
+  @override
+  State<FeeSlider> createState() => _FeeSliderState();
+}
+
+class _FeeSliderState extends State<FeeSlider> {
+  static const int min = 1;
+  static const int max = 4;
+
+  double sliderValue = 0;
+
+  int rate = min;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(
+              "sat/vByte",
+              style: STextStyles.smallMed12(context),
+            ),
+            Text(
+              "$rate",
+              style: STextStyles.smallMed12(context),
+            ),
+          ],
+        ),
+        Slider(
+          value: sliderValue,
+          onChanged: (value) {
+            setState(() {
+              sliderValue = value;
+              rate = pow(sliderValue * (max - min) + min, 4).toInt();
+            });
+            widget.onSatVByteChanged(rate);
+          },
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/gradient_card.dart b/lib/widgets/gradient_card.dart
new file mode 100644
index 000000000..9d103cb59
--- /dev/null
+++ b/lib/widgets/gradient_card.dart
@@ -0,0 +1,44 @@
+/* 
+ * This file is part of Stack Wallet.
+ * 
+ * Copyright (c) 2023 Cypher Stack
+ * All Rights Reserved.
+ * The code is distributed under GPLv3 license, see LICENSE file for details.
+ * Generated by Cypher Stack on 2023-05-26
+ *
+ */
+
+// import 'package:flutter/material.dart';
+// import 'package:stackduo/utilities/cfcolors.dart';
+//   const GradientCard(
+//       {Key key,
+//       this.child,
+//       @required this.gradient,
+//       this.backgroundColorForTransparentGradient = Colors.white,
+//       this.circularBorderRadius = 0.0})
+//       : super(key: key);
+//
+//   final Widget child;
+//   final Gradient gradient;
+//   final Color backgroundColorForTransparentGradient;
+//   final double circularBorderRadius;
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     return Material(
+//       color: backgroundColorForTransparentGradient,
+//       borderRadius: BorderRadius.circular(circularBorderRadius),
+//       elevation: 0,
+//       child: Container(
+//         decoration: BoxDecoration(
+//           gradient: gradient,
+//           borderRadius: BorderRadius.circular(circularBorderRadius),
+//           boxShadow: [
+//             CFColors.standardBoxShadow,
+//           ],
+//         ),
+//         child: child,
+//       ),
+//     );
+//   }
+// }
diff --git a/lib/widgets/managed_favorite.dart b/lib/widgets/managed_favorite.dart
index 663b2329f..db75b78bc 100644
--- a/lib/widgets/managed_favorite.dart
+++ b/lib/widgets/managed_favorite.dart
@@ -7,8 +7,8 @@ import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/constants.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/text_styles.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/custom_buttons/favorite_toggle.dart';
@@ -116,14 +116,11 @@ class _ManagedFavoriteCardState extends ConsumerState<ManagedFavorite> {
                       ),
                       Expanded(
                         child: Text(
-                          "${total.localizedStringAsFixed(
-                            locale: ref.watch(
-                              localeServiceChangeNotifierProvider.select(
-                                (value) => value.locale,
-                              ),
-                            ),
-                            decimalPlaces: manager.coin.decimals,
-                          )} ${manager.coin.ticker}",
+                          ref
+                              .watch(
+                                pAmountFormatter(manager.coin),
+                              )
+                              .format(total),
                           style: STextStyles.itemSubtitle(context),
                         ),
                       ),
@@ -159,14 +156,11 @@ class _ManagedFavoriteCardState extends ConsumerState<ManagedFavorite> {
                         height: 2,
                       ),
                       Text(
-                        "${total.localizedStringAsFixed(
-                          locale: ref.watch(
-                            localeServiceChangeNotifierProvider.select(
-                              (value) => value.locale,
-                            ),
-                          ),
-                          decimalPlaces: manager.coin.decimals,
-                        )} ${manager.coin.ticker}",
+                        ref
+                            .watch(
+                              pAmountFormatter(manager.coin),
+                            )
+                            .format(total),
                         style: STextStyles.itemSubtitle(context),
                       ),
                     ],
diff --git a/lib/widgets/textfields/exchange_textfield.dart b/lib/widgets/textfields/exchange_textfield.dart
index a32fde585..c904f9f30 100644
--- a/lib/widgets/textfields/exchange_textfield.dart
+++ b/lib/widgets/textfields/exchange_textfield.dart
@@ -1,14 +1,16 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:stackduo/models/exchange/aggregate_currency.dart';
+import 'package:stackduo/providers/global/locale_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/amount/amount_input_formatter.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/loading_indicator.dart';
 
-class ExchangeTextField extends StatefulWidget {
+class ExchangeTextField extends ConsumerStatefulWidget {
   const ExchangeTextField({
     Key? key,
     this.borderRadius = 0,
@@ -44,10 +46,10 @@ class ExchangeTextField extends StatefulWidget {
   final AggregateCurrency? currency;
 
   @override
-  State<ExchangeTextField> createState() => _ExchangeTextFieldState();
+  ConsumerState<ExchangeTextField> createState() => _ExchangeTextFieldState();
 }
 
-class _ExchangeTextFieldState extends State<ExchangeTextField> {
+class _ExchangeTextFieldState extends ConsumerState<ExchangeTextField> {
   late final TextEditingController controller;
   late final FocusNode focusNode;
   late final TextStyle textStyle;
@@ -119,12 +121,17 @@ class _ExchangeTextFieldState extends State<ExchangeTextField> {
                   ),
                 ),
                 inputFormatters: [
-                  // regex to validate a crypto amount with 8 decimal places
-                  TextInputFormatter.withFunction((oldValue, newValue) =>
-                      RegExp(r'^([0-9]*[,.]?[0-9]{0,8}|[,.][0-9]{0,8})$')
-                              .hasMatch(newValue.text)
-                          ? newValue
-                          : oldValue),
+                  AmountInputFormatter(
+                    decimals: 8, // todo change this
+                    locale: ref.watch(localeServiceChangeNotifierProvider
+                        .select((value) => value.locale)),
+                  ),
+                  // // regex to validate a crypto amount with 8 decimal places
+                  // TextInputFormatter.withFunction((oldValue, newValue) =>
+                  //     RegExp(r'^([0-9]*[,.]?[0-9]{0,8}|[,.][0-9]{0,8})$')
+                  //             .hasMatch(newValue.text)
+                  //         ? newValue
+                  //         : oldValue),
                 ],
               ),
             ),
diff --git a/lib/widgets/transaction_card.dart b/lib/widgets/transaction_card.dart
index 60fb0c8e7..21c610002 100644
--- a/lib/widgets/transaction_card.dart
+++ b/lib/widgets/transaction_card.dart
@@ -8,6 +8,7 @@ import 'package:stackduo/pages/wallet_view/transaction_views/transaction_details
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/format.dart';
@@ -33,9 +34,11 @@ class TransactionCard extends ConsumerStatefulWidget {
 class _TransactionCardState extends ConsumerState<TransactionCard> {
   late final Transaction _transaction;
   late final String walletId;
+  late final bool isTokenTx;
   late final String prefix;
   late final String unit;
   late final Coin coin;
+  late final dynamic tokenContract;
 
   String whatIsIt(
     TransactionType type,
@@ -92,6 +95,7 @@ class _TransactionCardState extends ConsumerState<TransactionCard> {
   void initState() {
     walletId = widget.walletId;
     _transaction = widget.transaction;
+    isTokenTx = _transaction.subType == TransactionSubType.ethToken;
     if (Util.isDesktop) {
       if (_transaction.type == TransactionType.outgoing) {
         prefix = "-";
@@ -108,6 +112,8 @@ class _TransactionCardState extends ConsumerState<TransactionCard> {
         .getManager(widget.walletId)
         .coin;
 
+    tokenContract = null;
+
     unit = coin.ticker;
     super.initState();
   }
@@ -216,9 +222,7 @@ class _TransactionCardState extends ConsumerState<TransactionCard> {
                                   final amount = _transaction.realAmount;
 
                                   return Text(
-                                    "$prefix${amount.localizedStringAsFixed(
-                                      locale: locale,
-                                    )} $unit",
+                                    "$prefix${ref.watch(pAmountFormatter(coin)).format(amount, ethContract: tokenContract)}",
                                     style: STextStyles.itemSubtitle12(context),
                                   );
                                 },
@@ -261,9 +265,8 @@ class _TransactionCardState extends ConsumerState<TransactionCard> {
                                       "$prefix${Amount.fromDecimal(
                                         amount.decimal * price,
                                         fractionDigits: 2,
-                                      ).localizedStringAsFixed(
+                                      ).fiatString(
                                         locale: locale,
-                                        decimalPlaces: 2,
                                       )} $baseCurrency",
                                       style: STextStyles.label(context),
                                     );
diff --git a/lib/widgets/wallet_card.dart b/lib/widgets/wallet_card.dart
index 0a14b87c5..6fcc523e2 100644
--- a/lib/widgets/wallet_card.dart
+++ b/lib/widgets/wallet_card.dart
@@ -17,11 +17,13 @@ class SimpleWalletCard extends ConsumerWidget {
   const SimpleWalletCard({
     Key? key,
     required this.walletId,
+    this.contractAddress,
     this.popPrevious = false,
     this.desktopNavigatorState,
   }) : super(key: key);
 
   final String walletId;
+  final String? contractAddress;
   final bool popPrevious;
   final NavigatorState? desktopNavigatorState;
 
@@ -81,6 +83,7 @@ class SimpleWalletCard extends ConsumerWidget {
       ),
       child: WalletInfoRow(
         walletId: walletId,
+        contractAddress: null,
         onPressedDesktop:
             Util.isDesktop ? () => _openWallet(context, ref) : null,
       ),
diff --git a/lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_balance.dart b/lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_balance.dart
index db4eedcaa..4cb60bef0 100644
--- a/lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_balance.dart
+++ b/lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_balance.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:stackduo/providers/providers.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
+import 'package:stackduo/utilities/amount/amount_formatter.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/util.dart';
 
 class WalletInfoRowBalance extends ConsumerWidget {
@@ -23,24 +23,25 @@ class WalletInfoRowBalance extends ConsumerWidget {
         .watch(walletsChangeNotifierProvider.notifier)
         .getManagerProvider(walletId));
 
-    final locale = ref.watch(
-      localeServiceChangeNotifierProvider.select(
-        (value) => value.locale,
-      ),
-    );
-
     Amount totalBalance;
-    int decimals;
-    String unit;
+    // EthContract? contract;
+    // if (contractAddress == null) {
     totalBalance = manager.balance.total;
-    unit = manager.coin.ticker;
-    decimals = manager.coin.decimals;
+    // if (manager.coin == Coin.firo || manager.coin == Coin.firoTestNet) {
+    //   totalBalance =
+    //       totalBalance + (manager.wallet as FiroWallet).balancePrivate.total;
+    // }
+    // contract = null;
+    // } else {
+    //   final ethWallet = manager.wallet as EthereumWallet;
+    //   contract = MainDB.instance.getEthContractSync(contractAddress!)!;
+    //   totalBalance = ethWallet.getCachedTokenBalance(contract).total;
+    // }
 
     return Text(
-      "${totalBalance.localizedStringAsFixed(
-        locale: locale,
-        decimalPlaces: decimals,
-      )} $unit",
+      ref
+          .watch(pAmountFormatter(manager.coin))
+          .format(totalBalance, ethContract: null),
       style: Util.isDesktop
           ? STextStyles.desktopTextExtraSmall(context).copyWith(
               color: Theme.of(context).extension<StackColors>()!.textSubtitle1,
diff --git a/lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_coin_icon.dart b/lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_coin_icon.dart
index a15857c8c..a49da1cb7 100644
--- a/lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_coin_icon.dart
+++ b/lib/widgets/wallet_info_row/sub_widgets/wallet_info_row_coin_icon.dart
@@ -3,6 +3,10 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:isar/isar.dart';
+import 'package:stackduo/models/isar/exchange_cache/currency.dart';
+import 'package:stackduo/services/exchange/change_now/change_now_exchange.dart';
+import 'package:stackduo/services/exchange/exchange_data_loading_service.dart';
 import 'package:stackduo/themes/coin_icon_provider.dart';
 import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/constants.dart';
@@ -13,13 +17,30 @@ class WalletInfoCoinIcon extends ConsumerWidget {
     Key? key,
     required this.coin,
     this.size = 32,
+    this.contractAddress,
   }) : super(key: key);
 
   final Coin coin;
+  final String? contractAddress;
   final double size;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    Currency? currency;
+    if (contractAddress != null) {
+      currency = ExchangeDataLoadingService.instance.isar.currencies
+          .where()
+          .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
+          .filter()
+          .tokenContractEqualTo(
+            contractAddress!,
+            caseSensitive: false,
+          )
+          .and()
+          .imageIsNotEmpty()
+          .findFirstSync();
+    }
+
     return Container(
       width: size,
       height: size,
@@ -33,14 +54,20 @@ class WalletInfoCoinIcon extends ConsumerWidget {
         ),
       ),
       child: Padding(
-        padding: const EdgeInsets.all(4),
-        child: SvgPicture.file(
-          File(
-            ref.watch(coinIconProvider(coin)),
-          ),
-          width: 20,
-          height: 20,
-        ),
+        padding: EdgeInsets.all(size / 5),
+        child: currency != null && currency.image.isNotEmpty
+            ? SvgPicture.network(
+                currency.image,
+                width: 20,
+                height: 20,
+              )
+            : SvgPicture.file(
+                File(
+                  ref.watch(coinIconProvider(coin)),
+                ),
+                width: 20,
+                height: 20,
+              ),
       ),
     );
   }
diff --git a/lib/widgets/wallet_info_row/wallet_info_row.dart b/lib/widgets/wallet_info_row/wallet_info_row.dart
index 93f4f9577..f00425ed2 100644
--- a/lib/widgets/wallet_info_row/wallet_info_row.dart
+++ b/lib/widgets/wallet_info_row/wallet_info_row.dart
@@ -13,10 +13,12 @@ class WalletInfoRow extends ConsumerWidget {
     Key? key,
     required this.walletId,
     this.onPressedDesktop,
+    this.contractAddress,
     this.padding = const EdgeInsets.all(0),
   }) : super(key: key);
 
   final String walletId;
+  final String? contractAddress;
   final VoidCallback? onPressedDesktop;
   final EdgeInsets padding;
 
@@ -26,6 +28,12 @@ class WalletInfoRow extends ConsumerWidget {
         .watch(walletsChangeNotifierProvider.notifier)
         .getManagerProvider(walletId));
 
+    // EthContract? contract;
+    // if (contractAddress != null) {
+    //   contract = ref.watch(mainDBProvider
+    //       .select((value) => value.getEthContractSync(contractAddress!)));
+    // }
+
     if (Util.isDesktop) {
       return Padding(
         padding: padding,
@@ -39,19 +47,42 @@ class WalletInfoRow extends ConsumerWidget {
                   children: [
                     WalletInfoCoinIcon(
                       coin: manager.coin,
+                      contractAddress: contractAddress,
                     ),
                     const SizedBox(
                       width: 12,
                     ),
+                    // contract != null
+                    //     ? Row(
+                    //         children: [
+                    //           Text(
+                    //             contract.name,
+                    //             style:
+                    //                 STextStyles.desktopTextExtraSmall(context)
+                    //                     .copyWith(
+                    //               color: Theme.of(context)
+                    //                   .extension<StackColors>()!
+                    //                   .textDark,
+                    //             ),
+                    //           ),
+                    //           const SizedBox(
+                    //             width: 4,
+                    //           ),
+                    //           CoinTickerTag(
+                    //             walletId: walletId,
+                    //           ),
+                    //         ],
+                    //       )
+                    //     :
                     Text(
-                      manager.walletName,
-                      style:
-                          STextStyles.desktopTextExtraSmall(context).copyWith(
-                        color: Theme.of(context)
-                            .extension<StackColors>()!
-                            .textDark,
-                      ),
-                    ),
+                            manager.walletName,
+                            style: STextStyles.desktopTextExtraSmall(context)
+                                .copyWith(
+                              color: Theme.of(context)
+                                  .extension<StackColors>()!
+                                  .textDark,
+                            ),
+                          ),
                   ],
                 ),
               ),
@@ -59,6 +90,7 @@ class WalletInfoRow extends ConsumerWidget {
                 flex: 4,
                 child: WalletInfoRowBalance(
                   walletId: walletId,
+                  contractAddress: contractAddress,
                 ),
               ),
               Expanded(
@@ -82,6 +114,7 @@ class WalletInfoRow extends ConsumerWidget {
         children: [
           WalletInfoCoinIcon(
             coin: manager.coin,
+            contractAddress: contractAddress,
           ),
           const SizedBox(
             width: 12,
@@ -91,15 +124,32 @@ class WalletInfoRow extends ConsumerWidget {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
+                // contract != null
+                //     ? Row(
+                //         children: [
+                //           Text(
+                //             contract.name,
+                //             style: STextStyles.titleBold12(context),
+                //           ),
+                //           const SizedBox(
+                //             width: 4,
+                //           ),
+                //           CoinTickerTag(
+                //             walletId: walletId,
+                //           ),
+                //         ],
+                //       )
+                //     :
                 Text(
-                  manager.walletName,
-                  style: STextStyles.titleBold12(context),
-                ),
+                        manager.walletName,
+                        style: STextStyles.titleBold12(context),
+                      ),
                 const SizedBox(
                   height: 2,
                 ),
                 WalletInfoRowBalance(
                   walletId: walletId,
+                  contractAddress: contractAddress,
                 ),
               ],
             ),
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 5dfa9cfa1..77eddb2e3 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,14 +5,14 @@
 import FlutterMacOS
 import Foundation
 
-import connectivity_plus_macos
+import connectivity_plus
 import desktop_drop
 import device_info_plus
 import devicelocale
 import flutter_local_notifications
 import flutter_secure_storage_macos
 import isar_flutter_libs
-import package_info_plus_macos
+import package_info_plus
 import path_provider_foundation
 import share_plus
 import shared_preferences_foundation
@@ -27,7 +27,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
-  FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin"))
+  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   IsarFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "IsarFlutterLibsPlugin"))
   FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
index ac75e9761..171a10c62 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,26 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8"
+      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
       url: "https://pub.dev"
     source: hosted
-    version: "47.0.0"
+    version: "61.0.0"
   analyzer:
     dependency: "direct dev"
     description:
       name: analyzer
-      sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80"
+      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
       url: "https://pub.dev"
     source: hosted
-    version: "4.7.0"
-  animations:
-    dependency: "direct main"
-    description:
-      name: animations
-      sha256: fe8a6bdca435f718bb1dc8a11661b2c22504c6da40ef934cee8327ed77934164
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
+    version: "5.13.0"
   another_flushbar:
     dependency: "direct main"
     description:
@@ -33,14 +25,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.12.29"
-  app_settings:
-    dependency: "direct main"
-    description:
-      name: app_settings
-      sha256: "66715a323ac36d6c8201035ba678777c0d2ea869e4d7064300d95af10c3bb8cb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.0"
   archive:
     dependency: "direct main"
     description:
@@ -69,24 +53,24 @@ packages:
     dependency: "direct main"
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   barcode_scan2:
     dependency: "direct main"
     description:
       name: barcode_scan2
-      sha256: f9af9252b8f3f5fa446f5456fd45f8871d09f883d8389a1d608b39231bfbc3fa
+      sha256: "0b0625d27841a21e36e896195d86b2aada335e3c486f63647cce701495718e16"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.3"
+    version: "4.2.4"
   bech32:
     dependency: "direct main"
     description:
       path: "."
-      ref: "22279d4bb24ed541b431acd269a1bc50af0f36a0"
-      resolved-ref: "22279d4bb24ed541b431acd269a1bc50af0f36a0"
+      ref: b6d2a5b4cd17311d917787c0f9505f04932659b1
+      resolved-ref: b6d2a5b4cd17311d917787c0f9505f04932659b1
       url: "https://github.com/cypherstack/bech32.git"
     source: git
     version: "0.2.1"
@@ -102,8 +86,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "3bef5acc21340f3cc78df0ad1dce5868a3ed68a5"
-      resolved-ref: "3bef5acc21340f3cc78df0ad1dce5868a3ed68a5"
+      ref: "0cd6d54e2860bea68fc50c801cb9db2a760192fb"
+      resolved-ref: "0cd6d54e2860bea68fc50c801cb9db2a760192fb"
       url: "https://github.com/cypherstack/stack-bip39.git"
     source: git
     version: "1.0.6"
@@ -111,26 +95,17 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "38847255d035c0f6ec5bc93d19130ec804cf90e9"
-      resolved-ref: "38847255d035c0f6ec5bc93d19130ec804cf90e9"
+      ref: "081ca1863c2feba00c35bb5b297902f12f499941"
+      resolved-ref: "081ca1863c2feba00c35bb5b297902f12f499941"
       url: "https://github.com/cypherstack/bip47.git"
     source: git
     version: "2.0.0"
-  bitbox:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: ea65073efbaf395a5557e8cd7bd72f195cd7eb11
-      resolved-ref: ea65073efbaf395a5557e8cd7bd72f195cd7eb11
-      url: "https://github.com/Quppy/bitbox-flutter.git"
-    source: git
-    version: "1.0.1"
   bitcoindart:
     dependency: "direct main"
     description:
       path: "."
-      ref: "004d6f82dff7389b561e5078b4649adcd2d9c10f"
-      resolved-ref: "004d6f82dff7389b561e5078b4649adcd2d9c10f"
+      ref: af6d6c27edfe2e7cc35772ed2684eb4cc826f0e4
+      resolved-ref: af6d6c27edfe2e7cc35772ed2684eb4cc826f0e4
       url: "https://github.com/cypherstack/bitcoindart.git"
     source: git
     version: "3.0.1"
@@ -170,10 +145,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "6bc5544ea6ce4428266e7ea680e945c68806c4aae2da0eb5e9ccf38df8d6acbf"
+      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "4.0.0"
   build_resolvers:
     dependency: transitive
     description:
@@ -186,10 +161,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "93f05c041932674be039b0a2323d6cf57e5f2bbf884a3c0382f9e53fc45ebace"
+      sha256: "5e1929ad37d48bd382b124266cb8e521de5548d406a45a5ae6656c13dab73e37"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.5"
   build_runner_core:
     dependency: transitive
     description:
@@ -218,10 +193,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -250,42 +225,26 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.5.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
   connectivity_plus:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: e18bbd0243342ceca6fb33718fd2737c468c1a881ad7fed4b0a47258b5838d9d
+      sha256: "8599ae9edca5ff96163fca3e36f8e481ea917d1e71cdad912c084b5579913f34"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.6+1"
-  connectivity_plus_linux:
-    dependency: transitive
-    description:
-      name: connectivity_plus_linux
-      sha256: "3caf859d001f10407b8e48134c761483e4495ae38094ffcca97193f6c271f5e2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.1"
-  connectivity_plus_macos:
-    dependency: transitive
-    description:
-      name: connectivity_plus_macos
-      sha256: "488d2de1e47e1224ad486e501b20b088686ba1f4ee9c4420ecbc3b9824f0b920"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.6"
+    version: "4.0.1"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -294,38 +253,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.4"
-  connectivity_plus_web:
-    dependency: transitive
-    description:
-      name: connectivity_plus_web
-      sha256: "81332be1b4baf8898fed17bb4fdef27abb7c6fd990bf98c54fd978478adf2f1a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.5"
-  connectivity_plus_windows:
-    dependency: transitive
-    description:
-      name: connectivity_plus_windows
-      sha256: "535b0404b4d5605c4dd8453d67e5d6d2ea0dd36e3b477f50f31af51b0aeab9dd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
   convert:
     dependency: transitive
     description:
       name: convert
-      sha256: "196284f26f69444b7f5c50692b55ec25da86d9e500451dc09333bf2e3ad69259"
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.1"
   coverage:
     dependency: transitive
     description:
       name: coverage
-      sha256: "525ac94733f9ce82507a050bfd62ad89eb1dcbc56308e1e2e17ab11abeee4a75"
+      sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.6.3"
   cross_file:
     dependency: transitive
     description:
@@ -463,34 +406,34 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "8d99246809e63d93e4e68fade79495d81f445ad735bde2b129b19c0adddcaf1a"
+      sha256: "2c35b6d1682b028e42d07b3aee4b98fa62996c10bc12cb651ec856a80d6a761b"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.1"
+    version: "9.0.2"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: "8b8b65e598b84fdb82c26cf9b3f05a6c4978636e99b0c070bae5905a24728199"
+      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.1"
+    version: "7.0.0"
   devicelocale:
     dependency: "direct main"
     description:
       name: devicelocale
-      sha256: "5fd46b8c2a987b1c14b1551433be1974dbca5ec6ab00e7d53288b5197a21863e"
+      sha256: "09cc0bce937b34dafcaac0b2a9b350d763dd16770f15e59560b7abaaaad3d65b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.5"
+    version: "0.6.0"
   dropdown_button2:
     dependency: "direct main"
     description:
       name: dropdown_button2
-      sha256: "1a00301a1ec87666b1f1938f373865e3f5fb3056e4e36e1b3c2c0dc0c11f4737"
+      sha256: "107444581478342c6511040c2eb52850748400df4f3295df3da8be75693180a5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.2"
+    version: "2.1.4"
   emojis:
     dependency: "direct main"
     description:
@@ -551,10 +494,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: d090ae03df98b0247b82e5928f44d1b959867049d18d73635e2e0bc3f49542b9
+      sha256: b1729fc96627dd44012d0a901558177418818d6bd428df59dcfeb594e5f66432
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.5"
+    version: "5.3.2"
   fixnum:
     dependency: transitive
     description:
@@ -563,14 +506,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
-  flare_flutter:
-    dependency: "direct main"
-    description:
-      name: flare_flutter
-      sha256: "99d63c60f00fac81249ce6410ee015d7b125c63d8278a30da81edf3317a1f6a0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -656,10 +591,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b"
+      sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.15"
   flutter_riverpod:
     dependency: "direct main"
     description:
@@ -672,18 +607,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_rounded_date_picker
-      sha256: "369f7c63c1518d24c63f5da889ea9a6fb9a0a6f105ba9d22ccbba7665475784f"
+      sha256: e6aa2dc5d3b44e8bbe85ef901be69eac59ba4136427f11f4c8b2a303e1e774e7
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.4"
   flutter_secure_storage:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: "5abe3d5c25ab435e48c47fb61bac25606062a305fac637c2f020e25abd30014a"
+      sha256: "98352186ee7ad3639ccc77ad7924b773ff6883076ab952437d20f18a61f0a7c5"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.2"
+    version: "8.0.0"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
@@ -696,10 +631,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: "388f76fd0f093e7415a39ec4c169ae7cceeee6d9f9ba529d788a13f2be4de7bd"
+      sha256: "083add01847fc1c80a07a08e1ed6927e9acd9618a35e330239d4422cd2a58c50"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "3.0.0"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
@@ -720,18 +655,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      sha256: ca89c8059cf439985aa83c59619b3674c7ef6cc2e86943d169a7369d6a69cab5
+      sha256: fc2910ec9b28d60598216c29ea763b3a96c401f0ce1d13cdf69ccb0e5c93c3ee
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.3"
-  flutter_spinkit:
-    dependency: "direct main"
-    description:
-      name: flutter_spinkit
-      sha256: "77a2117c0517ff909221f3160b8eb20052ab5216107581168af574ac1f05dff8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.0"
+    version: "2.0.0"
   flutter_svg:
     dependency: "direct main"
     description:
@@ -762,10 +689,10 @@ packages:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "4f4a162323c86ffc1245765cfe138872b8f069deb42f7dbb36115fa27f31469b"
+      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "3.2.0"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
@@ -783,10 +710,10 @@ packages:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: e70521755a6b08c6bde14ddae27dff5bf21010033888fc61da6c595f8a9f58c1
+      sha256: "6b6f10f0ce3c42f6552d1c70d2c28d764cf22bb487f50f66cca31dcd5194f4d6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    version: "4.0.4"
   graphs:
     dependency: transitive
     description:
@@ -823,10 +750,10 @@ packages:
     dependency: "direct dev"
     description:
       name: hive_generator
-      sha256: "81fd20125cb2ce8fd23623d7744ffbaf653aae93706c9bd3bf7019ea0ace3938"
+      sha256: "65998cc4d2cd9680a3d9709d893d2f6bb15e6c1f92626c3f1fa650b4b3281521"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.3"
+    version: "2.0.0"
   hive_test:
     dependency: "direct dev"
     description:
@@ -932,10 +859,10 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   json_annotation:
     dependency: transitive
     description:
@@ -944,14 +871,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.8.0"
-  jsonrpc2:
-    dependency: "direct main"
-    description:
-      name: jsonrpc2
-      sha256: "98a71b834240ca6d003499ab8f28d1c35aa8ca90235b51e972e0f70596b86bd3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
   keyboard_dismisser:
     dependency: "direct main"
     description:
@@ -988,18 +907,18 @@ packages:
     dependency: "direct main"
     description:
       name: lottie
-      sha256: "893da7a0022ec2fcaa616f34529a081f617e86cc501105b856e5a3184c58c7c2"
+      sha256: f461105d3a35887b27089abf9c292334478dd292f7b47ecdccb6ae5c37a22c80
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.3"
+    version: "2.4.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
@@ -1012,10 +931,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   mime:
     dependency: transitive
     description:
@@ -1044,10 +963,10 @@ packages:
     dependency: "direct dev"
     description:
       name: mockito
-      sha256: "2a8a17b82b1bde04d514e75d90d634a0ac23f6cb4991f6098009dd56836aeafe"
+      sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616"
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.2"
+    version: "5.4.2"
   mocktail:
     dependency: transitive
     description:
@@ -1092,58 +1011,26 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.3+1"
-  package_info_plus_linux:
-    dependency: transitive
-    description:
-      name: package_info_plus_linux
-      sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.5"
-  package_info_plus_macos:
-    dependency: transitive
-    description:
-      name: package_info_plus_macos
-      sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6
+      sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "4.0.2"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  package_info_plus_web:
-    dependency: transitive
-    description:
-      name: package_info_plus_web
-      sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.6"
-  package_info_plus_windows:
-    dependency: transitive
-    description:
-      name: package_info_plus_windows
-      sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc"
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.0.1"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   path_drawing:
     dependency: transitive
     description:
@@ -1164,10 +1051,10 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95
+      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.12"
+    version: "2.0.15"
   path_provider_android:
     dependency: transitive
     description:
@@ -1204,10 +1091,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
+      sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.7"
   permission_handler:
     dependency: "direct main"
     description:
@@ -1268,10 +1155,10 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   pointycastle:
     dependency: "direct main"
     description:
@@ -1324,20 +1211,20 @@ packages:
     dependency: transitive
     description:
       name: qr
-      sha256: "5c4208b4dc0d55c3184d10d83ee0ded6212dc2b5e2ba17c5a0c0aab279128d21"
+      sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.0.1"
   qr_flutter:
     dependency: "direct main"
     description:
       name: qr_flutter
-      sha256: c5c121c54cb6dd837b9b9d57eb7bc7ec6df4aee741032060c8833a678c80b87e
+      sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.0"
   rational:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: rational
       sha256: ba58e9e18df9abde280e8b10051e4bce85091e41e8e7e411b6cde2e738d357cf
@@ -1352,22 +1239,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.3"
-  rpc_dispatcher:
-    dependency: transitive
-    description:
-      name: rpc_dispatcher
-      sha256: b6ddcae58b3fbc1172a7c2dc8ab30d2f1090db8c7a728e4405bd10142dc48a47
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  rpc_exceptions:
-    dependency: transitive
-    description:
-      name: rpc_exceptions
-      sha256: "09b2e5f3f805b65a262b40e3410d79fb916ff5be2a65e2f6b8b0eeef7aa965b7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
   rxdart:
     dependency: "direct main"
     description:
@@ -1380,18 +1251,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625"
+      sha256: ed3fcea4f789ed95913328e629c0c53e69e80e08b6c24542f1b3576046c614e8
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "7.0.2"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1"
+      sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   shared_preferences:
     dependency: transitive
     description:
@@ -1537,8 +1408,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: e4b08d2b8965a5ae49bd57f598fa9011dd0c25e9
-      resolved-ref: e4b08d2b8965a5ae49bd57f598fa9011dd0c25e9
+      ref: ee1da8a9ba1cbeb50c5b354ea1fd5a25b7c5a3ed
+      resolved-ref: ee1da8a9ba1cbeb50c5b354ea1fd5a25b7c5a3ed
       url: "https://github.com/cypherstack/stack_wallet_backup.git"
     source: git
     version: "0.0.1"
@@ -1602,26 +1473,26 @@ packages:
     dependency: transitive
     description:
       name: test
-      sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d
+      sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4"
       url: "https://pub.dev"
     source: hosted
-    version: "1.22.0"
+    version: "1.24.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888"
+      sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.20"
+    version: "0.5.1"
   time:
     dependency: transitive
     description:
@@ -1654,14 +1525,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
-  toast:
-    dependency: "direct main"
-    description:
-      name: toast
-      sha256: bedb96d37030acf9c4c06a7ac2ffd1f1f365e780cda9458c9e24e6a1e1ab6fd9
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.5"
   tuple:
     dependency: "direct main"
     description:
@@ -1714,10 +1577,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc"
+      sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.5"
   url_launcher_macos:
     dependency: transitive
     description:
@@ -1730,26 +1593,26 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6"
+      sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.3"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0"
+      sha256: "6bb1e5d7fe53daf02a8fee85352432a40b1f868a81880e99ec7440113d5cfcab"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.14"
+    version: "2.0.17"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615
+      sha256: "254708f17f7c20a9c8c471f67d86d76d4a3f9c1591aad1e15292008aceb82771"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.6"
   uuid:
     dependency: "direct main"
     description:
@@ -1770,10 +1633,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7
+      sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe
       url: "https://pub.dev"
     source: hosted
-    version: "9.4.0"
+    version: "11.3.0"
   wakelock:
     dependency: "direct main"
     description:
@@ -1807,13 +1670,14 @@ packages:
     source: hosted
     version: "0.4.0"
   wakelock_windows:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: wakelock_windows
-      sha256: "857f77b3fe6ae82dd045455baa626bc4b93cb9bb6c86bf3f27c182167c3a5567"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1"
+      path: wakelock_windows
+      ref: "2a9bca63a540771f241d688562351482b2cf234c"
+      resolved-ref: "2a9bca63a540771f241d688562351482b2cf234c"
+      url: "https://github.com/diegotori/wakelock"
+    source: git
+    version: "0.2.2"
   watcher:
     dependency: transitive
     description:
@@ -1834,10 +1698,10 @@ packages:
     dependency: transitive
     description:
       name: webdriver
-      sha256: ef67178f0cc7e32c1494645b11639dd1335f1d18814aa8435113a92e9ef9d841
+      sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   webkit_inspection_protocol:
     dependency: transitive
     description:
@@ -1858,10 +1722,18 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      sha256: "7dacfda1edcca378031db9905ad7d7bd56b29fd1a90b0908b71a52a12c41e36b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.3"
+  win32_registry:
+    dependency: transitive
+    description:
+      name: win32_registry
+      sha256: e4506d60b7244251bc59df15656a3093501c37fb5af02105a944d73eb95be4c9
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "1.1.1"
   window_size:
     dependency: "direct main"
     description:
@@ -1912,5 +1784,5 @@ packages:
     source: hosted
     version: "1.0.0"
 sdks:
-  dart: ">=2.18.5 <3.0.0"
-  flutter: ">=3.3.0"
+  dart: ">=3.0.2 <4.0.0"
+  flutter: ">=3.10.5"
diff --git a/pubspec.yaml b/pubspec.yaml
index 1c236f939..245e4a6d5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -14,7 +14,8 @@ description: Stack Duo
 version: 1.0.8+13
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=3.0.2 <4.0.0"
+  flutter: ^3.10.5
 
 dependencies:
   flutter:
@@ -34,35 +35,27 @@ dependencies:
     path: ./crypto_plugins/flutter_libmonero/cw_core
 
 
-#  firo_flutter:
-#    git:
-#      url: https://github.com/cypherstack/firo_flutter.git
-#      ref: update
-  #    path: ./crypto_plugins/firo_flutter
-
   bitcoindart:
     git:
       url: https://github.com/cypherstack/bitcoindart.git
-      ref: 004d6f82dff7389b561e5078b4649adcd2d9c10f
+      ref: af6d6c27edfe2e7cc35772ed2684eb4cc826f0e4
 
   stack_wallet_backup:
     git:
       url: https://github.com/cypherstack/stack_wallet_backup.git
-      ref: e4b08d2b8965a5ae49bd57f598fa9011dd0c25e9
+      ref: ee1da8a9ba1cbeb50c5b354ea1fd5a25b7c5a3ed
 
   bip47:
     git:
       url: https://github.com/cypherstack/bip47.git
-      ref: 38847255d035c0f6ec5bc93d19130ec804cf90e9
+      ref: 081ca1863c2feba00c35bb5b297902f12f499941
 
   # Utility plugins
-#  provider: ^6.0.1
-  http: ^0.13.4
+  http: ^0.13.0
   local_auth: ^1.1.10
   permission_handler: ^10.0.0
   flutter_local_notifications: ^9.4.0
   rxdart: ^0.27.3
-#  filesystem_picker: ^3.0.0-beta.1
   zxcvbn: ^1.0.0
   dart_numerics: ^0.0.6
 
@@ -75,63 +68,51 @@ dependencies:
   bip39:
     git:
       url: https://github.com/cypherstack/stack-bip39.git
-      ref: 3bef5acc21340f3cc78df0ad1dce5868a3ed68a5
-  bitbox:
-    git:
-      url: https://github.com/Quppy/bitbox-flutter.git
-      ref: ea65073efbaf395a5557e8cd7bd72f195cd7eb11
+      ref: 0cd6d54e2860bea68fc50c801cb9db2a760192fb
   bip32: ^2.0.0
   bech32:
     git:
       url: https://github.com/cypherstack/bech32.git
-      ref: 22279d4bb24ed541b431acd269a1bc50af0f36a0
+      ref: b6d2a5b4cd17311d917787c0f9505f04932659b1
   bs58check: ^1.0.2
 
   # Storage plugins
-  flutter_secure_storage: ^5.0.2
+  flutter_secure_storage: ^8.0.0
   hive: ^2.0.5
   hive_flutter: ^1.1.0
-  path_provider: ^2.0.8
+  path_provider: ^2.0.15
 
   # UI/Component plugins
   flutter_native_splash: ^2.2.4
-  animations: ^2.0.2
-  toast: ^0.1.5
-  flare_flutter: ^3.0.2
-  google_fonts: ^2.2.0
+  google_fonts: ^4.0.4
   url_launcher: ^6.0.5
   flutter_svg: ^1.0.1
   flutter_feather_icons: ^2.0.0+1
-  flutter_spinkit: ^5.1.0
   decimal: ^2.1.0
   event_bus: ^2.0.0
   uuid: ^3.0.5
-  flutter_rounded_date_picker: ^3.0.1
+  flutter_rounded_date_picker: ^3.0.4
   crypto: ^3.0.2
-  jsonrpc2: ^3.0.1
-  barcode_scan2: ^4.2.0
-  app_settings: ^4.1.1
+  barcode_scan2: ^4.2.4
   wakelock: ^0.6.2
   intl: ^0.17.0
-  devicelocale: ^0.5.0
-  device_info_plus: ^7.0.1
+  devicelocale: ^0.6.0
+  device_info_plus: ^9.0.2
   keyboard_dismisser: ^3.0.0
   another_flushbar: ^1.10.28
   tuple: ^2.0.0
   flutter_riverpod: ^1.0.3
-  qr_flutter: ^4.0.0
-  share_plus: ^6.3.0
+  qr_flutter: ^4.1.0
+  share_plus: ^7.0.2
   emojis: ^0.9.9
   pointycastle: ^3.6.0
-  package_info_plus: ^1.4.2
-  lottie: ^1.3.0
-#  shared_preferences: ^2.0.15
-  file_picker: ^5.0.1
-  connectivity_plus: 2.3.6+1
-#  document_file_save_plus: ^1.0.5
+  package_info_plus: ^4.0.2
+  lottie: ^2.3.2
+  file_picker: ^5.3.1
+  connectivity_plus: ^4.0.1
   isar: 3.0.5
   isar_flutter_libs: 3.0.5 # contains the binaries
-  dropdown_button2: 1.7.2
+  dropdown_button2: ^2.1.3
   string_validator: ^0.3.0
   equatable: ^2.0.5
   async: ^2.10.0
@@ -139,7 +120,6 @@ dependencies:
   dart_bs58: ^1.0.1
   dart_bs58check: ^3.0.2
   hex: ^0.2.0
-  rational: ^2.2.2
   archive: ^3.3.2
   desktop_drop: ^0.4.1
 
@@ -150,13 +130,13 @@ dev_dependencies:
       sdk: flutter
   build_runner: ^2.1.7
   flutter_launcher_icons: ^0.11.0
-  hive_generator: ^1.1.2
+  hive_generator: ^2.0.0
   dependency_validator: ^3.1.2
   hive_test: ^1.0.1
-  mockito: ^5.1.0
+  mockito: ^5.4.1
   mockingjay: ^0.2.0
 #  lint: ^1.10.0
-  analyzer: ^4.6.0
+  analyzer: ^5.13.0
   import_sorter: ^4.6.0
   flutter_lints: ^2.0.1
   isar_generator: 3.0.5
@@ -182,11 +162,21 @@ flutter_native_splash:
   android_disable_fullscreen: true
 
 dependency_overrides:
-  bip39:
+
+  # required for dart 3, at least until a fix is merged upstream
+  wakelock_windows:
     git:
-      url: https://github.com/cypherstack/stack-bip39.git
-      ref: 3bef5acc21340f3cc78df0ad1dce5868a3ed68a5
-  crypto: 3.0.2
+      url: https://github.com/diegotori/wakelock
+      ref: 2a9bca63a540771f241d688562351482b2cf234c
+      path: wakelock_windows
+
+  # required for libmonero - can remove once libmonero has been updated, PR has been merged in swb
+  stack_wallet_backup:
+    git:
+      url: https://github.com/cypherstack/stack_wallet_backup.git
+      ref: ee1da8a9ba1cbeb50c5b354ea1fd5a25b7c5a3ed
+
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
diff --git a/test/cached_electrumx_test.mocks.dart b/test/cached_electrumx_test.mocks.dart
index 598fefec5..79b13f9fd 100644
--- a/test/cached_electrumx_test.mocks.dart
+++ b/test/cached_electrumx_test.mocks.dart
@@ -1,15 +1,16 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/cached_electrumx_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
-import 'dart:ui' as _i8;
 
 import 'package:decimal/decimal.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackduo/utilities/amount/amount_unit.dart' as _i8;
 import 'package:stackduo/utilities/enums/backup_frequency_type.dart' as _i7;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i9;
 import 'package:stackduo/utilities/enums/sync_type_enum.dart' as _i6;
 import 'package:stackduo/utilities/prefs.dart' as _i5;
 
@@ -782,7 +783,55 @@ class MockPrefs extends _i1.Mock implements _i5.Prefs {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void addListener(_i8.VoidCallback? listener) => super.noSuchMethod(
+  _i8.AmountUnit amountUnit(_i9.Coin? coin) => (super.noSuchMethod(
+        Invocation.method(
+          #amountUnit,
+          [coin],
+        ),
+        returnValue: _i8.AmountUnit.normal,
+      ) as _i8.AmountUnit);
+  @override
+  void updateAmountUnit({
+    required _i9.Coin? coin,
+    required _i8.AmountUnit? amountUnit,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #updateAmountUnit,
+          [],
+          {
+            #coin: coin,
+            #amountUnit: amountUnit,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int maxDecimals(_i9.Coin? coin) => (super.noSuchMethod(
+        Invocation.method(
+          #maxDecimals,
+          [coin],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  void updateMaxDecimals({
+    required _i9.Coin? coin,
+    required int? maxDecimals,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #updateMaxDecimals,
+          [],
+          {
+            #coin: coin,
+            #maxDecimals: maxDecimals,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -790,7 +839,7 @@ class MockPrefs extends _i1.Mock implements _i5.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i8.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/electrumx_test.dart b/test/electrumx_test.dart
index 8d29f63e9..d8f3022fa 100644
--- a/test/electrumx_test.dart
+++ b/test/electrumx_test.dart
@@ -1,1303 +1,1303 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:stackwallet/electrumx_rpc/electrumx.dart';
-import 'package:stackwallet/electrumx_rpc/rpc.dart';
-import 'package:stackwallet/utilities/prefs.dart';
-
-import 'electrumx_test.mocks.dart';
-import 'sample_data/get_anonymity_set_sample_data.dart';
-import 'sample_data/get_used_serials_sample_data.dart';
-import 'sample_data/transaction_data_samples.dart';
-
-@GenerateMocks([JsonRPC, Prefs])
-void main() {
-  group("factory constructors and getters", () {
-    test("electrumxnode .from factory", () {
-      final nodeA = ElectrumXNode(
-        address: "some address",
-        port: 1,
-        name: "some name",
-        id: "some ID",
-        useSSL: true,
-      );
-
-      final nodeB = ElectrumXNode.from(nodeA);
-
-      expect(nodeB.toString(), nodeA.toString());
-      expect(nodeA == nodeB, false);
-    });
-
-    test("electrumx .from factory", () {
-      final node = ElectrumXNode(
-        address: "some address",
-        port: 1,
-        name: "some name",
-        id: "some ID",
-        useSSL: true,
-      );
-
-      final mockPrefs = MockPrefs();
-
-      final client =
-          ElectrumX.from(node: node, failovers: [], prefs: mockPrefs);
-
-      expect(client.useSSL, node.useSSL);
-      expect(client.host, node.address);
-      expect(client.port, node.port);
-      expect(client.rpcClient, null);
-
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  test("Server error", () {
-    final mockClient = MockJsonRPC();
-    const command = "blockchain.transaction.get";
-    const jsonArgs = '["",true]';
-    when(
-      mockClient.request(
-        '{"jsonrpc": "2.0", "id": "some requestId",'
-        '"method": "$command","params": $jsonArgs}',
-      ),
-    ).thenAnswer(
-      (_) async => JsonRPCResponse(data: {
-        "jsonrpc": "2.0",
-        "error": {
-          "code": 1,
-          "message": "None should be a transaction hash",
-        },
-        "id": "some requestId",
-      }),
-    );
-
-    final mockPrefs = MockPrefs();
-    when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-
-    final client = ElectrumX(
-        host: "some server",
-        port: 0,
-        useSSL: true,
-        client: mockClient,
-        failovers: [],
-        prefs: mockPrefs);
-
-    expect(() => client.getTransaction(requestID: "some requestId", txHash: ''),
-        throwsA(isA<Exception>()));
-    verify(mockPrefs.wifiOnly).called(1);
-    verifyNoMoreInteractions(mockPrefs);
-  });
-
-  group("getBlockHeadTip", () {
-    test("getBlockHeadTip success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.headers.subscribe";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": {"height": 520481, "hex": "some block hex string"},
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result =
-          await (client.getBlockHeadTip(requestID: "some requestId"));
-
-      expect(result["height"], 520481);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getBlockHeadTip throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.headers.subscribe";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(() => client.getBlockHeadTip(requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("ping", () {
-    test("ping success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "server.ping";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": null,
-          "id": "some requestId",
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.ping(requestID: "some requestId");
-
-      expect(result, true);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("ping throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "server.ping";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(() => client.ping(requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getServerFeatures", () {
-    test("getServerFeatures success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "server.features";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": {
-            "genesis_hash":
-                "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943",
-            "hosts": {
-              "0.0.0.0": {"tcp_port": 51001, "ssl_port": 51002}
-            },
-            "protocol_max": "1.0",
-            "protocol_min": "1.0",
-            "pruning": null,
-            "server_version": "ElectrumX 1.0.17",
-            "hash_function": "sha256"
-          },
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result =
-          await client.getServerFeatures(requestID: "some requestId");
-
-      expect(result, {
-        "genesis_hash":
-            "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943",
-        "hosts": {
-          "0.0.0.0": {"tcp_port": 51001, "ssl_port": 51002}
-        },
-        "protocol_max": "1.0",
-        "protocol_min": "1.0",
-        "pruning": null,
-        "server_version": "ElectrumX 1.0.17",
-        "hash_function": "sha256",
-      });
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getServerFeatures throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "server.features";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(() => client.getServerFeatures(requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("broadcastTransaction", () {
-    test("broadcastTransaction success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.transaction.broadcast";
-      const jsonArgs = '["some raw transaction string"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": "the txid of the rawtx",
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.broadcastTransaction(
-          rawTx: "some raw transaction string", requestID: "some requestId");
-
-      expect(result, "the txid of the rawtx");
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("broadcastTransaction throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.transaction.broadcast";
-      const jsonArgs = '["some raw transaction string"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.broadcastTransaction(
-              rawTx: "some raw transaction string",
-              requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getBalance", () {
-    test("getBalance success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.scripthash.get_balance";
-      const jsonArgs = '["dummy hash"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": {
-            "confirmed": 103873966,
-            "unconfirmed": 23684400,
-          },
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getBalance(
-          scripthash: "dummy hash", requestID: "some requestId");
-
-      expect(result, {"confirmed": 103873966, "unconfirmed": 23684400});
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getBalance throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.scripthash.get_balance";
-      const jsonArgs = '["dummy hash"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getBalance(
-              scripthash: "dummy hash", requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getHistory", () {
-    test("getHistory success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.scripthash.get_history";
-      const jsonArgs = '["dummy hash"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": [
-            {
-              "height": 200004,
-              "tx_hash":
-                  "acc3758bd2a26f869fcc67d48ff30b96464d476bca82c1cd6656e7d506816412"
-            },
-            {
-              "height": 215008,
-              "tx_hash":
-                  "f3e1bf48975b8d6060a9de8884296abb80be618dc00ae3cb2f6cee3085e09403"
-            }
-          ],
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getHistory(
-          scripthash: "dummy hash", requestID: "some requestId");
-
-      expect(result, [
-        {
-          "height": 200004,
-          "tx_hash":
-              "acc3758bd2a26f869fcc67d48ff30b96464d476bca82c1cd6656e7d506816412"
-        },
-        {
-          "height": 215008,
-          "tx_hash":
-              "f3e1bf48975b8d6060a9de8884296abb80be618dc00ae3cb2f6cee3085e09403"
-        }
-      ]);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getHistory throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.scripthash.get_history";
-      const jsonArgs = '["dummy hash"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getHistory(
-              scripthash: "dummy hash", requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getUTXOs", () {
-    test("getUTXOs success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.scripthash.listunspent";
-      const jsonArgs = '["dummy hash"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": [
-            {
-              "tx_pos": 0,
-              "value": 45318048,
-              "tx_hash":
-                  "9f2c45a12db0144909b5db269415f7319179105982ac70ed80d76ea79d923ebf",
-              "height": 437146
-            },
-            {
-              "tx_pos": 0,
-              "value": 919195,
-              "tx_hash":
-                  "3d2290c93436a3e964cfc2f0950174d8847b1fbe3946432c4784e168da0f019f",
-              "height": 441696
-            }
-          ],
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getUTXOs(
-          scripthash: "dummy hash", requestID: "some requestId");
-
-      expect(result, [
-        {
-          "tx_pos": 0,
-          "value": 45318048,
-          "tx_hash":
-              "9f2c45a12db0144909b5db269415f7319179105982ac70ed80d76ea79d923ebf",
-          "height": 437146
-        },
-        {
-          "tx_pos": 0,
-          "value": 919195,
-          "tx_hash":
-              "3d2290c93436a3e964cfc2f0950174d8847b1fbe3946432c4784e168da0f019f",
-          "height": 441696
-        }
-      ]);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getUTXOs throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.scripthash.listunspent";
-      const jsonArgs = '["dummy hash"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getUTXOs(
-              scripthash: "dummy hash", requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getTransaction", () {
-    test("getTransaction success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.transaction.get";
-      const jsonArgs = '["${SampleGetTransactionData.txHash0}",true]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": SampleGetTransactionData.txData0,
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getTransaction(
-          txHash: SampleGetTransactionData.txHash0,
-          verbose: true,
-          requestID: "some requestId");
-
-      expect(result, SampleGetTransactionData.txData0);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getTransaction throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.transaction.get";
-      const jsonArgs = '["${SampleGetTransactionData.txHash0}",true]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getTransaction(
-              txHash: SampleGetTransactionData.txHash0,
-              requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getAnonymitySet", () {
-    test("getAnonymitySet success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getanonymityset";
-      const jsonArgs = '["1",""]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": GetAnonymitySetSampleData.data,
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getAnonymitySet(
-          groupId: "1", blockhash: "", requestID: "some requestId");
-
-      expect(result, GetAnonymitySetSampleData.data);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getAnonymitySet throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getanonymityset";
-      const jsonArgs = '["1",""]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () =>
-              client.getAnonymitySet(groupId: "1", requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getMintData", () {
-    test("getMintData success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getmintmetadata";
-      const jsonArgs = '["some mints"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": "mint meta data",
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getMintData(
-          mints: "some mints", requestID: "some requestId");
-
-      expect(result, "mint meta data");
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getMintData throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getmintmetadata";
-      const jsonArgs = '["some mints"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getMintData(
-              mints: "some mints", requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getUsedCoinSerials", () {
-    test("getUsedCoinSerials success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getusedcoinserials";
-      const jsonArgs = '["0"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": GetUsedSerialsSampleData.serials,
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getUsedCoinSerials(
-          requestID: "some requestId", startNumber: 0);
-
-      expect(result, GetUsedSerialsSampleData.serials);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getUsedCoinSerials throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getusedcoinserials";
-      const jsonArgs = '["0"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getUsedCoinSerials(
-              requestID: "some requestId", startNumber: 0),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getLatestCoinId", () {
-    test("getLatestCoinId success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getlatestcoinid";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": 1,
-          "id": "some requestId",
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getLatestCoinId(requestID: "some requestId");
-
-      expect(result, 1);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getLatestCoinId throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getlatestcoinid";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getLatestCoinId(
-                requestID: "some requestId",
-              ),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getCoinsForRecovery", () {
-    test("getCoinsForRecovery success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getanonymityset";
-      const jsonArgs = '["1",""]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": GetAnonymitySetSampleData.data,
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getAnonymitySet(
-          groupId: "1", blockhash: "", requestID: "some requestId");
-
-      expect(result, GetAnonymitySetSampleData.data);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getAnonymitySet throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getanonymityset";
-      const jsonArgs = '["1",""]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getAnonymitySet(
-                groupId: "1",
-                requestID: "some requestId",
-              ),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getMintData", () {
-    test("getMintData success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getmintmetadata";
-      const jsonArgs = '["some mints"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": "mint meta data",
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getMintData(
-          mints: "some mints", requestID: "some requestId");
-
-      expect(result, "mint meta data");
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getMintData throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getmintmetadata";
-      const jsonArgs = '["some mints"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getMintData(
-                mints: "some mints",
-                requestID: "some requestId",
-              ),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getUsedCoinSerials", () {
-    test("getUsedCoinSerials success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getusedcoinserials";
-      const jsonArgs = '["0"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": GetUsedSerialsSampleData.serials,
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getUsedCoinSerials(
-          requestID: "some requestId", startNumber: 0);
-
-      expect(result, GetUsedSerialsSampleData.serials);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getUsedCoinSerials throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getusedcoinserials";
-      const jsonArgs = '["0"]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(
-          () => client.getUsedCoinSerials(
-              requestID: "some requestId", startNumber: 0),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getLatestCoinId", () {
-    test("getLatestCoinId success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getlatestcoinid";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": 1,
-          "id": "some requestId",
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getLatestCoinId(requestID: "some requestId");
-
-      expect(result, 1);
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getLatestCoinId throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "lelantus.getlatestcoinid";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(() => client.getLatestCoinId(requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  group("getFeeRate", () {
-    test("getFeeRate success", () async {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.getfeerate";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenAnswer(
-        (_) async => JsonRPCResponse(data: {
-          "jsonrpc": "2.0",
-          "result": {
-            "rate": 1000,
-          },
-          "id": "some requestId"
-        }),
-      );
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      final result = await client.getFeeRate(requestID: "some requestId");
-
-      expect(result, {"rate": 1000});
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-
-    test("getFeeRate throws/fails", () {
-      final mockClient = MockJsonRPC();
-      const command = "blockchain.getfeerate";
-      const jsonArgs = '[]';
-      when(
-        mockClient.request(
-          '{"jsonrpc": "2.0", "id": "some requestId",'
-          '"method": "$command","params": $jsonArgs}',
-        ),
-      ).thenThrow(Exception());
-
-      final mockPrefs = MockPrefs();
-      when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-      final client = ElectrumX(
-          host: "some server",
-          port: 0,
-          useSSL: true,
-          client: mockClient,
-          prefs: mockPrefs,
-          failovers: []);
-
-      expect(() => client.getFeeRate(requestID: "some requestId"),
-          throwsA(isA<Exception>()));
-      verify(mockPrefs.wifiOnly).called(1);
-      verifyNoMoreInteractions(mockPrefs);
-    });
-  });
-
-  test("rpcClient is null throws with bad server info", () {
-    final mockPrefs = MockPrefs();
-    when(mockPrefs.wifiOnly).thenAnswer((_) => false);
-    final client = ElectrumX(
-      client: null,
-      port: -10,
-      host: "_ :sa  %",
-      useSSL: false,
-      prefs: mockPrefs,
-      failovers: [],
-    );
-
-    expect(() => client.getFeeRate(), throwsA(isA<Exception>()));
-    verify(mockPrefs.wifiOnly).called(1);
-    verifyNoMoreInteractions(mockPrefs);
-  });
-}
+// import 'package:flutter_test/flutter_test.dart';
+// import 'package:mockito/annotations.dart';
+// import 'package:mockito/mockito.dart';
+// import 'package:stackwallet/electrumx_rpc/electrumx.dart';
+// import 'package:stackwallet/electrumx_rpc/rpc.dart';
+// import 'package:stackwallet/utilities/prefs.dart';
+//
+// import 'electrumx_test.mocks.dart';
+// import 'sample_data/get_anonymity_set_sample_data.dart';
+// import 'sample_data/get_used_serials_sample_data.dart';
+// import 'sample_data/transaction_data_samples.dart';
+//
+// @GenerateMocks([JsonRPC, Prefs])
+// void main() {
+//   group("factory constructors and getters", () {
+//     test("electrumxnode .from factory", () {
+//       final nodeA = ElectrumXNode(
+//         address: "some address",
+//         port: 1,
+//         name: "some name",
+//         id: "some ID",
+//         useSSL: true,
+//       );
+//
+//       final nodeB = ElectrumXNode.from(nodeA);
+//
+//       expect(nodeB.toString(), nodeA.toString());
+//       expect(nodeA == nodeB, false);
+//     });
+//
+//     test("electrumx .from factory", () {
+//       final node = ElectrumXNode(
+//         address: "some address",
+//         port: 1,
+//         name: "some name",
+//         id: "some ID",
+//         useSSL: true,
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//
+//       final client =
+//           ElectrumX.from(node: node, failovers: [], prefs: mockPrefs);
+//
+//       expect(client.useSSL, node.useSSL);
+//       expect(client.host, node.address);
+//       expect(client.port, node.port);
+//       expect(client.rpcClient, null);
+//
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   test("Server error", () {
+//     final mockClient = MockJsonRPC();
+//     const command = "blockchain.transaction.get";
+//     const jsonArgs = '["",true]';
+//     when(
+//       mockClient.request(
+//         '{"jsonrpc": "2.0", "id": "some requestId",'
+//         '"method": "$command","params": $jsonArgs}',
+//       ),
+//     ).thenAnswer(
+//       (_) async => JsonRPCResponse(data: {
+//         "jsonrpc": "2.0",
+//         "error": {
+//           "code": 1,
+//           "message": "None should be a transaction hash",
+//         },
+//         "id": "some requestId",
+//       }),
+//     );
+//
+//     final mockPrefs = MockPrefs();
+//     when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//
+//     final client = ElectrumX(
+//         host: "some server",
+//         port: 0,
+//         useSSL: true,
+//         client: mockClient,
+//         failovers: [],
+//         prefs: mockPrefs);
+//
+//     expect(() => client.getTransaction(requestID: "some requestId", txHash: ''),
+//         throwsA(isA<Exception>()));
+//     verify(mockPrefs.wifiOnly).called(1);
+//     verifyNoMoreInteractions(mockPrefs);
+//   });
+//
+//   group("getBlockHeadTip", () {
+//     test("getBlockHeadTip success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.headers.subscribe";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": {"height": 520481, "hex": "some block hex string"},
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result =
+//           await (client.getBlockHeadTip(requestID: "some requestId"));
+//
+//       expect(result["height"], 520481);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getBlockHeadTip throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.headers.subscribe";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(() => client.getBlockHeadTip(requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("ping", () {
+//     test("ping success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "server.ping";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": null,
+//           "id": "some requestId",
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.ping(requestID: "some requestId");
+//
+//       expect(result, true);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("ping throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "server.ping";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(() => client.ping(requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getServerFeatures", () {
+//     test("getServerFeatures success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "server.features";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": {
+//             "genesis_hash":
+//                 "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943",
+//             "hosts": {
+//               "0.0.0.0": {"tcp_port": 51001, "ssl_port": 51002}
+//             },
+//             "protocol_max": "1.0",
+//             "protocol_min": "1.0",
+//             "pruning": null,
+//             "server_version": "ElectrumX 1.0.17",
+//             "hash_function": "sha256"
+//           },
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result =
+//           await client.getServerFeatures(requestID: "some requestId");
+//
+//       expect(result, {
+//         "genesis_hash":
+//             "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943",
+//         "hosts": {
+//           "0.0.0.0": {"tcp_port": 51001, "ssl_port": 51002}
+//         },
+//         "protocol_max": "1.0",
+//         "protocol_min": "1.0",
+//         "pruning": null,
+//         "server_version": "ElectrumX 1.0.17",
+//         "hash_function": "sha256",
+//       });
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getServerFeatures throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "server.features";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(() => client.getServerFeatures(requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("broadcastTransaction", () {
+//     test("broadcastTransaction success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.transaction.broadcast";
+//       const jsonArgs = '["some raw transaction string"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": "the txid of the rawtx",
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.broadcastTransaction(
+//           rawTx: "some raw transaction string", requestID: "some requestId");
+//
+//       expect(result, "the txid of the rawtx");
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("broadcastTransaction throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.transaction.broadcast";
+//       const jsonArgs = '["some raw transaction string"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.broadcastTransaction(
+//               rawTx: "some raw transaction string",
+//               requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getBalance", () {
+//     test("getBalance success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.scripthash.get_balance";
+//       const jsonArgs = '["dummy hash"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": {
+//             "confirmed": 103873966,
+//             "unconfirmed": 23684400,
+//           },
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getBalance(
+//           scripthash: "dummy hash", requestID: "some requestId");
+//
+//       expect(result, {"confirmed": 103873966, "unconfirmed": 23684400});
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getBalance throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.scripthash.get_balance";
+//       const jsonArgs = '["dummy hash"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getBalance(
+//               scripthash: "dummy hash", requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getHistory", () {
+//     test("getHistory success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.scripthash.get_history";
+//       const jsonArgs = '["dummy hash"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": [
+//             {
+//               "height": 200004,
+//               "tx_hash":
+//                   "acc3758bd2a26f869fcc67d48ff30b96464d476bca82c1cd6656e7d506816412"
+//             },
+//             {
+//               "height": 215008,
+//               "tx_hash":
+//                   "f3e1bf48975b8d6060a9de8884296abb80be618dc00ae3cb2f6cee3085e09403"
+//             }
+//           ],
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getHistory(
+//           scripthash: "dummy hash", requestID: "some requestId");
+//
+//       expect(result, [
+//         {
+//           "height": 200004,
+//           "tx_hash":
+//               "acc3758bd2a26f869fcc67d48ff30b96464d476bca82c1cd6656e7d506816412"
+//         },
+//         {
+//           "height": 215008,
+//           "tx_hash":
+//               "f3e1bf48975b8d6060a9de8884296abb80be618dc00ae3cb2f6cee3085e09403"
+//         }
+//       ]);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getHistory throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.scripthash.get_history";
+//       const jsonArgs = '["dummy hash"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getHistory(
+//               scripthash: "dummy hash", requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getUTXOs", () {
+//     test("getUTXOs success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.scripthash.listunspent";
+//       const jsonArgs = '["dummy hash"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": [
+//             {
+//               "tx_pos": 0,
+//               "value": 45318048,
+//               "tx_hash":
+//                   "9f2c45a12db0144909b5db269415f7319179105982ac70ed80d76ea79d923ebf",
+//               "height": 437146
+//             },
+//             {
+//               "tx_pos": 0,
+//               "value": 919195,
+//               "tx_hash":
+//                   "3d2290c93436a3e964cfc2f0950174d8847b1fbe3946432c4784e168da0f019f",
+//               "height": 441696
+//             }
+//           ],
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getUTXOs(
+//           scripthash: "dummy hash", requestID: "some requestId");
+//
+//       expect(result, [
+//         {
+//           "tx_pos": 0,
+//           "value": 45318048,
+//           "tx_hash":
+//               "9f2c45a12db0144909b5db269415f7319179105982ac70ed80d76ea79d923ebf",
+//           "height": 437146
+//         },
+//         {
+//           "tx_pos": 0,
+//           "value": 919195,
+//           "tx_hash":
+//               "3d2290c93436a3e964cfc2f0950174d8847b1fbe3946432c4784e168da0f019f",
+//           "height": 441696
+//         }
+//       ]);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getUTXOs throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.scripthash.listunspent";
+//       const jsonArgs = '["dummy hash"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getUTXOs(
+//               scripthash: "dummy hash", requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getTransaction", () {
+//     test("getTransaction success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.transaction.get";
+//       const jsonArgs = '["${SampleGetTransactionData.txHash0}",true]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": SampleGetTransactionData.txData0,
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getTransaction(
+//           txHash: SampleGetTransactionData.txHash0,
+//           verbose: true,
+//           requestID: "some requestId");
+//
+//       expect(result, SampleGetTransactionData.txData0);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getTransaction throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.transaction.get";
+//       const jsonArgs = '["${SampleGetTransactionData.txHash0}",true]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getTransaction(
+//               txHash: SampleGetTransactionData.txHash0,
+//               requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getAnonymitySet", () {
+//     test("getAnonymitySet success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getanonymityset";
+//       const jsonArgs = '["1",""]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": GetAnonymitySetSampleData.data,
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getAnonymitySet(
+//           groupId: "1", blockhash: "", requestID: "some requestId");
+//
+//       expect(result, GetAnonymitySetSampleData.data);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getAnonymitySet throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getanonymityset";
+//       const jsonArgs = '["1",""]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () =>
+//               client.getAnonymitySet(groupId: "1", requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getMintData", () {
+//     test("getMintData success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getmintmetadata";
+//       const jsonArgs = '["some mints"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": "mint meta data",
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getMintData(
+//           mints: "some mints", requestID: "some requestId");
+//
+//       expect(result, "mint meta data");
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getMintData throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getmintmetadata";
+//       const jsonArgs = '["some mints"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getMintData(
+//               mints: "some mints", requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getUsedCoinSerials", () {
+//     test("getUsedCoinSerials success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getusedcoinserials";
+//       const jsonArgs = '["0"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": GetUsedSerialsSampleData.serials,
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getUsedCoinSerials(
+//           requestID: "some requestId", startNumber: 0);
+//
+//       expect(result, GetUsedSerialsSampleData.serials);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getUsedCoinSerials throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getusedcoinserials";
+//       const jsonArgs = '["0"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getUsedCoinSerials(
+//               requestID: "some requestId", startNumber: 0),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getLatestCoinId", () {
+//     test("getLatestCoinId success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getlatestcoinid";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": 1,
+//           "id": "some requestId",
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getLatestCoinId(requestID: "some requestId");
+//
+//       expect(result, 1);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getLatestCoinId throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getlatestcoinid";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getLatestCoinId(
+//                 requestID: "some requestId",
+//               ),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getCoinsForRecovery", () {
+//     test("getCoinsForRecovery success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getanonymityset";
+//       const jsonArgs = '["1",""]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": GetAnonymitySetSampleData.data,
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getAnonymitySet(
+//           groupId: "1", blockhash: "", requestID: "some requestId");
+//
+//       expect(result, GetAnonymitySetSampleData.data);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getAnonymitySet throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getanonymityset";
+//       const jsonArgs = '["1",""]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getAnonymitySet(
+//                 groupId: "1",
+//                 requestID: "some requestId",
+//               ),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getMintData", () {
+//     test("getMintData success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getmintmetadata";
+//       const jsonArgs = '["some mints"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": "mint meta data",
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getMintData(
+//           mints: "some mints", requestID: "some requestId");
+//
+//       expect(result, "mint meta data");
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getMintData throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getmintmetadata";
+//       const jsonArgs = '["some mints"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getMintData(
+//                 mints: "some mints",
+//                 requestID: "some requestId",
+//               ),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getUsedCoinSerials", () {
+//     test("getUsedCoinSerials success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getusedcoinserials";
+//       const jsonArgs = '["0"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": GetUsedSerialsSampleData.serials,
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getUsedCoinSerials(
+//           requestID: "some requestId", startNumber: 0);
+//
+//       expect(result, GetUsedSerialsSampleData.serials);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getUsedCoinSerials throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getusedcoinserials";
+//       const jsonArgs = '["0"]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(
+//           () => client.getUsedCoinSerials(
+//               requestID: "some requestId", startNumber: 0),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getLatestCoinId", () {
+//     test("getLatestCoinId success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getlatestcoinid";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": 1,
+//           "id": "some requestId",
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getLatestCoinId(requestID: "some requestId");
+//
+//       expect(result, 1);
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getLatestCoinId throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "lelantus.getlatestcoinid";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(() => client.getLatestCoinId(requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   group("getFeeRate", () {
+//     test("getFeeRate success", () async {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.getfeerate";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenAnswer(
+//         (_) async => JsonRPCResponse(data: {
+//           "jsonrpc": "2.0",
+//           "result": {
+//             "rate": 1000,
+//           },
+//           "id": "some requestId"
+//         }),
+//       );
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       final result = await client.getFeeRate(requestID: "some requestId");
+//
+//       expect(result, {"rate": 1000});
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//
+//     test("getFeeRate throws/fails", () {
+//       final mockClient = MockJsonRPC();
+//       const command = "blockchain.getfeerate";
+//       const jsonArgs = '[]';
+//       when(
+//         mockClient.request(
+//           '{"jsonrpc": "2.0", "id": "some requestId",'
+//           '"method": "$command","params": $jsonArgs}',
+//         ),
+//       ).thenThrow(Exception());
+//
+//       final mockPrefs = MockPrefs();
+//       when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//       final client = ElectrumX(
+//           host: "some server",
+//           port: 0,
+//           useSSL: true,
+//           client: mockClient,
+//           prefs: mockPrefs,
+//           failovers: []);
+//
+//       expect(() => client.getFeeRate(requestID: "some requestId"),
+//           throwsA(isA<Exception>()));
+//       verify(mockPrefs.wifiOnly).called(1);
+//       verifyNoMoreInteractions(mockPrefs);
+//     });
+//   });
+//
+//   test("rpcClient is null throws with bad server info", () {
+//     final mockPrefs = MockPrefs();
+//     when(mockPrefs.wifiOnly).thenAnswer((_) => false);
+//     final client = ElectrumX(
+//       client: null,
+//       port: -10,
+//       host: "_ :sa  %",
+//       useSSL: false,
+//       prefs: mockPrefs,
+//       failovers: [],
+//     );
+//
+//     expect(() => client.getFeeRate(), throwsA(isA<Exception>()));
+//     verify(mockPrefs.wifiOnly).called(1);
+//     verifyNoMoreInteractions(mockPrefs);
+//   });
+// }
diff --git a/test/electrumx_test.mocks.dart b/test/electrumx_test.mocks.dart
deleted file mode 100644
index 8c9649d20..000000000
--- a/test/electrumx_test.mocks.dart
+++ /dev/null
@@ -1,543 +0,0 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackduo/test/electrumx_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i3;
-import 'dart:ui' as _i7;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/electrumx_rpc/rpc.dart' as _i2;
-import 'package:stackduo/utilities/enums/backup_frequency_type.dart' as _i6;
-import 'package:stackduo/utilities/enums/sync_type_enum.dart' as _i5;
-import 'package:stackduo/utilities/prefs.dart' as _i4;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeDuration_0 extends _i1.SmartFake implements Duration {
-  _FakeDuration_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeJsonRPCResponse_1 extends _i1.SmartFake
-    implements _i2.JsonRPCResponse {
-  _FakeJsonRPCResponse_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [JsonRPC].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockJsonRPC extends _i1.Mock implements _i2.JsonRPC {
-  MockJsonRPC() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  bool get useSSL => (super.noSuchMethod(
-        Invocation.getter(#useSSL),
-        returnValue: false,
-      ) as bool);
-  @override
-  String get host => (super.noSuchMethod(
-        Invocation.getter(#host),
-        returnValue: '',
-      ) as String);
-  @override
-  int get port => (super.noSuchMethod(
-        Invocation.getter(#port),
-        returnValue: 0,
-      ) as int);
-  @override
-  Duration get connectionTimeout => (super.noSuchMethod(
-        Invocation.getter(#connectionTimeout),
-        returnValue: _FakeDuration_0(
-          this,
-          Invocation.getter(#connectionTimeout),
-        ),
-      ) as Duration);
-  @override
-  _i3.Future<_i2.JsonRPCResponse> request(String? jsonRpcRequest) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #request,
-          [jsonRpcRequest],
-        ),
-        returnValue:
-            _i3.Future<_i2.JsonRPCResponse>.value(_FakeJsonRPCResponse_1(
-          this,
-          Invocation.method(
-            #request,
-            [jsonRpcRequest],
-          ),
-        )),
-      ) as _i3.Future<_i2.JsonRPCResponse>);
-  @override
-  _i3.Future<void> disconnect({required String? reason}) => (super.noSuchMethod(
-        Invocation.method(
-          #disconnect,
-          [],
-          {#reason: reason},
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
-  @override
-  _i3.Future<void> connect() => (super.noSuchMethod(
-        Invocation.method(
-          #connect,
-          [],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
-}
-
-/// A class which mocks [Prefs].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockPrefs extends _i1.Mock implements _i4.Prefs {
-  MockPrefs() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  bool get isInitialized => (super.noSuchMethod(
-        Invocation.getter(#isInitialized),
-        returnValue: false,
-      ) as bool);
-  @override
-  int get lastUnlockedTimeout => (super.noSuchMethod(
-        Invocation.getter(#lastUnlockedTimeout),
-        returnValue: 0,
-      ) as int);
-  @override
-  set lastUnlockedTimeout(int? lastUnlockedTimeout) => super.noSuchMethod(
-        Invocation.setter(
-          #lastUnlockedTimeout,
-          lastUnlockedTimeout,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get lastUnlocked => (super.noSuchMethod(
-        Invocation.getter(#lastUnlocked),
-        returnValue: 0,
-      ) as int);
-  @override
-  set lastUnlocked(int? lastUnlocked) => super.noSuchMethod(
-        Invocation.setter(
-          #lastUnlocked,
-          lastUnlocked,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get currentNotificationId => (super.noSuchMethod(
-        Invocation.getter(#currentNotificationId),
-        returnValue: 0,
-      ) as int);
-  @override
-  List<String> get walletIdsSyncOnStartup => (super.noSuchMethod(
-        Invocation.getter(#walletIdsSyncOnStartup),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  set walletIdsSyncOnStartup(List<String>? walletIdsSyncOnStartup) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #walletIdsSyncOnStartup,
-          walletIdsSyncOnStartup,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i5.SyncingType get syncType => (super.noSuchMethod(
-        Invocation.getter(#syncType),
-        returnValue: _i5.SyncingType.currentWalletOnly,
-      ) as _i5.SyncingType);
-  @override
-  set syncType(_i5.SyncingType? syncType) => super.noSuchMethod(
-        Invocation.setter(
-          #syncType,
-          syncType,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get wifiOnly => (super.noSuchMethod(
-        Invocation.getter(#wifiOnly),
-        returnValue: false,
-      ) as bool);
-  @override
-  set wifiOnly(bool? wifiOnly) => super.noSuchMethod(
-        Invocation.setter(
-          #wifiOnly,
-          wifiOnly,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get showFavoriteWallets => (super.noSuchMethod(
-        Invocation.getter(#showFavoriteWallets),
-        returnValue: false,
-      ) as bool);
-  @override
-  set showFavoriteWallets(bool? showFavoriteWallets) => super.noSuchMethod(
-        Invocation.setter(
-          #showFavoriteWallets,
-          showFavoriteWallets,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get language => (super.noSuchMethod(
-        Invocation.getter(#language),
-        returnValue: '',
-      ) as String);
-  @override
-  set language(String? newLanguage) => super.noSuchMethod(
-        Invocation.setter(
-          #language,
-          newLanguage,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get currency => (super.noSuchMethod(
-        Invocation.getter(#currency),
-        returnValue: '',
-      ) as String);
-  @override
-  set currency(String? newCurrency) => super.noSuchMethod(
-        Invocation.setter(
-          #currency,
-          newCurrency,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get randomizePIN => (super.noSuchMethod(
-        Invocation.getter(#randomizePIN),
-        returnValue: false,
-      ) as bool);
-  @override
-  set randomizePIN(bool? randomizePIN) => super.noSuchMethod(
-        Invocation.setter(
-          #randomizePIN,
-          randomizePIN,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get useBiometrics => (super.noSuchMethod(
-        Invocation.getter(#useBiometrics),
-        returnValue: false,
-      ) as bool);
-  @override
-  set useBiometrics(bool? useBiometrics) => super.noSuchMethod(
-        Invocation.setter(
-          #useBiometrics,
-          useBiometrics,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasPin => (super.noSuchMethod(
-        Invocation.getter(#hasPin),
-        returnValue: false,
-      ) as bool);
-  @override
-  set hasPin(bool? hasPin) => super.noSuchMethod(
-        Invocation.setter(
-          #hasPin,
-          hasPin,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get familiarity => (super.noSuchMethod(
-        Invocation.getter(#familiarity),
-        returnValue: 0,
-      ) as int);
-  @override
-  set familiarity(int? familiarity) => super.noSuchMethod(
-        Invocation.setter(
-          #familiarity,
-          familiarity,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get showTestNetCoins => (super.noSuchMethod(
-        Invocation.getter(#showTestNetCoins),
-        returnValue: false,
-      ) as bool);
-  @override
-  set showTestNetCoins(bool? showTestNetCoins) => super.noSuchMethod(
-        Invocation.setter(
-          #showTestNetCoins,
-          showTestNetCoins,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isAutoBackupEnabled => (super.noSuchMethod(
-        Invocation.getter(#isAutoBackupEnabled),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isAutoBackupEnabled(bool? isAutoBackupEnabled) => super.noSuchMethod(
-        Invocation.setter(
-          #isAutoBackupEnabled,
-          isAutoBackupEnabled,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set autoBackupLocation(String? autoBackupLocation) => super.noSuchMethod(
-        Invocation.setter(
-          #autoBackupLocation,
-          autoBackupLocation,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i6.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
-        Invocation.getter(#backupFrequencyType),
-        returnValue: _i6.BackupFrequencyType.everyTenMinutes,
-      ) as _i6.BackupFrequencyType);
-  @override
-  set backupFrequencyType(_i6.BackupFrequencyType? backupFrequencyType) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #backupFrequencyType,
-          backupFrequencyType,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set lastAutoBackup(DateTime? lastAutoBackup) => super.noSuchMethod(
-        Invocation.setter(
-          #lastAutoBackup,
-          lastAutoBackup,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hideBlockExplorerWarning => (super.noSuchMethod(
-        Invocation.getter(#hideBlockExplorerWarning),
-        returnValue: false,
-      ) as bool);
-  @override
-  set hideBlockExplorerWarning(bool? hideBlockExplorerWarning) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #hideBlockExplorerWarning,
-          hideBlockExplorerWarning,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get gotoWalletOnStartup => (super.noSuchMethod(
-        Invocation.getter(#gotoWalletOnStartup),
-        returnValue: false,
-      ) as bool);
-  @override
-  set gotoWalletOnStartup(bool? gotoWalletOnStartup) => super.noSuchMethod(
-        Invocation.setter(
-          #gotoWalletOnStartup,
-          gotoWalletOnStartup,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set startupWalletId(String? startupWalletId) => super.noSuchMethod(
-        Invocation.setter(
-          #startupWalletId,
-          startupWalletId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get externalCalls => (super.noSuchMethod(
-        Invocation.getter(#externalCalls),
-        returnValue: false,
-      ) as bool);
-  @override
-  set externalCalls(bool? externalCalls) => super.noSuchMethod(
-        Invocation.setter(
-          #externalCalls,
-          externalCalls,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get enableCoinControl => (super.noSuchMethod(
-        Invocation.getter(#enableCoinControl),
-        returnValue: false,
-      ) as bool);
-  @override
-  set enableCoinControl(bool? enableCoinControl) => super.noSuchMethod(
-        Invocation.setter(
-          #enableCoinControl,
-          enableCoinControl,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get enableSystemBrightness => (super.noSuchMethod(
-        Invocation.getter(#enableSystemBrightness),
-        returnValue: false,
-      ) as bool);
-  @override
-  set enableSystemBrightness(bool? enableSystemBrightness) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #enableSystemBrightness,
-          enableSystemBrightness,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get themeId => (super.noSuchMethod(
-        Invocation.getter(#themeId),
-        returnValue: '',
-      ) as String);
-  @override
-  set themeId(String? themeId) => super.noSuchMethod(
-        Invocation.setter(
-          #themeId,
-          themeId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get systemBrightnessLightThemeId => (super.noSuchMethod(
-        Invocation.getter(#systemBrightnessLightThemeId),
-        returnValue: '',
-      ) as String);
-  @override
-  set systemBrightnessLightThemeId(String? systemBrightnessLightThemeId) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #systemBrightnessLightThemeId,
-          systemBrightnessLightThemeId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get systemBrightnessDarkThemeId => (super.noSuchMethod(
-        Invocation.getter(#systemBrightnessDarkThemeId),
-        returnValue: '',
-      ) as String);
-  @override
-  set systemBrightnessDarkThemeId(String? systemBrightnessDarkThemeId) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #systemBrightnessDarkThemeId,
-          systemBrightnessDarkThemeId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i3.Future<void> init() => (super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
-  @override
-  _i3.Future<void> incrementCurrentNotificationIndex() => (super.noSuchMethod(
-        Invocation.method(
-          #incrementCurrentNotificationIndex,
-          [],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
-  @override
-  _i3.Future<bool> isExternalCallsSet() => (super.noSuchMethod(
-        Invocation.method(
-          #isExternalCallsSet,
-          [],
-        ),
-        returnValue: _i3.Future<bool>.value(false),
-      ) as _i3.Future<bool>);
-  @override
-  _i3.Future<void> saveUserID(String? userId) => (super.noSuchMethod(
-        Invocation.method(
-          #saveUserID,
-          [userId],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
-  @override
-  _i3.Future<void> saveSignupEpoch(int? signupEpoch) => (super.noSuchMethod(
-        Invocation.method(
-          #saveSignupEpoch,
-          [signupEpoch],
-        ),
-        returnValue: _i3.Future<void>.value(),
-        returnValueForMissingStub: _i3.Future<void>.value(),
-      ) as _i3.Future<void>);
-  @override
-  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
diff --git a/test/flutter_secure_storage_interface_test.mocks.dart b/test/flutter_secure_storage_interface_test.mocks.dart
index f37422cdc..f310de330 100644
--- a/test/flutter_secure_storage_interface_test.mocks.dart
+++ b/test/flutter_secure_storage_interface_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/flutter_secure_storage_interface_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/hive/db_test.dart b/test/hive/db_test.dart
index 486bf13d3..bba2bc666 100644
--- a/test/hive/db_test.dart
+++ b/test/hive/db_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hive_test/hive_test.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 
 void main() {
diff --git a/test/models/type_adapter_tests/lelantus_coin_adapter_test.mocks.dart b/test/models/type_adapter_tests/lelantus_coin_adapter_test.mocks.dart
index 5a3f0677f..1d3200c42 100644
--- a/test/models/type_adapter_tests/lelantus_coin_adapter_test.mocks.dart
+++ b/test/models/type_adapter_tests/lelantus_coin_adapter_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/models/type_adapter_tests/lelantus_coin_adapter_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/models/type_adapter_tests/transactions_model_adapter_test.mocks.dart b/test/models/type_adapter_tests/transactions_model_adapter_test.mocks.dart
index 8d92283c8..2f14b4009 100644
--- a/test/models/type_adapter_tests/transactions_model_adapter_test.mocks.dart
+++ b/test/models/type_adapter_tests/transactions_model_adapter_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/models/type_adapter_tests/transactions_model_adapter_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/models/type_adapter_tests/utxo_model_adapter_test.mocks.dart b/test/models/type_adapter_tests/utxo_model_adapter_test.mocks.dart
index 86b0748d5..dc060f638 100644
--- a/test/models/type_adapter_tests/utxo_model_adapter_test.mocks.dart
+++ b/test/models/type_adapter_tests/utxo_model_adapter_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/models/type_adapter_tests/utxo_model_adapter_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/notifications/notification_card_test.dart b/test/notifications/notification_card_test.dart
index 30fe71ed8..7c8872844 100644
--- a/test/notifications/notification_card_test.dart
+++ b/test/notifications/notification_card_test.dart
@@ -1,46 +1,46 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/models/notification_model.dart';
-import 'package:stackduo/notifications/notification_card.dart';
-import 'package:stackduo/utilities/assets.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-
-void main() {
-  testWidgets("test notification card", (widgetTester) async {
-    final key = UniqueKey();
-    final notificationCard = NotificationCard(
-      key: key,
-      notification: NotificationModel(
-          id: 1,
-          title: "notification title",
-          description: "notification description",
-          iconAssetName: Assets.svg.iconFor(coin: Coin.bitcoin),
-          date: DateTime.parse("1662544771"),
-          walletId: "wallet id",
-          read: true,
-          shouldWatchForUpdates: true,
-          coinName: "Bitcoin"),
-    );
-
-    await widgetTester.pumpWidget(
-      MaterialApp(
-        theme: ThemeData(
-          extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
-          ],
-        ),
-        home: Material(
-          child: notificationCard,
-        ),
-      ),
-    );
-
-    expect(find.byWidget(notificationCard), findsOneWidget);
-    expect(find.text("notification title"), findsOneWidget);
-    expect(find.text("notification description"), findsOneWidget);
-    expect(find.byType(SvgPicture), findsOneWidget);
-  });
-}
+// import 'package:flutter/material.dart';
+// import 'package:flutter_svg/svg.dart';
+// import 'package:flutter_test/flutter_test.dart';
+// import 'package:stackduo/models/notification_model.dart';
+// import 'package:stackduo/notifications/notification_card.dart';
+// import 'package:stackduo/utilities/assets.dart';
+// import 'package:stackduo/utilities/enums/coin_enum.dart';
+// import 'package:stackduo/utilities/theme/light_colors.dart';
+// import 'package:stackduo/utilities/theme/stack_colors.dart';
+//
+// void main() {
+//   testWidgets("test notification card", (widgetTester) async {
+//     final key = UniqueKey();
+//     final notificationCard = NotificationCard(
+//       key: key,
+//       notification: NotificationModel(
+//           id: 1,
+//           title: "notification title",
+//           description: "notification description",
+//           iconAssetName: Assets.svg.iconFor(coin: Coin.bitcoin),
+//           date: DateTime.parse("1662544771"),
+//           walletId: "wallet id",
+//           read: true,
+//           shouldWatchForUpdates: true,
+//           coinName: "Bitcoin"),
+//     );
+//
+//     await widgetTester.pumpWidget(
+//       MaterialApp(
+//         theme: ThemeData(
+//           extensions: [
+//             StackColors.fromStackColorTheme(LightColors()),
+//           ],
+//         ),
+//         home: Material(
+//           child: notificationCard,
+//         ),
+//       ),
+//     );
+//
+//     expect(find.byWidget(notificationCard), findsOneWidget);
+//     expect(find.text("notification title"), findsOneWidget);
+//     expect(find.text("notification description"), findsOneWidget);
+//     expect(find.byType(SvgPicture), findsOneWidget);
+//   });
+// }
diff --git a/test/notifications/notification_card_test.mocks.dart b/test/notifications/notification_card_test.mocks.dart
deleted file mode 100644
index bb8b8ae74..000000000
--- a/test/notifications/notification_card_test.mocks.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/notifications/notification_card_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-import 'dart:typed_data' as _i6;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i2;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
-import 'package:stackwallet/themes/theme_service.dart' as _i3;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
-  _FakeMainDB_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i3.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_0(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i2.MainDB);
-  @override
-  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i4.StackTheme>[],
-      ) as List<_i4.StackTheme>);
-  @override
-  void init(_i2.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
-  @override
-  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
-            <_i3.StackThemeMetaData>[]),
-      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
-  @override
-  _i5.Future<_i6.Uint8List> fetchTheme(
-          {required _i3.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
-      ) as _i5.Future<_i6.Uint8List>);
-  @override
-  _i4.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i4.StackTheme?);
-}
diff --git a/test/pages/send_view/send_view_test.dart b/test/pages/send_view/send_view_test.dart
index 5e0e1ff0f..dc94abb1a 100644
--- a/test/pages/send_view/send_view_test.dart
+++ b/test/pages/send_view/send_view_test.dart
@@ -1,164 +1,164 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:stackduo/models/send_view_auto_fill_data.dart';
-import 'package:stackduo/pages/send_view/send_view.dart';
-import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart';
-import 'package:stackduo/services/coins/coin_service.dart';
-import 'package:stackduo/services/coins/manager.dart';
-import 'package:stackduo/services/locale_service.dart';
-import 'package:stackduo/services/node_service.dart';
-import 'package:stackduo/services/wallets.dart';
-import 'package:stackduo/services/wallets_service.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-import 'package:stackduo/utilities/prefs.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-
-import 'send_view_test.mocks.dart';
-
-@GenerateMocks([
-  Wallets,
-  WalletsService,
-  NodeService,
-  BitcoinWallet,
-  LocaleService,
-  Prefs,
-], customMocks: [
-  MockSpec<Manager>(returnNullOnMissingStub: true),
-  MockSpec<CoinServiceAPI>(returnNullOnMissingStub: true),
-])
-void main() {
-  testWidgets("Send to valid address", (widgetTester) async {
-    final mockWallets = MockWallets();
-    final mockWalletsService = MockWalletsService();
-    final mockNodeService = MockNodeService();
-    final CoinServiceAPI wallet = MockBitcoinWallet();
-    final mockLocaleService = MockLocaleService();
-    final mockPrefs = MockPrefs();
-
-    when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
-    when(wallet.walletName).thenAnswer((_) => "some wallet");
-    when(wallet.walletId).thenAnswer((_) => "wallet id");
-
-    final manager = Manager(wallet);
-    when(mockWallets.getManagerProvider("wallet id")).thenAnswer(
-        (realInvocation) => ChangeNotifierProvider((ref) => manager));
-    when(mockWallets.getManager("wallet id"))
-        .thenAnswer((realInvocation) => manager);
-
-    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-    when(mockPrefs.currency).thenAnswer((_) => "USD");
-    when(mockPrefs.enableCoinControl).thenAnswer((_) => false);
-    when(wallet.validateAddress("send to address"))
-        .thenAnswer((realInvocation) => true);
-
-    await widgetTester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          walletsChangeNotifierProvider.overrideWithValue(mockWallets),
-          walletsServiceChangeNotifierProvider
-              .overrideWithValue(mockWalletsService),
-          nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService),
-          localeServiceChangeNotifierProvider
-              .overrideWithValue(mockLocaleService),
-          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-          // previewTxButtonStateProvider
-        ],
-        child: MaterialApp(
-          theme: ThemeData(
-            extensions: [
-              StackColors.fromStackColorTheme(
-                LightColors(),
-              ),
-            ],
-          ),
-          home: SendView(
-            walletId: "wallet id",
-            coin: Coin.bitcoin,
-            autoFillData: SendViewAutoFillData(
-                address: "send to address", contactLabel: "contact label"),
-          ),
-        ),
-      ),
-    );
-
-    await widgetTester.pumpAndSettle();
-
-    expect(find.text("Send to"), findsOneWidget);
-    expect(find.text("Amount"), findsOneWidget);
-    expect(find.text("Note (optional)"), findsOneWidget);
-    expect(find.text("Transaction fee (estimated)"), findsOneWidget);
-    verify(manager.validateAddress("send to address")).called(1);
-  });
-
-  testWidgets("Send to invalid address", (widgetTester) async {
-    final mockWallets = MockWallets();
-    final mockWalletsService = MockWalletsService();
-    final mockNodeService = MockNodeService();
-    final CoinServiceAPI wallet = MockBitcoinWallet();
-    final mockLocaleService = MockLocaleService();
-    final mockPrefs = MockPrefs();
-
-    when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
-    when(wallet.walletName).thenAnswer((_) => "some wallet");
-    when(wallet.walletId).thenAnswer((_) => "wallet id");
-
-    final manager = Manager(wallet);
-    when(mockWallets.getManagerProvider("wallet id")).thenAnswer(
-        (realInvocation) => ChangeNotifierProvider((ref) => manager));
-    when(mockWallets.getManager("wallet id"))
-        .thenAnswer((realInvocation) => manager);
-
-    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-    when(mockPrefs.currency).thenAnswer((_) => "USD");
-    when(mockPrefs.enableCoinControl).thenAnswer((_) => false);
-    when(wallet.validateAddress("send to address"))
-        .thenAnswer((realInvocation) => false);
-
-    // when(manager.isOwnAddress("send to address"))
-    //     .thenAnswer((realInvocation) => Future(() => true));
-
-    await widgetTester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          walletsChangeNotifierProvider.overrideWithValue(mockWallets),
-          walletsServiceChangeNotifierProvider
-              .overrideWithValue(mockWalletsService),
-          nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService),
-          localeServiceChangeNotifierProvider
-              .overrideWithValue(mockLocaleService),
-          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-          // previewTxButtonStateProvider
-        ],
-        child: MaterialApp(
-          theme: ThemeData(
-            extensions: [
-              StackColors.fromStackColorTheme(
-                LightColors(),
-              ),
-            ],
-          ),
-          home: SendView(
-            walletId: "wallet id",
-            coin: Coin.bitcoin,
-            autoFillData: SendViewAutoFillData(
-                address: "send to address", contactLabel: "contact label"),
-          ),
-        ),
-      ),
-    );
-
-    await widgetTester.pumpAndSettle();
-
-    expect(find.text("Send to"), findsOneWidget);
-    expect(find.text("Amount"), findsOneWidget);
-    expect(find.text("Note (optional)"), findsOneWidget);
-    expect(find.text("Transaction fee (estimated)"), findsOneWidget);
-    expect(find.text("Invalid address"), findsOneWidget);
-    verify(manager.validateAddress("send to address")).called(1);
-  });
-}
+// import 'package:flutter/material.dart';
+// import 'package:flutter_riverpod/flutter_riverpod.dart';
+// import 'package:flutter_test/flutter_test.dart';
+// import 'package:mockito/annotations.dart';
+// import 'package:mockito/mockito.dart';
+// import 'package:stackduo/models/send_view_auto_fill_data.dart';
+// import 'package:stackduo/pages/send_view/send_view.dart';
+// import 'package:stackduo/providers/providers.dart';
+// import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart';
+// import 'package:stackduo/services/coins/coin_service.dart';
+// import 'package:stackduo/services/coins/manager.dart';
+// import 'package:stackduo/services/locale_service.dart';
+// import 'package:stackduo/services/node_service.dart';
+// import 'package:stackduo/services/wallets.dart';
+// import 'package:stackduo/services/wallets_service.dart';
+// import 'package:stackduo/utilities/enums/coin_enum.dart';
+// import 'package:stackduo/utilities/prefs.dart';
+// import 'package:stackduo/utilities/theme/light_colors.dart';
+// import 'package:stackduo/utilities/theme/stack_colors.dart';
+//
+// import 'send_view_test.mocks.dart';
+//
+// @GenerateMocks([
+//   Wallets,
+//   WalletsService,
+//   NodeService,
+//   BitcoinWallet,
+//   LocaleService,
+//   Prefs,
+// ], customMocks: [
+//   MockSpec<Manager>(returnNullOnMissingStub: true),
+//   MockSpec<CoinServiceAPI>(returnNullOnMissingStub: true),
+// ])
+// void main() {
+//   testWidgets("Send to valid address", (widgetTester) async {
+//     final mockWallets = MockWallets();
+//     final mockWalletsService = MockWalletsService();
+//     final mockNodeService = MockNodeService();
+//     final CoinServiceAPI wallet = MockBitcoinWallet();
+//     final mockLocaleService = MockLocaleService();
+//     final mockPrefs = MockPrefs();
+//
+//     when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
+//     when(wallet.walletName).thenAnswer((_) => "some wallet");
+//     when(wallet.walletId).thenAnswer((_) => "wallet id");
+//
+//     final manager = Manager(wallet);
+//     when(mockWallets.getManagerProvider("wallet id")).thenAnswer(
+//         (realInvocation) => ChangeNotifierProvider((ref) => manager));
+//     when(mockWallets.getManager("wallet id"))
+//         .thenAnswer((realInvocation) => manager);
+//
+//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+//     when(mockPrefs.currency).thenAnswer((_) => "USD");
+//     when(mockPrefs.enableCoinControl).thenAnswer((_) => false);
+//     when(wallet.validateAddress("send to address"))
+//         .thenAnswer((realInvocation) => true);
+//
+//     await widgetTester.pumpWidget(
+//       ProviderScope(
+//         overrides: [
+//           walletsChangeNotifierProvider.overrideWithValue(mockWallets),
+//           walletsServiceChangeNotifierProvider
+//               .overrideWithValue(mockWalletsService),
+//           nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService),
+//           localeServiceChangeNotifierProvider
+//               .overrideWithValue(mockLocaleService),
+//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+//           // previewTxButtonStateProvider
+//         ],
+//         child: MaterialApp(
+//           theme: ThemeData(
+//             extensions: [
+//               StackColors.fromStackColorTheme(
+//                 LightColors(),
+//               ),
+//             ],
+//           ),
+//           home: SendView(
+//             walletId: "wallet id",
+//             coin: Coin.bitcoin,
+//             autoFillData: SendViewAutoFillData(
+//                 address: "send to address", contactLabel: "contact label"),
+//           ),
+//         ),
+//       ),
+//     );
+//
+//     await widgetTester.pumpAndSettle();
+//
+//     expect(find.text("Send to"), findsOneWidget);
+//     expect(find.text("Amount"), findsOneWidget);
+//     expect(find.text("Note (optional)"), findsOneWidget);
+//     expect(find.text("Transaction fee (estimated)"), findsOneWidget);
+//     verify(manager.validateAddress("send to address")).called(1);
+//   });
+//
+//   testWidgets("Send to invalid address", (widgetTester) async {
+//     final mockWallets = MockWallets();
+//     final mockWalletsService = MockWalletsService();
+//     final mockNodeService = MockNodeService();
+//     final CoinServiceAPI wallet = MockBitcoinWallet();
+//     final mockLocaleService = MockLocaleService();
+//     final mockPrefs = MockPrefs();
+//
+//     when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
+//     when(wallet.walletName).thenAnswer((_) => "some wallet");
+//     when(wallet.walletId).thenAnswer((_) => "wallet id");
+//
+//     final manager = Manager(wallet);
+//     when(mockWallets.getManagerProvider("wallet id")).thenAnswer(
+//         (realInvocation) => ChangeNotifierProvider((ref) => manager));
+//     when(mockWallets.getManager("wallet id"))
+//         .thenAnswer((realInvocation) => manager);
+//
+//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+//     when(mockPrefs.currency).thenAnswer((_) => "USD");
+//     when(mockPrefs.enableCoinControl).thenAnswer((_) => false);
+//     when(wallet.validateAddress("send to address"))
+//         .thenAnswer((realInvocation) => false);
+//
+//     // when(manager.isOwnAddress("send to address"))
+//     //     .thenAnswer((realInvocation) => Future(() => true));
+//
+//     await widgetTester.pumpWidget(
+//       ProviderScope(
+//         overrides: [
+//           walletsChangeNotifierProvider.overrideWithValue(mockWallets),
+//           walletsServiceChangeNotifierProvider
+//               .overrideWithValue(mockWalletsService),
+//           nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService),
+//           localeServiceChangeNotifierProvider
+//               .overrideWithValue(mockLocaleService),
+//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+//           // previewTxButtonStateProvider
+//         ],
+//         child: MaterialApp(
+//           theme: ThemeData(
+//             extensions: [
+//               StackColors.fromStackColorTheme(
+//                 LightColors(),
+//               ),
+//             ],
+//           ),
+//           home: SendView(
+//             walletId: "wallet id",
+//             coin: Coin.bitcoin,
+//             autoFillData: SendViewAutoFillData(
+//                 address: "send to address", contactLabel: "contact label"),
+//           ),
+//         ),
+//       ),
+//     );
+//
+//     await widgetTester.pumpAndSettle();
+//
+//     expect(find.text("Send to"), findsOneWidget);
+//     expect(find.text("Amount"), findsOneWidget);
+//     expect(find.text("Note (optional)"), findsOneWidget);
+//     expect(find.text("Transaction fee (estimated)"), findsOneWidget);
+//     expect(find.text("Invalid address"), findsOneWidget);
+//     verify(manager.validateAddress("send to address")).called(1);
+//   });
+// }
diff --git a/test/pages/send_view/send_view_test.mocks.dart b/test/pages/send_view/send_view_test.mocks.dart
deleted file mode 100644
index 2276836ce..000000000
--- a/test/pages/send_view/send_view_test.mocks.dart
+++ /dev/null
@@ -1,3449 +0,0 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/pages/send_view/send_view_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i23;
-import 'dart:typed_data' as _i30;
-import 'dart:ui' as _i25;
-
-import 'package:bip32/bip32.dart' as _i17;
-import 'package:bip47/bip47.dart' as _i19;
-import 'package:bitcoindart/bitcoindart.dart' as _i14;
-import 'package:flutter/foundation.dart' as _i4;
-import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i13;
-import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i11;
-import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i10;
-import 'package:stackwallet/models/balance.dart' as _i12;
-import 'package:stackwallet/models/isar/models/isar_models.dart' as _i18;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i33;
-import 'package:stackwallet/models/node_model.dart' as _i26;
-import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i9;
-import 'package:stackwallet/models/signing_data.dart' as _i29;
-import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i27;
-import 'package:stackwallet/services/coins/coin_service.dart' as _i20;
-import 'package:stackwallet/services/coins/manager.dart' as _i6;
-import 'package:stackwallet/services/locale_service.dart' as _i31;
-import 'package:stackwallet/services/node_service.dart' as _i3;
-import 'package:stackwallet/services/transaction_notification_tracker.dart'
-    as _i8;
-import 'package:stackwallet/services/wallets.dart' as _i21;
-import 'package:stackwallet/services/wallets_service.dart' as _i2;
-import 'package:stackwallet/themes/theme_service.dart' as _i32;
-import 'package:stackwallet/utilities/amount/amount.dart' as _i15;
-import 'package:stackwallet/utilities/enums/backup_frequency_type.dart' as _i35;
-import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i28;
-import 'package:stackwallet/utilities/enums/sync_type_enum.dart' as _i34;
-import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
-    as _i7;
-import 'package:stackwallet/utilities/prefs.dart' as _i24;
-import 'package:tuple/tuple.dart' as _i16;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeWalletsService_0 extends _i1.SmartFake
-    implements _i2.WalletsService {
-  _FakeWalletsService_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeNodeService_1 extends _i1.SmartFake implements _i3.NodeService {
-  _FakeNodeService_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeChangeNotifierProvider_2<Notifier extends _i4.ChangeNotifier?>
-    extends _i1.SmartFake implements _i5.ChangeNotifierProvider<Notifier> {
-  _FakeChangeNotifierProvider_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
-  _FakeManager_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSecureStorageInterface_4 extends _i1.SmartFake
-    implements _i7.SecureStorageInterface {
-  _FakeSecureStorageInterface_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeTransactionNotificationTracker_5 extends _i1.SmartFake
-    implements _i8.TransactionNotificationTracker {
-  _FakeTransactionNotificationTracker_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeFeeObject_6 extends _i1.SmartFake implements _i9.FeeObject {
-  _FakeFeeObject_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeElectrumX_7 extends _i1.SmartFake implements _i10.ElectrumX {
-  _FakeElectrumX_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeCachedElectrumX_8 extends _i1.SmartFake
-    implements _i11.CachedElectrumX {
-  _FakeCachedElectrumX_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeBalance_9 extends _i1.SmartFake implements _i12.Balance {
-  _FakeBalance_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeMainDB_10 extends _i1.SmartFake implements _i13.MainDB {
-  _FakeMainDB_10(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeNetworkType_11 extends _i1.SmartFake implements _i14.NetworkType {
-  _FakeNetworkType_11(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeElectrumXNode_12 extends _i1.SmartFake
-    implements _i10.ElectrumXNode {
-  _FakeElectrumXNode_12(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeAmount_13 extends _i1.SmartFake implements _i15.Amount {
-  _FakeAmount_13(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeTuple2_14<T1, T2> extends _i1.SmartFake
-    implements _i16.Tuple2<T1, T2> {
-  _FakeTuple2_14(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeBIP32_15 extends _i1.SmartFake implements _i17.BIP32 {
-  _FakeBIP32_15(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeAddress_16 extends _i1.SmartFake implements _i18.Address {
-  _FakeAddress_16(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakePaymentCode_17 extends _i1.SmartFake implements _i19.PaymentCode {
-  _FakePaymentCode_17(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeCoinServiceAPI_18 extends _i1.SmartFake
-    implements _i20.CoinServiceAPI {
-  _FakeCoinServiceAPI_18(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [Wallets].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWallets extends _i1.Mock implements _i21.Wallets {
-  MockWallets() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.WalletsService get walletsService => (super.noSuchMethod(
-        Invocation.getter(#walletsService),
-        returnValue: _FakeWalletsService_0(
-          this,
-          Invocation.getter(#walletsService),
-        ),
-      ) as _i2.WalletsService);
-  @override
-  set walletsService(_i2.WalletsService? _walletsService) => super.noSuchMethod(
-        Invocation.setter(
-          #walletsService,
-          _walletsService,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i3.NodeService get nodeService => (super.noSuchMethod(
-        Invocation.getter(#nodeService),
-        returnValue: _FakeNodeService_1(
-          this,
-          Invocation.getter(#nodeService),
-        ),
-      ) as _i3.NodeService);
-  @override
-  set nodeService(_i3.NodeService? _nodeService) => super.noSuchMethod(
-        Invocation.setter(
-          #nodeService,
-          _nodeService,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasWallets => (super.noSuchMethod(
-        Invocation.getter(#hasWallets),
-        returnValue: false,
-      ) as bool);
-  @override
-  List<_i5.ChangeNotifierProvider<_i6.Manager>> get managerProviders =>
-      (super.noSuchMethod(
-        Invocation.getter(#managerProviders),
-        returnValue: <_i5.ChangeNotifierProvider<_i6.Manager>>[],
-      ) as List<_i5.ChangeNotifierProvider<_i6.Manager>>);
-  @override
-  List<_i6.Manager> get managers => (super.noSuchMethod(
-        Invocation.getter(#managers),
-        returnValue: <_i6.Manager>[],
-      ) as List<_i6.Manager>);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  List<String> getWalletIdsFor({required _i22.Coin? coin}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getWalletIdsFor,
-          [],
-          {#coin: coin},
-        ),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  List<_i16.Tuple2<_i22.Coin, List<_i5.ChangeNotifierProvider<_i6.Manager>>>>
-      getManagerProvidersByCoin() => (super.noSuchMethod(
-            Invocation.method(
-              #getManagerProvidersByCoin,
-              [],
-            ),
-            returnValue: <
-                _i16.Tuple2<_i22.Coin,
-                    List<_i5.ChangeNotifierProvider<_i6.Manager>>>>[],
-          ) as List<
-              _i16.Tuple2<_i22.Coin,
-                  List<_i5.ChangeNotifierProvider<_i6.Manager>>>>);
-  @override
-  List<_i5.ChangeNotifierProvider<_i6.Manager>> getManagerProvidersForCoin(
-          _i22.Coin? coin) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getManagerProvidersForCoin,
-          [coin],
-        ),
-        returnValue: <_i5.ChangeNotifierProvider<_i6.Manager>>[],
-      ) as List<_i5.ChangeNotifierProvider<_i6.Manager>>);
-  @override
-  _i5.ChangeNotifierProvider<_i6.Manager> getManagerProvider(
-          String? walletId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getManagerProvider,
-          [walletId],
-        ),
-        returnValue: _FakeChangeNotifierProvider_2<_i6.Manager>(
-          this,
-          Invocation.method(
-            #getManagerProvider,
-            [walletId],
-          ),
-        ),
-      ) as _i5.ChangeNotifierProvider<_i6.Manager>);
-  @override
-  _i6.Manager getManager(String? walletId) => (super.noSuchMethod(
-        Invocation.method(
-          #getManager,
-          [walletId],
-        ),
-        returnValue: _FakeManager_3(
-          this,
-          Invocation.method(
-            #getManager,
-            [walletId],
-          ),
-        ),
-      ) as _i6.Manager);
-  @override
-  void addWallet({
-    required String? walletId,
-    required _i6.Manager? manager,
-  }) =>
-      super.noSuchMethod(
-        Invocation.method(
-          #addWallet,
-          [],
-          {
-            #walletId: walletId,
-            #manager: manager,
-          },
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeWallet({required String? walletId}) => super.noSuchMethod(
-        Invocation.method(
-          #removeWallet,
-          [],
-          {#walletId: walletId},
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<void> load(_i24.Prefs? prefs) => (super.noSuchMethod(
-        Invocation.method(
-          #load,
-          [prefs],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> loadAfterStackRestore(
-    _i24.Prefs? prefs,
-    List<_i6.Manager>? managers,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #loadAfterStackRestore,
-          [
-            prefs,
-            managers,
-          ],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [WalletsService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
-  MockWalletsService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i23.Future<Map<String, _i2.WalletInfo>> get walletNames =>
-      (super.noSuchMethod(
-        Invocation.getter(#walletNames),
-        returnValue: _i23.Future<Map<String, _i2.WalletInfo>>.value(
-            <String, _i2.WalletInfo>{}),
-      ) as _i23.Future<Map<String, _i2.WalletInfo>>);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<bool> renameWallet({
-    required String? from,
-    required String? to,
-    required bool? shouldNotifyListeners,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #renameWallet,
-          [],
-          {
-            #from: from,
-            #to: to,
-            #shouldNotifyListeners: shouldNotifyListeners,
-          },
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  Map<String, _i2.WalletInfo> fetchWalletsData() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchWalletsData,
-          [],
-        ),
-        returnValue: <String, _i2.WalletInfo>{},
-      ) as Map<String, _i2.WalletInfo>);
-  @override
-  _i23.Future<void> addExistingStackWallet({
-    required String? name,
-    required String? walletId,
-    required _i22.Coin? coin,
-    required bool? shouldNotifyListeners,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addExistingStackWallet,
-          [],
-          {
-            #name: name,
-            #walletId: walletId,
-            #coin: coin,
-            #shouldNotifyListeners: shouldNotifyListeners,
-          },
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<String?> addNewWallet({
-    required String? name,
-    required _i22.Coin? coin,
-    required bool? shouldNotifyListeners,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addNewWallet,
-          [],
-          {
-            #name: name,
-            #coin: coin,
-            #shouldNotifyListeners: shouldNotifyListeners,
-          },
-        ),
-        returnValue: _i23.Future<String?>.value(),
-      ) as _i23.Future<String?>);
-  @override
-  _i23.Future<List<String>> getFavoriteWalletIds() => (super.noSuchMethod(
-        Invocation.method(
-          #getFavoriteWalletIds,
-          [],
-        ),
-        returnValue: _i23.Future<List<String>>.value(<String>[]),
-      ) as _i23.Future<List<String>>);
-  @override
-  _i23.Future<void> saveFavoriteWalletIds(List<String>? walletIds) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #saveFavoriteWalletIds,
-          [walletIds],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> addFavorite(String? walletId) => (super.noSuchMethod(
-        Invocation.method(
-          #addFavorite,
-          [walletId],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> removeFavorite(String? walletId) => (super.noSuchMethod(
-        Invocation.method(
-          #removeFavorite,
-          [walletId],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> moveFavorite({
-    required int? fromIndex,
-    required int? toIndex,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #moveFavorite,
-          [],
-          {
-            #fromIndex: fromIndex,
-            #toIndex: toIndex,
-          },
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<bool> checkForDuplicate(String? name) => (super.noSuchMethod(
-        Invocation.method(
-          #checkForDuplicate,
-          [name],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<String?> getWalletId(String? walletName) => (super.noSuchMethod(
-        Invocation.method(
-          #getWalletId,
-          [walletName],
-        ),
-        returnValue: _i23.Future<String?>.value(),
-      ) as _i23.Future<String?>);
-  @override
-  _i23.Future<bool> isMnemonicVerified({required String? walletId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #isMnemonicVerified,
-          [],
-          {#walletId: walletId},
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<void> setMnemonicVerified({required String? walletId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #setMnemonicVerified,
-          [],
-          {#walletId: walletId},
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<int> deleteWallet(
-    String? name,
-    bool? shouldNotifyListeners,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #deleteWallet,
-          [
-            name,
-            shouldNotifyListeners,
-          ],
-        ),
-        returnValue: _i23.Future<int>.value(0),
-      ) as _i23.Future<int>);
-  @override
-  _i23.Future<void> refreshWallets(bool? shouldNotifyListeners) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #refreshWallets,
-          [shouldNotifyListeners],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [NodeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockNodeService extends _i1.Mock implements _i3.NodeService {
-  MockNodeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i7.SecureStorageInterface get secureStorageInterface => (super.noSuchMethod(
-        Invocation.getter(#secureStorageInterface),
-        returnValue: _FakeSecureStorageInterface_4(
-          this,
-          Invocation.getter(#secureStorageInterface),
-        ),
-      ) as _i7.SecureStorageInterface);
-  @override
-  List<_i26.NodeModel> get primaryNodes => (super.noSuchMethod(
-        Invocation.getter(#primaryNodes),
-        returnValue: <_i26.NodeModel>[],
-      ) as List<_i26.NodeModel>);
-  @override
-  List<_i26.NodeModel> get nodes => (super.noSuchMethod(
-        Invocation.getter(#nodes),
-        returnValue: <_i26.NodeModel>[],
-      ) as List<_i26.NodeModel>);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<void> updateDefaults() => (super.noSuchMethod(
-        Invocation.method(
-          #updateDefaults,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> setPrimaryNodeFor({
-    required _i22.Coin? coin,
-    required _i26.NodeModel? node,
-    bool? shouldNotifyListeners = false,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #setPrimaryNodeFor,
-          [],
-          {
-            #coin: coin,
-            #node: node,
-            #shouldNotifyListeners: shouldNotifyListeners,
-          },
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i26.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getPrimaryNodeFor,
-        [],
-        {#coin: coin},
-      )) as _i26.NodeModel?);
-  @override
-  List<_i26.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
-        Invocation.method(
-          #getNodesFor,
-          [coin],
-        ),
-        returnValue: <_i26.NodeModel>[],
-      ) as List<_i26.NodeModel>);
-  @override
-  _i26.NodeModel? getNodeById({required String? id}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getNodeById,
-        [],
-        {#id: id},
-      )) as _i26.NodeModel?);
-  @override
-  List<_i26.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #failoverNodesFor,
-          [],
-          {#coin: coin},
-        ),
-        returnValue: <_i26.NodeModel>[],
-      ) as List<_i26.NodeModel>);
-  @override
-  _i23.Future<void> add(
-    _i26.NodeModel? node,
-    String? password,
-    bool? shouldNotifyListeners,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #add,
-          [
-            node,
-            password,
-            shouldNotifyListeners,
-          ],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> delete(
-    String? id,
-    bool? shouldNotifyListeners,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #delete,
-          [
-            id,
-            shouldNotifyListeners,
-          ],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> setEnabledState(
-    String? id,
-    bool? enabled,
-    bool? shouldNotifyListeners,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #setEnabledState,
-          [
-            id,
-            enabled,
-            shouldNotifyListeners,
-          ],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> edit(
-    _i26.NodeModel? editedNode,
-    String? password,
-    bool? shouldNotifyListeners,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #edit,
-          [
-            editedNode,
-            password,
-            shouldNotifyListeners,
-          ],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> updateCommunityNodes() => (super.noSuchMethod(
-        Invocation.method(
-          #updateCommunityNodes,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [BitcoinWallet].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i27.BitcoinWallet {
-  MockBitcoinWallet() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  set timer(_i23.Timer? _timer) => super.noSuchMethod(
-        Invocation.setter(
-          #timer,
-          _timer,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i8.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
-        Invocation.getter(#txTracker),
-        returnValue: _FakeTransactionNotificationTracker_5(
-          this,
-          Invocation.getter(#txTracker),
-        ),
-      ) as _i8.TransactionNotificationTracker);
-  @override
-  set txTracker(_i8.TransactionNotificationTracker? _txTracker) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #txTracker,
-          _txTracker,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get longMutex => (super.noSuchMethod(
-        Invocation.getter(#longMutex),
-        returnValue: false,
-      ) as bool);
-  @override
-  set longMutex(bool? _longMutex) => super.noSuchMethod(
-        Invocation.setter(
-          #longMutex,
-          _longMutex,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get refreshMutex => (super.noSuchMethod(
-        Invocation.getter(#refreshMutex),
-        returnValue: false,
-      ) as bool);
-  @override
-  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
-        Invocation.setter(
-          #refreshMutex,
-          _refreshMutex,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isActive => (super.noSuchMethod(
-        Invocation.getter(#isActive),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isActive(bool? _isActive) => super.noSuchMethod(
-        Invocation.setter(
-          #isActive,
-          _isActive,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set isFavorite(bool? markFavorite) => super.noSuchMethod(
-        Invocation.setter(
-          #isFavorite,
-          markFavorite,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isFavorite => (super.noSuchMethod(
-        Invocation.getter(#isFavorite),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i22.Coin get coin => (super.noSuchMethod(
-        Invocation.getter(#coin),
-        returnValue: _i22.Coin.bitcoin,
-      ) as _i22.Coin);
-  @override
-  _i23.Future<List<_i18.UTXO>> get utxos => (super.noSuchMethod(
-        Invocation.getter(#utxos),
-        returnValue: _i23.Future<List<_i18.UTXO>>.value(<_i18.UTXO>[]),
-      ) as _i23.Future<List<_i18.UTXO>>);
-  @override
-  _i23.Future<List<_i18.Transaction>> get transactions => (super.noSuchMethod(
-        Invocation.getter(#transactions),
-        returnValue:
-            _i23.Future<List<_i18.Transaction>>.value(<_i18.Transaction>[]),
-      ) as _i23.Future<List<_i18.Transaction>>);
-  @override
-  _i23.Future<String> get currentReceivingAddress => (super.noSuchMethod(
-        Invocation.getter(#currentReceivingAddress),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  _i23.Future<String> get currentChangeAddress => (super.noSuchMethod(
-        Invocation.getter(#currentChangeAddress),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  _i23.Future<String> get currentChangeAddressP2PKH => (super.noSuchMethod(
-        Invocation.getter(#currentChangeAddressP2PKH),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  bool get hasCalledExit => (super.noSuchMethod(
-        Invocation.getter(#hasCalledExit),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
-        Invocation.getter(#fees),
-        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
-          this,
-          Invocation.getter(#fees),
-        )),
-      ) as _i23.Future<_i9.FeeObject>);
-  @override
-  _i23.Future<int> get maxFee => (super.noSuchMethod(
-        Invocation.getter(#maxFee),
-        returnValue: _i23.Future<int>.value(0),
-      ) as _i23.Future<int>);
-  @override
-  _i23.Future<List<String>> get mnemonic => (super.noSuchMethod(
-        Invocation.getter(#mnemonic),
-        returnValue: _i23.Future<List<String>>.value(<String>[]),
-      ) as _i23.Future<List<String>>);
-  @override
-  _i23.Future<String?> get mnemonicString => (super.noSuchMethod(
-        Invocation.getter(#mnemonicString),
-        returnValue: _i23.Future<String?>.value(),
-      ) as _i23.Future<String?>);
-  @override
-  _i23.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
-        Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i23.Future<String?>.value(),
-      ) as _i23.Future<String?>);
-  @override
-  _i23.Future<int> get chainHeight => (super.noSuchMethod(
-        Invocation.getter(#chainHeight),
-        returnValue: _i23.Future<int>.value(0),
-      ) as _i23.Future<int>);
-  @override
-  int get storedChainHeight => (super.noSuchMethod(
-        Invocation.getter(#storedChainHeight),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get shouldAutoSync => (super.noSuchMethod(
-        Invocation.getter(#shouldAutoSync),
-        returnValue: false,
-      ) as bool);
-  @override
-  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
-        Invocation.setter(
-          #shouldAutoSync,
-          shouldAutoSync,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isRefreshing => (super.noSuchMethod(
-        Invocation.getter(#isRefreshing),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get isConnected => (super.noSuchMethod(
-        Invocation.getter(#isConnected),
-        returnValue: false,
-      ) as bool);
-  @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
-  @override
-  String get walletName => (super.noSuchMethod(
-        Invocation.getter(#walletName),
-        returnValue: '',
-      ) as String);
-  @override
-  set walletName(String? newName) => super.noSuchMethod(
-        Invocation.setter(
-          #walletName,
-          newName,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i10.ElectrumX get electrumXClient => (super.noSuchMethod(
-        Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_7(
-          this,
-          Invocation.getter(#electrumXClient),
-        ),
-      ) as _i10.ElectrumX);
-  @override
-  _i11.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
-        Invocation.getter(#cachedElectrumXClient),
-        returnValue: _FakeCachedElectrumX_8(
-          this,
-          Invocation.getter(#cachedElectrumXClient),
-        ),
-      ) as _i11.CachedElectrumX);
-  @override
-  _i12.Balance get balance => (super.noSuchMethod(
-        Invocation.getter(#balance),
-        returnValue: _FakeBalance_9(
-          this,
-          Invocation.getter(#balance),
-        ),
-      ) as _i12.Balance);
-  @override
-  _i23.Future<String> get xpub => (super.noSuchMethod(
-        Invocation.getter(#xpub),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #onIsActiveWalletChanged,
-          _onIsActiveWalletChanged,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i13.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_10(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i13.MainDB);
-  @override
-  _i14.NetworkType get networkType => (super.noSuchMethod(
-        Invocation.getter(#networkType),
-        returnValue: _FakeNetworkType_11(
-          this,
-          Invocation.getter(#networkType),
-        ),
-      ) as _i14.NetworkType);
-  @override
-  _i23.Future<void> exit() => (super.noSuchMethod(
-        Invocation.method(
-          #exit,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i28.DerivePathType addressType({required String? address}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addressType,
-          [],
-          {#address: address},
-        ),
-        returnValue: _i28.DerivePathType.bip44,
-      ) as _i28.DerivePathType);
-  @override
-  _i23.Future<void> recoverFromMnemonic({
-    required String? mnemonic,
-    String? mnemonicPassphrase,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required int? height,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #recoverFromMnemonic,
-          [],
-          {
-            #mnemonic: mnemonic,
-            #mnemonicPassphrase: mnemonicPassphrase,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #height: height,
-          },
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getTransactionCacheEarly,
-          [allAddresses],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
-        Invocation.method(
-          #refreshIfThereIsNewData,
-          [],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
-        Invocation.method(
-          #getAllTxsToWatch,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> refresh() => (super.noSuchMethod(
-        Invocation.method(
-          #refresh,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<Map<String, dynamic>> prepareSend({
-    required String? address,
-    required _i15.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareSend,
-          [],
-          {
-            #address: address,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i23.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i23.Future<Map<String, dynamic>>);
-  @override
-  _i23.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #confirmSend,
-          [],
-          {#txData: txData},
-        ),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  _i23.Future<bool> testNetworkConnection() => (super.noSuchMethod(
-        Invocation.method(
-          #testNetworkConnection,
-          [],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  void startNetworkAlivePinging() => super.noSuchMethod(
-        Invocation.method(
-          #startNetworkAlivePinging,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void stopNetworkAlivePinging() => super.noSuchMethod(
-        Invocation.method(
-          #stopNetworkAlivePinging,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<void> initializeNew() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeNew,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> initializeExisting() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeExisting,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateSentCachedTxData,
-          [txData],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  bool validateAddress(String? address) => (super.noSuchMethod(
-        Invocation.method(
-          #validateAddress,
-          [address],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
-        Invocation.method(
-          #updateNode,
-          [shouldRefresh],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<_i10.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
-        Invocation.method(
-          #getCurrentNode,
-          [],
-        ),
-        returnValue:
-            _i23.Future<_i10.ElectrumXNode>.value(_FakeElectrumXNode_12(
-          this,
-          Invocation.method(
-            #getCurrentNode,
-            [],
-          ),
-        )),
-      ) as _i23.Future<_i10.ElectrumXNode>);
-  @override
-  _i23.Future<List<Map<String, dynamic>>> fastFetch(
-          List<String>? allTxHashes) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fastFetch,
-          [allTxHashes],
-        ),
-        returnValue: _i23.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i23.Future<List<Map<String, dynamic>>>);
-  @override
-  _i23.Future<int> getTxCount({required String? address}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getTxCount,
-          [],
-          {#address: address},
-        ),
-        returnValue: _i23.Future<int>.value(0),
-      ) as _i23.Future<int>);
-  @override
-  _i23.Future<void> checkCurrentReceivingAddressesForTransactions() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkCurrentReceivingAddressesForTransactions,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> checkCurrentChangeAddressesForTransactions() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkCurrentChangeAddressesForTransactions,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  int estimateTxFee({
-    required int? vSize,
-    required int? feeRatePerKB,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateTxFee,
-          [],
-          {
-            #vSize: vSize,
-            #feeRatePerKB: feeRatePerKB,
-          },
-        ),
-        returnValue: 0,
-      ) as int);
-  @override
-  dynamic coinSelection({
-    required int? satoshiAmountToSend,
-    required int? selectedTxFeeRate,
-    required String? recipientAddress,
-    required bool? coinControl,
-    required bool? isSendAll,
-    int? additionalOutputs = 0,
-    List<_i18.UTXO>? utxos,
-  }) =>
-      super.noSuchMethod(Invocation.method(
-        #coinSelection,
-        [],
-        {
-          #satoshiAmountToSend: satoshiAmountToSend,
-          #selectedTxFeeRate: selectedTxFeeRate,
-          #recipientAddress: recipientAddress,
-          #coinControl: coinControl,
-          #isSendAll: isSendAll,
-          #additionalOutputs: additionalOutputs,
-          #utxos: utxos,
-        },
-      ));
-  @override
-  _i23.Future<List<_i29.SigningData>> fetchBuildTxData(
-          List<_i18.UTXO>? utxosToUse) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchBuildTxData,
-          [utxosToUse],
-        ),
-        returnValue:
-            _i23.Future<List<_i29.SigningData>>.value(<_i29.SigningData>[]),
-      ) as _i23.Future<List<_i29.SigningData>>);
-  @override
-  _i23.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i29.SigningData>? utxoSigningData,
-    required List<String>? recipients,
-    required List<int>? satoshiAmounts,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #buildTransaction,
-          [],
-          {
-            #utxoSigningData: utxoSigningData,
-            #recipients: recipients,
-            #satoshiAmounts: satoshiAmounts,
-          },
-        ),
-        returnValue:
-            _i23.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i23.Future<Map<String, dynamic>>);
-  @override
-  _i23.Future<void> fullRescan(
-    int? maxUnusedAddressGap,
-    int? maxNumberOfIndexesToCheck,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fullRescan,
-          [
-            maxUnusedAddressGap,
-            maxNumberOfIndexesToCheck,
-          ],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<_i15.Amount> estimateFeeFor(
-    _i15.Amount? amount,
-    int? feeRate,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFeeFor,
-          [
-            amount,
-            feeRate,
-          ],
-        ),
-        returnValue: _i23.Future<_i15.Amount>.value(_FakeAmount_13(
-          this,
-          Invocation.method(
-            #estimateFeeFor,
-            [
-              amount,
-              feeRate,
-            ],
-          ),
-        )),
-      ) as _i23.Future<_i15.Amount>);
-  @override
-  _i15.Amount roughFeeEstimate(
-    int? inputCount,
-    int? outputCount,
-    int? feeRatePerKB,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #roughFeeEstimate,
-          [
-            inputCount,
-            outputCount,
-            feeRatePerKB,
-          ],
-        ),
-        returnValue: _FakeAmount_13(
-          this,
-          Invocation.method(
-            #roughFeeEstimate,
-            [
-              inputCount,
-              outputCount,
-              feeRatePerKB,
-            ],
-          ),
-        ),
-      ) as _i15.Amount);
-  @override
-  _i23.Future<_i15.Amount> sweepAllEstimate(int? feeRate) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #sweepAllEstimate,
-          [feeRate],
-        ),
-        returnValue: _i23.Future<_i15.Amount>.value(_FakeAmount_13(
-          this,
-          Invocation.method(
-            #sweepAllEstimate,
-            [feeRate],
-          ),
-        )),
-      ) as _i23.Future<_i15.Amount>);
-  @override
-  _i23.Future<bool> generateNewAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #generateNewAddress,
-          [],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  void initCache(
-    String? walletId,
-    _i22.Coin? coin,
-  ) =>
-      super.noSuchMethod(
-        Invocation.method(
-          #initCache,
-          [
-            walletId,
-            coin,
-          ],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedId,
-          [id],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  int getCachedChainHeight() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedChainHeight,
-          [],
-        ),
-        returnValue: 0,
-      ) as int);
-  @override
-  _i23.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedChainHeight,
-          [height],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  bool getCachedIsFavorite() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedIsFavorite,
-          [],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedIsFavorite,
-          [isFavorite],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i12.Balance getCachedBalance() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedBalance,
-          [],
-        ),
-        returnValue: _FakeBalance_9(
-          this,
-          Invocation.method(
-            #getCachedBalance,
-            [],
-          ),
-        ),
-      ) as _i12.Balance);
-  @override
-  _i23.Future<void> updateCachedBalance(_i12.Balance? balance) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedBalance,
-          [balance],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i12.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedBalanceSecondary,
-          [],
-        ),
-        returnValue: _FakeBalance_9(
-          this,
-          Invocation.method(
-            #getCachedBalanceSecondary,
-            [],
-          ),
-        ),
-      ) as _i12.Balance);
-  @override
-  _i23.Future<void> updateCachedBalanceSecondary(_i12.Balance? balance) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedBalanceSecondary,
-          [balance],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
-        Invocation.method(
-          #getWalletTokenContractAddresses,
-          [],
-        ),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  _i23.Future<void> updateWalletTokenContractAddresses(
-          List<String>? contractAddresses) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateWalletTokenContractAddresses,
-          [contractAddresses],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  void initWalletDB({_i13.MainDB? mockableOverride}) => super.noSuchMethod(
-        Invocation.method(
-          #initWalletDB,
-          [],
-          {#mockableOverride: mockableOverride},
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<_i16.Tuple2<_i18.Transaction, _i18.Address>> parseTransaction(
-    Map<String, dynamic>? txData,
-    dynamic electrumxClient,
-    List<_i18.Address>? myAddresses,
-    _i22.Coin? coin,
-    int? minConfirms,
-    String? walletId,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #parseTransaction,
-          [
-            txData,
-            electrumxClient,
-            myAddresses,
-            coin,
-            minConfirms,
-            walletId,
-          ],
-        ),
-        returnValue:
-            _i23.Future<_i16.Tuple2<_i18.Transaction, _i18.Address>>.value(
-                _FakeTuple2_14<_i18.Transaction, _i18.Address>(
-          this,
-          Invocation.method(
-            #parseTransaction,
-            [
-              txData,
-              electrumxClient,
-              myAddresses,
-              coin,
-              minConfirms,
-              walletId,
-            ],
-          ),
-        )),
-      ) as _i23.Future<_i16.Tuple2<_i18.Transaction, _i18.Address>>);
-  @override
-  void initPaynymWalletInterface({
-    required String? walletId,
-    required String? walletName,
-    required _i14.NetworkType? network,
-    required _i22.Coin? coin,
-    required _i13.MainDB? db,
-    required _i10.ElectrumX? electrumXClient,
-    required _i7.SecureStorageInterface? secureStorage,
-    required int? dustLimit,
-    required int? dustLimitP2PKH,
-    required int? minConfirms,
-    required _i23.Future<String?> Function()? getMnemonicString,
-    required _i23.Future<String?> Function()? getMnemonicPassphrase,
-    required _i23.Future<int> Function()? getChainHeight,
-    required _i23.Future<String> Function()? getCurrentChangeAddress,
-    required int Function({
-      required int feeRatePerKB,
-      required int vSize,
-    })?
-        estimateTxFee,
-    required _i23.Future<Map<String, dynamic>> Function({
-      required String address,
-      required _i15.Amount amount,
-      Map<String, dynamic>? args,
-    })?
-        prepareSend,
-    required _i23.Future<int> Function({required String address})? getTxCount,
-    required _i23.Future<List<_i29.SigningData>> Function(List<_i18.UTXO>)?
-        fetchBuildTxData,
-    required _i23.Future<void> Function()? refresh,
-    required _i23.Future<void> Function()? checkChangeAddressForTransactions,
-  }) =>
-      super.noSuchMethod(
-        Invocation.method(
-          #initPaynymWalletInterface,
-          [],
-          {
-            #walletId: walletId,
-            #walletName: walletName,
-            #network: network,
-            #coin: coin,
-            #db: db,
-            #electrumXClient: electrumXClient,
-            #secureStorage: secureStorage,
-            #dustLimit: dustLimit,
-            #dustLimitP2PKH: dustLimitP2PKH,
-            #minConfirms: minConfirms,
-            #getMnemonicString: getMnemonicString,
-            #getMnemonicPassphrase: getMnemonicPassphrase,
-            #getChainHeight: getChainHeight,
-            #getCurrentChangeAddress: getCurrentChangeAddress,
-            #estimateTxFee: estimateTxFee,
-            #prepareSend: prepareSend,
-            #getTxCount: getTxCount,
-            #fetchBuildTxData: fetchBuildTxData,
-            #refresh: refresh,
-            #checkChangeAddressForTransactions:
-                checkChangeAddressForTransactions,
-          },
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<_i17.BIP32> getBip47BaseNode() => (super.noSuchMethod(
-        Invocation.method(
-          #getBip47BaseNode,
-          [],
-        ),
-        returnValue: _i23.Future<_i17.BIP32>.value(_FakeBIP32_15(
-          this,
-          Invocation.method(
-            #getBip47BaseNode,
-            [],
-          ),
-        )),
-      ) as _i23.Future<_i17.BIP32>);
-  @override
-  _i23.Future<_i30.Uint8List> getPrivateKeyForPaynymReceivingAddress({
-    required String? paymentCodeString,
-    required int? index,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getPrivateKeyForPaynymReceivingAddress,
-          [],
-          {
-            #paymentCodeString: paymentCodeString,
-            #index: index,
-          },
-        ),
-        returnValue: _i23.Future<_i30.Uint8List>.value(_i30.Uint8List(0)),
-      ) as _i23.Future<_i30.Uint8List>);
-  @override
-  _i23.Future<_i18.Address> currentReceivingPaynymAddress({
-    required _i19.PaymentCode? sender,
-    required bool? isSegwit,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #currentReceivingPaynymAddress,
-          [],
-          {
-            #sender: sender,
-            #isSegwit: isSegwit,
-          },
-        ),
-        returnValue: _i23.Future<_i18.Address>.value(_FakeAddress_16(
-          this,
-          Invocation.method(
-            #currentReceivingPaynymAddress,
-            [],
-            {
-              #sender: sender,
-              #isSegwit: isSegwit,
-            },
-          ),
-        )),
-      ) as _i23.Future<_i18.Address>);
-  @override
-  _i23.Future<void> checkCurrentPaynymReceivingAddressForTransactions({
-    required _i19.PaymentCode? sender,
-    required bool? isSegwit,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkCurrentPaynymReceivingAddressForTransactions,
-          [],
-          {
-            #sender: sender,
-            #isSegwit: isSegwit,
-          },
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> checkAllCurrentReceivingPaynymAddressesForTransactions() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkAllCurrentReceivingPaynymAddressesForTransactions,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<_i17.BIP32> deriveNotificationBip32Node() => (super.noSuchMethod(
-        Invocation.method(
-          #deriveNotificationBip32Node,
-          [],
-        ),
-        returnValue: _i23.Future<_i17.BIP32>.value(_FakeBIP32_15(
-          this,
-          Invocation.method(
-            #deriveNotificationBip32Node,
-            [],
-          ),
-        )),
-      ) as _i23.Future<_i17.BIP32>);
-  @override
-  _i23.Future<_i19.PaymentCode> getPaymentCode({required bool? isSegwit}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getPaymentCode,
-          [],
-          {#isSegwit: isSegwit},
-        ),
-        returnValue: _i23.Future<_i19.PaymentCode>.value(_FakePaymentCode_17(
-          this,
-          Invocation.method(
-            #getPaymentCode,
-            [],
-            {#isSegwit: isSegwit},
-          ),
-        )),
-      ) as _i23.Future<_i19.PaymentCode>);
-  @override
-  _i23.Future<_i30.Uint8List> signWithNotificationKey(_i30.Uint8List? data) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #signWithNotificationKey,
-          [data],
-        ),
-        returnValue: _i23.Future<_i30.Uint8List>.value(_i30.Uint8List(0)),
-      ) as _i23.Future<_i30.Uint8List>);
-  @override
-  _i23.Future<String> signStringWithNotificationKey(String? data) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #signStringWithNotificationKey,
-          [data],
-        ),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  _i23.Future<Map<String, dynamic>> preparePaymentCodeSend({
-    required _i19.PaymentCode? paymentCode,
-    required bool? isSegwit,
-    required _i15.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #preparePaymentCodeSend,
-          [],
-          {
-            #paymentCode: paymentCode,
-            #isSegwit: isSegwit,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i23.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i23.Future<Map<String, dynamic>>);
-  @override
-  _i23.Future<_i18.Address> nextUnusedSendAddressFrom({
-    required _i19.PaymentCode? pCode,
-    required bool? isSegwit,
-    required _i17.BIP32? privateKeyNode,
-    int? startIndex = 0,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #nextUnusedSendAddressFrom,
-          [],
-          {
-            #pCode: pCode,
-            #isSegwit: isSegwit,
-            #privateKeyNode: privateKeyNode,
-            #startIndex: startIndex,
-          },
-        ),
-        returnValue: _i23.Future<_i18.Address>.value(_FakeAddress_16(
-          this,
-          Invocation.method(
-            #nextUnusedSendAddressFrom,
-            [],
-            {
-              #pCode: pCode,
-              #isSegwit: isSegwit,
-              #privateKeyNode: privateKeyNode,
-              #startIndex: startIndex,
-            },
-          ),
-        )),
-      ) as _i23.Future<_i18.Address>);
-  @override
-  _i23.Future<Map<String, dynamic>> prepareNotificationTx({
-    required int? selectedTxFeeRate,
-    required String? targetPaymentCodeString,
-    int? additionalOutputs = 0,
-    List<_i18.UTXO>? utxos,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareNotificationTx,
-          [],
-          {
-            #selectedTxFeeRate: selectedTxFeeRate,
-            #targetPaymentCodeString: targetPaymentCodeString,
-            #additionalOutputs: additionalOutputs,
-            #utxos: utxos,
-          },
-        ),
-        returnValue:
-            _i23.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i23.Future<Map<String, dynamic>>);
-  @override
-  _i23.Future<String> broadcastNotificationTx(
-          {required Map<String, dynamic>? preparedTx}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #broadcastNotificationTx,
-          [],
-          {#preparedTx: preparedTx},
-        ),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  _i23.Future<bool> hasConnected(String? paymentCodeString) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #hasConnected,
-          [paymentCodeString],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<_i19.PaymentCode?> unBlindedPaymentCodeFromTransaction(
-          {required _i18.Transaction? transaction}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #unBlindedPaymentCodeFromTransaction,
-          [],
-          {#transaction: transaction},
-        ),
-        returnValue: _i23.Future<_i19.PaymentCode?>.value(),
-      ) as _i23.Future<_i19.PaymentCode?>);
-  @override
-  _i23.Future<_i19.PaymentCode?> unBlindedPaymentCodeFromTransactionBad(
-          {required _i18.Transaction? transaction}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #unBlindedPaymentCodeFromTransactionBad,
-          [],
-          {#transaction: transaction},
-        ),
-        returnValue: _i23.Future<_i19.PaymentCode?>.value(),
-      ) as _i23.Future<_i19.PaymentCode?>);
-  @override
-  _i23.Future<List<_i19.PaymentCode>>
-      getAllPaymentCodesFromNotificationTransactions() => (super.noSuchMethod(
-            Invocation.method(
-              #getAllPaymentCodesFromNotificationTransactions,
-              [],
-            ),
-            returnValue:
-                _i23.Future<List<_i19.PaymentCode>>.value(<_i19.PaymentCode>[]),
-          ) as _i23.Future<List<_i19.PaymentCode>>);
-  @override
-  _i23.Future<void> checkForNotificationTransactionsTo(
-          Set<String>? otherCodeStrings) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkForNotificationTransactionsTo,
-          [otherCodeStrings],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> restoreAllHistory({
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required Set<String>? paymentCodeStrings,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #restoreAllHistory,
-          [],
-          {
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #paymentCodeStrings: paymentCodeStrings,
-          },
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> restoreHistoryWith({
-    required _i19.PaymentCode? other,
-    required bool? checkSegwitAsWell,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #restoreHistoryWith,
-          [],
-          {
-            #other: other,
-            #checkSegwitAsWell: checkSegwitAsWell,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-          },
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<_i18.Address> getMyNotificationAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #getMyNotificationAddress,
-          [],
-        ),
-        returnValue: _i23.Future<_i18.Address>.value(_FakeAddress_16(
-          this,
-          Invocation.method(
-            #getMyNotificationAddress,
-            [],
-          ),
-        )),
-      ) as _i23.Future<_i18.Address>);
-  @override
-  _i23.Future<List<String>> lookupKey(String? paymentCodeString) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #lookupKey,
-          [paymentCodeString],
-        ),
-        returnValue: _i23.Future<List<String>>.value(<String>[]),
-      ) as _i23.Future<List<String>>);
-  @override
-  _i23.Future<String?> paymentCodeStringByKey(String? key) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #paymentCodeStringByKey,
-          [key],
-        ),
-        returnValue: _i23.Future<String?>.value(),
-      ) as _i23.Future<String?>);
-  @override
-  _i23.Future<String> storeCode(String? paymentCodeString) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #storeCode,
-          [paymentCodeString],
-        ),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  void initCoinControlInterface({
-    required String? walletId,
-    required String? walletName,
-    required _i22.Coin? coin,
-    required _i13.MainDB? db,
-    required _i23.Future<int> Function()? getChainHeight,
-    required _i23.Future<void> Function(_i12.Balance)? refreshedBalanceCallback,
-  }) =>
-      super.noSuchMethod(
-        Invocation.method(
-          #initCoinControlInterface,
-          [],
-          {
-            #walletId: walletId,
-            #walletName: walletName,
-            #coin: coin,
-            #db: db,
-            #getChainHeight: getChainHeight,
-            #refreshedBalanceCallback: refreshedBalanceCallback,
-          },
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<void> refreshBalance({bool? notify = false}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #refreshBalance,
-          [],
-          {#notify: notify},
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-}
-
-/// A class which mocks [LocaleService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i31.LocaleService {
-  MockLocaleService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  String get locale => (super.noSuchMethod(
-        Invocation.getter(#locale),
-        returnValue: '',
-      ) as String);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<void> loadLocale({bool? notify = true}) => (super.noSuchMethod(
-        Invocation.method(
-          #loadLocale,
-          [],
-          {#notify: notify},
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i32.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i13.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_10(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i13.MainDB);
-  @override
-  List<_i33.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i33.StackTheme>[],
-      ) as List<_i33.StackTheme>);
-  @override
-  void init(_i13.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<void> install({required _i30.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<List<_i32.StackThemeMetaData>> fetchThemes() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i23.Future<List<_i32.StackThemeMetaData>>.value(
-            <_i32.StackThemeMetaData>[]),
-      ) as _i23.Future<List<_i32.StackThemeMetaData>>);
-  @override
-  _i23.Future<_i30.Uint8List> fetchTheme(
-          {required _i32.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i23.Future<_i30.Uint8List>.value(_i30.Uint8List(0)),
-      ) as _i23.Future<_i30.Uint8List>);
-  @override
-  _i33.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i33.StackTheme?);
-}
-
-/// A class which mocks [Prefs].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockPrefs extends _i1.Mock implements _i24.Prefs {
-  MockPrefs() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  bool get isInitialized => (super.noSuchMethod(
-        Invocation.getter(#isInitialized),
-        returnValue: false,
-      ) as bool);
-  @override
-  int get lastUnlockedTimeout => (super.noSuchMethod(
-        Invocation.getter(#lastUnlockedTimeout),
-        returnValue: 0,
-      ) as int);
-  @override
-  set lastUnlockedTimeout(int? lastUnlockedTimeout) => super.noSuchMethod(
-        Invocation.setter(
-          #lastUnlockedTimeout,
-          lastUnlockedTimeout,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get lastUnlocked => (super.noSuchMethod(
-        Invocation.getter(#lastUnlocked),
-        returnValue: 0,
-      ) as int);
-  @override
-  set lastUnlocked(int? lastUnlocked) => super.noSuchMethod(
-        Invocation.setter(
-          #lastUnlocked,
-          lastUnlocked,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get currentNotificationId => (super.noSuchMethod(
-        Invocation.getter(#currentNotificationId),
-        returnValue: 0,
-      ) as int);
-  @override
-  List<String> get walletIdsSyncOnStartup => (super.noSuchMethod(
-        Invocation.getter(#walletIdsSyncOnStartup),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  set walletIdsSyncOnStartup(List<String>? walletIdsSyncOnStartup) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #walletIdsSyncOnStartup,
-          walletIdsSyncOnStartup,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i34.SyncingType get syncType => (super.noSuchMethod(
-        Invocation.getter(#syncType),
-        returnValue: _i34.SyncingType.currentWalletOnly,
-      ) as _i34.SyncingType);
-  @override
-  set syncType(_i34.SyncingType? syncType) => super.noSuchMethod(
-        Invocation.setter(
-          #syncType,
-          syncType,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get wifiOnly => (super.noSuchMethod(
-        Invocation.getter(#wifiOnly),
-        returnValue: false,
-      ) as bool);
-  @override
-  set wifiOnly(bool? wifiOnly) => super.noSuchMethod(
-        Invocation.setter(
-          #wifiOnly,
-          wifiOnly,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get showFavoriteWallets => (super.noSuchMethod(
-        Invocation.getter(#showFavoriteWallets),
-        returnValue: false,
-      ) as bool);
-  @override
-  set showFavoriteWallets(bool? showFavoriteWallets) => super.noSuchMethod(
-        Invocation.setter(
-          #showFavoriteWallets,
-          showFavoriteWallets,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get language => (super.noSuchMethod(
-        Invocation.getter(#language),
-        returnValue: '',
-      ) as String);
-  @override
-  set language(String? newLanguage) => super.noSuchMethod(
-        Invocation.setter(
-          #language,
-          newLanguage,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get currency => (super.noSuchMethod(
-        Invocation.getter(#currency),
-        returnValue: '',
-      ) as String);
-  @override
-  set currency(String? newCurrency) => super.noSuchMethod(
-        Invocation.setter(
-          #currency,
-          newCurrency,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get randomizePIN => (super.noSuchMethod(
-        Invocation.getter(#randomizePIN),
-        returnValue: false,
-      ) as bool);
-  @override
-  set randomizePIN(bool? randomizePIN) => super.noSuchMethod(
-        Invocation.setter(
-          #randomizePIN,
-          randomizePIN,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get useBiometrics => (super.noSuchMethod(
-        Invocation.getter(#useBiometrics),
-        returnValue: false,
-      ) as bool);
-  @override
-  set useBiometrics(bool? useBiometrics) => super.noSuchMethod(
-        Invocation.setter(
-          #useBiometrics,
-          useBiometrics,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasPin => (super.noSuchMethod(
-        Invocation.getter(#hasPin),
-        returnValue: false,
-      ) as bool);
-  @override
-  set hasPin(bool? hasPin) => super.noSuchMethod(
-        Invocation.setter(
-          #hasPin,
-          hasPin,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get familiarity => (super.noSuchMethod(
-        Invocation.getter(#familiarity),
-        returnValue: 0,
-      ) as int);
-  @override
-  set familiarity(int? familiarity) => super.noSuchMethod(
-        Invocation.setter(
-          #familiarity,
-          familiarity,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get showTestNetCoins => (super.noSuchMethod(
-        Invocation.getter(#showTestNetCoins),
-        returnValue: false,
-      ) as bool);
-  @override
-  set showTestNetCoins(bool? showTestNetCoins) => super.noSuchMethod(
-        Invocation.setter(
-          #showTestNetCoins,
-          showTestNetCoins,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isAutoBackupEnabled => (super.noSuchMethod(
-        Invocation.getter(#isAutoBackupEnabled),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isAutoBackupEnabled(bool? isAutoBackupEnabled) => super.noSuchMethod(
-        Invocation.setter(
-          #isAutoBackupEnabled,
-          isAutoBackupEnabled,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set autoBackupLocation(String? autoBackupLocation) => super.noSuchMethod(
-        Invocation.setter(
-          #autoBackupLocation,
-          autoBackupLocation,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i35.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
-        Invocation.getter(#backupFrequencyType),
-        returnValue: _i35.BackupFrequencyType.everyTenMinutes,
-      ) as _i35.BackupFrequencyType);
-  @override
-  set backupFrequencyType(_i35.BackupFrequencyType? backupFrequencyType) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #backupFrequencyType,
-          backupFrequencyType,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set lastAutoBackup(DateTime? lastAutoBackup) => super.noSuchMethod(
-        Invocation.setter(
-          #lastAutoBackup,
-          lastAutoBackup,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hideBlockExplorerWarning => (super.noSuchMethod(
-        Invocation.getter(#hideBlockExplorerWarning),
-        returnValue: false,
-      ) as bool);
-  @override
-  set hideBlockExplorerWarning(bool? hideBlockExplorerWarning) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #hideBlockExplorerWarning,
-          hideBlockExplorerWarning,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get gotoWalletOnStartup => (super.noSuchMethod(
-        Invocation.getter(#gotoWalletOnStartup),
-        returnValue: false,
-      ) as bool);
-  @override
-  set gotoWalletOnStartup(bool? gotoWalletOnStartup) => super.noSuchMethod(
-        Invocation.setter(
-          #gotoWalletOnStartup,
-          gotoWalletOnStartup,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set startupWalletId(String? startupWalletId) => super.noSuchMethod(
-        Invocation.setter(
-          #startupWalletId,
-          startupWalletId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get externalCalls => (super.noSuchMethod(
-        Invocation.getter(#externalCalls),
-        returnValue: false,
-      ) as bool);
-  @override
-  set externalCalls(bool? externalCalls) => super.noSuchMethod(
-        Invocation.setter(
-          #externalCalls,
-          externalCalls,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get enableCoinControl => (super.noSuchMethod(
-        Invocation.getter(#enableCoinControl),
-        returnValue: false,
-      ) as bool);
-  @override
-  set enableCoinControl(bool? enableCoinControl) => super.noSuchMethod(
-        Invocation.setter(
-          #enableCoinControl,
-          enableCoinControl,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get enableSystemBrightness => (super.noSuchMethod(
-        Invocation.getter(#enableSystemBrightness),
-        returnValue: false,
-      ) as bool);
-  @override
-  set enableSystemBrightness(bool? enableSystemBrightness) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #enableSystemBrightness,
-          enableSystemBrightness,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get themeId => (super.noSuchMethod(
-        Invocation.getter(#themeId),
-        returnValue: '',
-      ) as String);
-  @override
-  set themeId(String? themeId) => super.noSuchMethod(
-        Invocation.setter(
-          #themeId,
-          themeId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get systemBrightnessLightThemeId => (super.noSuchMethod(
-        Invocation.getter(#systemBrightnessLightThemeId),
-        returnValue: '',
-      ) as String);
-  @override
-  set systemBrightnessLightThemeId(String? systemBrightnessLightThemeId) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #systemBrightnessLightThemeId,
-          systemBrightnessLightThemeId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get systemBrightnessDarkThemeId => (super.noSuchMethod(
-        Invocation.getter(#systemBrightnessDarkThemeId),
-        returnValue: '',
-      ) as String);
-  @override
-  set systemBrightnessDarkThemeId(String? systemBrightnessDarkThemeId) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #systemBrightnessDarkThemeId,
-          systemBrightnessDarkThemeId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<void> init() => (super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> incrementCurrentNotificationIndex() => (super.noSuchMethod(
-        Invocation.method(
-          #incrementCurrentNotificationIndex,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<bool> isExternalCallsSet() => (super.noSuchMethod(
-        Invocation.method(
-          #isExternalCallsSet,
-          [],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<void> saveUserID(String? userId) => (super.noSuchMethod(
-        Invocation.method(
-          #saveUserID,
-          [userId],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> saveSignupEpoch(int? signupEpoch) => (super.noSuchMethod(
-        Invocation.method(
-          #saveSignupEpoch,
-          [signupEpoch],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [Manager].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i6.Manager {
-  @override
-  bool get isActiveWallet => (super.noSuchMethod(
-        Invocation.getter(#isActiveWallet),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isActiveWallet(bool? isActive) => super.noSuchMethod(
-        Invocation.setter(
-          #isActiveWallet,
-          isActive,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i20.CoinServiceAPI get wallet => (super.noSuchMethod(
-        Invocation.getter(#wallet),
-        returnValue: _FakeCoinServiceAPI_18(
-          this,
-          Invocation.getter(#wallet),
-        ),
-      ) as _i20.CoinServiceAPI);
-  @override
-  bool get hasBackgroundRefreshListener => (super.noSuchMethod(
-        Invocation.getter(#hasBackgroundRefreshListener),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i22.Coin get coin => (super.noSuchMethod(
-        Invocation.getter(#coin),
-        returnValue: _i22.Coin.bitcoin,
-      ) as _i22.Coin);
-  @override
-  bool get isRefreshing => (super.noSuchMethod(
-        Invocation.getter(#isRefreshing),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get shouldAutoSync => (super.noSuchMethod(
-        Invocation.getter(#shouldAutoSync),
-        returnValue: false,
-      ) as bool);
-  @override
-  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
-        Invocation.setter(
-          #shouldAutoSync,
-          shouldAutoSync,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isFavorite => (super.noSuchMethod(
-        Invocation.getter(#isFavorite),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isFavorite(bool? markFavorite) => super.noSuchMethod(
-        Invocation.setter(
-          #isFavorite,
-          markFavorite,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
-        Invocation.getter(#fees),
-        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
-          this,
-          Invocation.getter(#fees),
-        )),
-      ) as _i23.Future<_i9.FeeObject>);
-  @override
-  _i23.Future<int> get maxFee => (super.noSuchMethod(
-        Invocation.getter(#maxFee),
-        returnValue: _i23.Future<int>.value(0),
-      ) as _i23.Future<int>);
-  @override
-  _i23.Future<String> get currentReceivingAddress => (super.noSuchMethod(
-        Invocation.getter(#currentReceivingAddress),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  _i12.Balance get balance => (super.noSuchMethod(
-        Invocation.getter(#balance),
-        returnValue: _FakeBalance_9(
-          this,
-          Invocation.getter(#balance),
-        ),
-      ) as _i12.Balance);
-  @override
-  _i23.Future<List<_i18.Transaction>> get transactions => (super.noSuchMethod(
-        Invocation.getter(#transactions),
-        returnValue:
-            _i23.Future<List<_i18.Transaction>>.value(<_i18.Transaction>[]),
-      ) as _i23.Future<List<_i18.Transaction>>);
-  @override
-  _i23.Future<List<_i18.UTXO>> get utxos => (super.noSuchMethod(
-        Invocation.getter(#utxos),
-        returnValue: _i23.Future<List<_i18.UTXO>>.value(<_i18.UTXO>[]),
-      ) as _i23.Future<List<_i18.UTXO>>);
-  @override
-  set walletName(String? newName) => super.noSuchMethod(
-        Invocation.setter(
-          #walletName,
-          newName,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get walletName => (super.noSuchMethod(
-        Invocation.getter(#walletName),
-        returnValue: '',
-      ) as String);
-  @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
-  @override
-  _i23.Future<List<String>> get mnemonic => (super.noSuchMethod(
-        Invocation.getter(#mnemonic),
-        returnValue: _i23.Future<List<String>>.value(<String>[]),
-      ) as _i23.Future<List<String>>);
-  @override
-  _i23.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
-        Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i23.Future<String?>.value(),
-      ) as _i23.Future<String?>);
-  @override
-  bool get isConnected => (super.noSuchMethod(
-        Invocation.getter(#isConnected),
-        returnValue: false,
-      ) as bool);
-  @override
-  int get currentHeight => (super.noSuchMethod(
-        Invocation.getter(#currentHeight),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get hasPaynymSupport => (super.noSuchMethod(
-        Invocation.getter(#hasPaynymSupport),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get hasCoinControlSupport => (super.noSuchMethod(
-        Invocation.getter(#hasCoinControlSupport),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get hasTokenSupport => (super.noSuchMethod(
-        Invocation.getter(#hasTokenSupport),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get hasWhirlpoolSupport => (super.noSuchMethod(
-        Invocation.getter(#hasWhirlpoolSupport),
-        returnValue: false,
-      ) as bool);
-  @override
-  int get rescanOnOpenVersion => (super.noSuchMethod(
-        Invocation.getter(#rescanOnOpenVersion),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get hasXPub => (super.noSuchMethod(
-        Invocation.getter(#hasXPub),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<String> get xpub => (super.noSuchMethod(
-        Invocation.getter(#xpub),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
-        Invocation.method(
-          #updateNode,
-          [shouldRefresh],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<Map<String, dynamic>> prepareSend({
-    required String? address,
-    required _i15.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareSend,
-          [],
-          {
-            #address: address,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i23.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i23.Future<Map<String, dynamic>>);
-  @override
-  _i23.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #confirmSend,
-          [],
-          {#txData: txData},
-        ),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  _i23.Future<void> refresh() => (super.noSuchMethod(
-        Invocation.method(
-          #refresh,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  bool validateAddress(String? address) => (super.noSuchMethod(
-        Invocation.method(
-          #validateAddress,
-          [address],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<bool> testNetworkConnection() => (super.noSuchMethod(
-        Invocation.method(
-          #testNetworkConnection,
-          [],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<void> initializeNew() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeNew,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> initializeExisting() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeExisting,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> recoverFromMnemonic({
-    required String? mnemonic,
-    String? mnemonicPassphrase,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required int? height,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #recoverFromMnemonic,
-          [],
-          {
-            #mnemonic: mnemonic,
-            #mnemonicPassphrase: mnemonicPassphrase,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #height: height,
-          },
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> exitCurrentWallet() => (super.noSuchMethod(
-        Invocation.method(
-          #exitCurrentWallet,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> fullRescan(
-    int? maxUnusedAddressGap,
-    int? maxNumberOfIndexesToCheck,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fullRescan,
-          [
-            maxUnusedAddressGap,
-            maxNumberOfIndexesToCheck,
-          ],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<_i15.Amount> estimateFeeFor(
-    _i15.Amount? amount,
-    int? feeRate,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFeeFor,
-          [
-            amount,
-            feeRate,
-          ],
-        ),
-        returnValue: _i23.Future<_i15.Amount>.value(_FakeAmount_13(
-          this,
-          Invocation.method(
-            #estimateFeeFor,
-            [
-              amount,
-              feeRate,
-            ],
-          ),
-        )),
-      ) as _i23.Future<_i15.Amount>);
-  @override
-  _i23.Future<bool> generateNewAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #generateNewAddress,
-          [],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
-        Invocation.method(
-          #resetRescanOnOpen,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [CoinServiceAPI].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockCoinServiceAPI extends _i1.Mock implements _i20.CoinServiceAPI {
-  @override
-  set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #onIsActiveWalletChanged,
-          _onIsActiveWalletChanged,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i22.Coin get coin => (super.noSuchMethod(
-        Invocation.getter(#coin),
-        returnValue: _i22.Coin.bitcoin,
-      ) as _i22.Coin);
-  @override
-  bool get isRefreshing => (super.noSuchMethod(
-        Invocation.getter(#isRefreshing),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get shouldAutoSync => (super.noSuchMethod(
-        Invocation.getter(#shouldAutoSync),
-        returnValue: false,
-      ) as bool);
-  @override
-  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
-        Invocation.setter(
-          #shouldAutoSync,
-          shouldAutoSync,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isFavorite => (super.noSuchMethod(
-        Invocation.getter(#isFavorite),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isFavorite(bool? markFavorite) => super.noSuchMethod(
-        Invocation.setter(
-          #isFavorite,
-          markFavorite,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
-        Invocation.getter(#fees),
-        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
-          this,
-          Invocation.getter(#fees),
-        )),
-      ) as _i23.Future<_i9.FeeObject>);
-  @override
-  _i23.Future<int> get maxFee => (super.noSuchMethod(
-        Invocation.getter(#maxFee),
-        returnValue: _i23.Future<int>.value(0),
-      ) as _i23.Future<int>);
-  @override
-  _i23.Future<String> get currentReceivingAddress => (super.noSuchMethod(
-        Invocation.getter(#currentReceivingAddress),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  _i12.Balance get balance => (super.noSuchMethod(
-        Invocation.getter(#balance),
-        returnValue: _FakeBalance_9(
-          this,
-          Invocation.getter(#balance),
-        ),
-      ) as _i12.Balance);
-  @override
-  _i23.Future<List<_i18.Transaction>> get transactions => (super.noSuchMethod(
-        Invocation.getter(#transactions),
-        returnValue:
-            _i23.Future<List<_i18.Transaction>>.value(<_i18.Transaction>[]),
-      ) as _i23.Future<List<_i18.Transaction>>);
-  @override
-  _i23.Future<List<_i18.UTXO>> get utxos => (super.noSuchMethod(
-        Invocation.getter(#utxos),
-        returnValue: _i23.Future<List<_i18.UTXO>>.value(<_i18.UTXO>[]),
-      ) as _i23.Future<List<_i18.UTXO>>);
-  @override
-  set walletName(String? newName) => super.noSuchMethod(
-        Invocation.setter(
-          #walletName,
-          newName,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get walletName => (super.noSuchMethod(
-        Invocation.getter(#walletName),
-        returnValue: '',
-      ) as String);
-  @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
-  @override
-  _i23.Future<List<String>> get mnemonic => (super.noSuchMethod(
-        Invocation.getter(#mnemonic),
-        returnValue: _i23.Future<List<String>>.value(<String>[]),
-      ) as _i23.Future<List<String>>);
-  @override
-  _i23.Future<String?> get mnemonicString => (super.noSuchMethod(
-        Invocation.getter(#mnemonicString),
-        returnValue: _i23.Future<String?>.value(),
-      ) as _i23.Future<String?>);
-  @override
-  _i23.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
-        Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i23.Future<String?>.value(),
-      ) as _i23.Future<String?>);
-  @override
-  bool get hasCalledExit => (super.noSuchMethod(
-        Invocation.getter(#hasCalledExit),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get isConnected => (super.noSuchMethod(
-        Invocation.getter(#isConnected),
-        returnValue: false,
-      ) as bool);
-  @override
-  int get storedChainHeight => (super.noSuchMethod(
-        Invocation.getter(#storedChainHeight),
-        returnValue: 0,
-      ) as int);
-  @override
-  _i23.Future<Map<String, dynamic>> prepareSend({
-    required String? address,
-    required _i15.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareSend,
-          [],
-          {
-            #address: address,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i23.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i23.Future<Map<String, dynamic>>);
-  @override
-  _i23.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #confirmSend,
-          [],
-          {#txData: txData},
-        ),
-        returnValue: _i23.Future<String>.value(''),
-      ) as _i23.Future<String>);
-  @override
-  _i23.Future<void> refresh() => (super.noSuchMethod(
-        Invocation.method(
-          #refresh,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
-        Invocation.method(
-          #updateNode,
-          [shouldRefresh],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  bool validateAddress(String? address) => (super.noSuchMethod(
-        Invocation.method(
-          #validateAddress,
-          [address],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i23.Future<bool> testNetworkConnection() => (super.noSuchMethod(
-        Invocation.method(
-          #testNetworkConnection,
-          [],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<void> recoverFromMnemonic({
-    required String? mnemonic,
-    String? mnemonicPassphrase,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required int? height,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #recoverFromMnemonic,
-          [],
-          {
-            #mnemonic: mnemonic,
-            #mnemonicPassphrase: mnemonicPassphrase,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #height: height,
-          },
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> initializeNew() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeNew,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> initializeExisting() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeExisting,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> exit() => (super.noSuchMethod(
-        Invocation.method(
-          #exit,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> fullRescan(
-    int? maxUnusedAddressGap,
-    int? maxNumberOfIndexesToCheck,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fullRescan,
-          [
-            maxUnusedAddressGap,
-            maxNumberOfIndexesToCheck,
-          ],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<_i15.Amount> estimateFeeFor(
-    _i15.Amount? amount,
-    int? feeRate,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFeeFor,
-          [
-            amount,
-            feeRate,
-          ],
-        ),
-        returnValue: _i23.Future<_i15.Amount>.value(_FakeAmount_13(
-          this,
-          Invocation.method(
-            #estimateFeeFor,
-            [
-              amount,
-              feeRate,
-            ],
-          ),
-        )),
-      ) as _i23.Future<_i15.Amount>);
-  @override
-  _i23.Future<bool> generateNewAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #generateNewAddress,
-          [],
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateSentCachedTxData,
-          [txData],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-}
diff --git a/test/price_test.dart b/test/price_test.dart
index f9e2930e1..6a361f38a 100644
--- a/test/price_test.dart
+++ b/test/price_test.dart
@@ -6,7 +6,7 @@ import 'package:hive_test/hive_test.dart';
 import 'package:http/http.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/services/price.dart';
 
 import 'price_test.mocks.dart';
diff --git a/test/price_test.mocks.dart b/test/price_test.mocks.dart
index df95b18a5..f9f667a66 100644
--- a/test/price_test.mocks.dart
+++ b/test/price_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/price_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/screen_tests/address_book_view/address_book_view_screen_test.mocks.dart b/test/screen_tests/address_book_view/address_book_view_screen_test.mocks.dart
index d25eea4d0..52f3544c1 100644
--- a/test/screen_tests/address_book_view/address_book_view_screen_test.mocks.dart
+++ b/test/screen_tests/address_book_view/address_book_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/address_book_view/address_book_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
-import 'dart:ui' as _i5;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/isar/models/contact_entry.dart' as _i2;
@@ -112,7 +111,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -120,7 +119,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.mocks.dart b/test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.mocks.dart
index 2188808b6..1a1b2d646 100644
--- a/test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.mocks.dart
+++ b/test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.mocks.dart
@@ -1,23 +1,22 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
-import 'dart:ui' as _i11;
 
 import 'package:barcode_scan2/barcode_scan2.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i6;
 import 'package:stackduo/models/isar/models/contact_entry.dart' as _i3;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i14;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i13;
 import 'package:stackduo/models/models.dart' as _i5;
 import 'package:stackduo/services/address_book_service.dart' as _i10;
 import 'package:stackduo/services/coins/coin_service.dart' as _i4;
-import 'package:stackduo/services/coins/manager.dart' as _i12;
+import 'package:stackduo/services/coins/manager.dart' as _i11;
 import 'package:stackduo/utilities/amount/amount.dart' as _i7;
 import 'package:stackduo/utilities/barcode_scanner_interface.dart' as _i8;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i13;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i12;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -201,7 +200,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -209,7 +208,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -237,7 +236,7 @@ class MockAddressBookService extends _i1.Mock
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i12.Manager {
+class MockManager extends _i1.Mock implements _i11.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -265,10 +264,10 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i13.Coin get coin => (super.noSuchMethod(
+  _i12.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i13.Coin.bitcoin,
-      ) as _i13.Coin);
+        returnValue: _i12.Coin.bitcoin,
+      ) as _i12.Coin);
   @override
   bool get isRefreshing => (super.noSuchMethod(
         Invocation.getter(#isRefreshing),
@@ -327,16 +326,16 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         ),
       ) as _i6.Balance);
   @override
-  _i9.Future<List<_i14.Transaction>> get transactions => (super.noSuchMethod(
+  _i9.Future<List<_i13.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i9.Future<List<_i14.Transaction>>.value(<_i14.Transaction>[]),
-      ) as _i9.Future<List<_i14.Transaction>>);
+            _i9.Future<List<_i13.Transaction>>.value(<_i13.Transaction>[]),
+      ) as _i9.Future<List<_i13.Transaction>>);
   @override
-  _i9.Future<List<_i14.UTXO>> get utxos => (super.noSuchMethod(
+  _i9.Future<List<_i13.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i9.Future<List<_i14.UTXO>>.value(<_i14.UTXO>[]),
-      ) as _i9.Future<List<_i14.UTXO>>);
+        returnValue: _i9.Future<List<_i13.UTXO>>.value(<_i13.UTXO>[]),
+      ) as _i9.Future<List<_i13.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -386,6 +385,11 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -589,7 +593,7 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -597,7 +601,7 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.mocks.dart b/test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.mocks.dart
index a2d4fd374..69df025e9 100644
--- a/test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.mocks.dart
+++ b/test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.mocks.dart
@@ -1,23 +1,22 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i9;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i5;
 import 'package:stackduo/models/isar/models/contact_entry.dart' as _i2;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i12;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i11;
 import 'package:stackduo/models/models.dart' as _i4;
 import 'package:stackduo/services/address_book_service.dart' as _i7;
 import 'package:stackduo/services/coins/coin_service.dart' as _i3;
-import 'package:stackduo/services/coins/manager.dart' as _i10;
-import 'package:stackduo/services/locale_service.dart' as _i14;
-import 'package:stackduo/services/notes_service.dart' as _i13;
+import 'package:stackduo/services/coins/manager.dart' as _i9;
+import 'package:stackduo/services/locale_service.dart' as _i13;
+import 'package:stackduo/services/notes_service.dart' as _i12;
 import 'package:stackduo/utilities/amount/amount.dart' as _i6;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i11;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i10;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -162,7 +161,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -170,7 +169,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -198,7 +197,7 @@ class MockAddressBookService extends _i1.Mock
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i10.Manager {
+class MockManager extends _i1.Mock implements _i9.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -226,10 +225,10 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i11.Coin get coin => (super.noSuchMethod(
+  _i10.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i11.Coin.bitcoin,
-      ) as _i11.Coin);
+        returnValue: _i10.Coin.bitcoin,
+      ) as _i10.Coin);
   @override
   bool get isRefreshing => (super.noSuchMethod(
         Invocation.getter(#isRefreshing),
@@ -288,16 +287,16 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i8.Future<List<_i12.Transaction>> get transactions => (super.noSuchMethod(
+  _i8.Future<List<_i11.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i8.Future<List<_i12.Transaction>>.value(<_i12.Transaction>[]),
-      ) as _i8.Future<List<_i12.Transaction>>);
+            _i8.Future<List<_i11.Transaction>>.value(<_i11.Transaction>[]),
+      ) as _i8.Future<List<_i11.Transaction>>);
   @override
-  _i8.Future<List<_i12.UTXO>> get utxos => (super.noSuchMethod(
+  _i8.Future<List<_i11.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i8.Future<List<_i12.UTXO>>.value(<_i12.UTXO>[]),
-      ) as _i8.Future<List<_i12.UTXO>>);
+        returnValue: _i8.Future<List<_i11.UTXO>>.value(<_i11.UTXO>[]),
+      ) as _i8.Future<List<_i11.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -347,6 +346,11 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -550,7 +554,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -558,7 +562,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -578,7 +582,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i13.NotesService {
+class MockNotesService extends _i1.Mock implements _i12.NotesService {
   @override
   String get walletId => (super.noSuchMethod(
         Invocation.getter(#walletId),
@@ -644,7 +648,7 @@ class MockNotesService extends _i1.Mock implements _i13.NotesService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -652,7 +656,7 @@ class MockNotesService extends _i1.Mock implements _i13.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -680,7 +684,7 @@ class MockNotesService extends _i1.Mock implements _i13.NotesService {
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i14.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
   @override
   String get locale => (super.noSuchMethod(
         Invocation.getter(#locale),
@@ -702,7 +706,7 @@ class MockLocaleService extends _i1.Mock implements _i14.LocaleService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -710,7 +714,7 @@ class MockLocaleService extends _i1.Mock implements _i14.LocaleService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.mocks.dart b/test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.mocks.dart
index aac8644df..50a1edf60 100644
--- a/test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.mocks.dart
+++ b/test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.mocks.dart
@@ -1,21 +1,20 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i9;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i5;
 import 'package:stackduo/models/isar/models/contact_entry.dart' as _i2;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i12;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i11;
 import 'package:stackduo/models/models.dart' as _i4;
 import 'package:stackduo/services/address_book_service.dart' as _i7;
 import 'package:stackduo/services/coins/coin_service.dart' as _i3;
-import 'package:stackduo/services/coins/manager.dart' as _i10;
+import 'package:stackduo/services/coins/manager.dart' as _i9;
 import 'package:stackduo/utilities/amount/amount.dart' as _i6;
-import 'package:stackduo/utilities/enums/coin_enum.dart' as _i11;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i10;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -160,7 +159,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -168,7 +167,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -196,7 +195,7 @@ class MockAddressBookService extends _i1.Mock
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i10.Manager {
+class MockManager extends _i1.Mock implements _i9.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -224,10 +223,10 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
-  _i11.Coin get coin => (super.noSuchMethod(
+  _i10.Coin get coin => (super.noSuchMethod(
         Invocation.getter(#coin),
-        returnValue: _i11.Coin.bitcoin,
-      ) as _i11.Coin);
+        returnValue: _i10.Coin.bitcoin,
+      ) as _i10.Coin);
   @override
   bool get isRefreshing => (super.noSuchMethod(
         Invocation.getter(#isRefreshing),
@@ -286,16 +285,16 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i8.Future<List<_i12.Transaction>> get transactions => (super.noSuchMethod(
+  _i8.Future<List<_i11.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i8.Future<List<_i12.Transaction>>.value(<_i12.Transaction>[]),
-      ) as _i8.Future<List<_i12.Transaction>>);
+            _i8.Future<List<_i11.Transaction>>.value(<_i11.Transaction>[]),
+      ) as _i8.Future<List<_i11.Transaction>>);
   @override
-  _i8.Future<List<_i12.UTXO>> get utxos => (super.noSuchMethod(
+  _i8.Future<List<_i11.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i8.Future<List<_i12.UTXO>>.value(<_i12.UTXO>[]),
-      ) as _i8.Future<List<_i12.UTXO>>);
+        returnValue: _i8.Future<List<_i11.UTXO>>.value(<_i11.UTXO>[]),
+      ) as _i8.Future<List<_i11.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -345,6 +344,11 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -548,7 +552,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -556,7 +560,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/exchange/exchange_view_test.mocks.dart b/test/screen_tests/exchange/exchange_view_test.mocks.dart
index 4fa685de2..98d94d5d8 100644
--- a/test/screen_tests/exchange/exchange_view_test.mocks.dart
+++ b/test/screen_tests/exchange/exchange_view_test.mocks.dart
@@ -1,34 +1,35 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/exchange/exchange_view_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i6;
-import 'dart:ui' as _i7;
 
-import 'package:decimal/decimal.dart' as _i14;
-import 'package:http/http.dart' as _i12;
+import 'package:decimal/decimal.dart' as _i15;
+import 'package:http/http.dart' as _i13;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/exchange/change_now/cn_exchange_estimate.dart'
-    as _i17;
+    as _i18;
 import 'package:stackduo/models/exchange/change_now/exchange_transaction.dart'
-    as _i19;
-import 'package:stackduo/models/exchange/change_now/exchange_transaction_status.dart'
     as _i20;
+import 'package:stackduo/models/exchange/change_now/exchange_transaction_status.dart'
+    as _i21;
 import 'package:stackduo/models/exchange/response_objects/estimate.dart'
-    as _i16;
+    as _i17;
 import 'package:stackduo/models/exchange/response_objects/fixed_rate_market.dart'
-    as _i18;
-import 'package:stackduo/models/exchange/response_objects/range.dart' as _i15;
-import 'package:stackduo/models/exchange/response_objects/trade.dart' as _i9;
-import 'package:stackduo/models/isar/exchange_cache/currency.dart' as _i13;
-import 'package:stackduo/models/isar/exchange_cache/pair.dart' as _i21;
+    as _i19;
+import 'package:stackduo/models/exchange/response_objects/range.dart' as _i16;
+import 'package:stackduo/models/exchange/response_objects/trade.dart' as _i10;
+import 'package:stackduo/models/isar/exchange_cache/currency.dart' as _i14;
+import 'package:stackduo/models/isar/exchange_cache/pair.dart' as _i22;
 import 'package:stackduo/services/exchange/change_now/change_now_api.dart'
-    as _i11;
+    as _i12;
 import 'package:stackduo/services/exchange/exchange_response.dart' as _i2;
-import 'package:stackduo/services/trade_notes_service.dart' as _i10;
-import 'package:stackduo/services/trade_service.dart' as _i8;
+import 'package:stackduo/services/trade_notes_service.dart' as _i11;
+import 'package:stackduo/services/trade_service.dart' as _i9;
+import 'package:stackduo/utilities/amount/amount_unit.dart' as _i7;
 import 'package:stackduo/utilities/enums/backup_frequency_type.dart' as _i5;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i8;
 import 'package:stackduo/utilities/enums/sync_type_enum.dart' as _i4;
 import 'package:stackduo/utilities/prefs.dart' as _i3;
 
@@ -451,7 +452,55 @@ class MockPrefs extends _i1.Mock implements _i3.Prefs {
         returnValueForMissingStub: _i6.Future<void>.value(),
       ) as _i6.Future<void>);
   @override
-  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  _i7.AmountUnit amountUnit(_i8.Coin? coin) => (super.noSuchMethod(
+        Invocation.method(
+          #amountUnit,
+          [coin],
+        ),
+        returnValue: _i7.AmountUnit.normal,
+      ) as _i7.AmountUnit);
+  @override
+  void updateAmountUnit({
+    required _i8.Coin? coin,
+    required _i7.AmountUnit? amountUnit,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #updateAmountUnit,
+          [],
+          {
+            #coin: coin,
+            #amountUnit: amountUnit,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int maxDecimals(_i8.Coin? coin) => (super.noSuchMethod(
+        Invocation.method(
+          #maxDecimals,
+          [coin],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  void updateMaxDecimals({
+    required _i8.Coin? coin,
+    required int? maxDecimals,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #updateMaxDecimals,
+          [],
+          {
+            #coin: coin,
+            #maxDecimals: maxDecimals,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -459,7 +508,7 @@ class MockPrefs extends _i1.Mock implements _i3.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -487,29 +536,29 @@ class MockPrefs extends _i1.Mock implements _i3.Prefs {
 /// A class which mocks [TradesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockTradesService extends _i1.Mock implements _i8.TradesService {
+class MockTradesService extends _i1.Mock implements _i9.TradesService {
   MockTradesService() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  List<_i9.Trade> get trades => (super.noSuchMethod(
+  List<_i10.Trade> get trades => (super.noSuchMethod(
         Invocation.getter(#trades),
-        returnValue: <_i9.Trade>[],
-      ) as List<_i9.Trade>);
+        returnValue: <_i10.Trade>[],
+      ) as List<_i10.Trade>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
         returnValue: false,
       ) as bool);
   @override
-  _i9.Trade? get(String? tradeId) => (super.noSuchMethod(Invocation.method(
+  _i10.Trade? get(String? tradeId) => (super.noSuchMethod(Invocation.method(
         #get,
         [tradeId],
-      )) as _i9.Trade?);
+      )) as _i10.Trade?);
   @override
   _i6.Future<void> add({
-    required _i9.Trade? trade,
+    required _i10.Trade? trade,
     required bool? shouldNotifyListeners,
   }) =>
       (super.noSuchMethod(
@@ -526,7 +575,7 @@ class MockTradesService extends _i1.Mock implements _i8.TradesService {
       ) as _i6.Future<void>);
   @override
   _i6.Future<void> edit({
-    required _i9.Trade? trade,
+    required _i10.Trade? trade,
     required bool? shouldNotifyListeners,
   }) =>
       (super.noSuchMethod(
@@ -543,7 +592,7 @@ class MockTradesService extends _i1.Mock implements _i8.TradesService {
       ) as _i6.Future<void>);
   @override
   _i6.Future<void> delete({
-    required _i9.Trade? trade,
+    required _i10.Trade? trade,
     required bool? shouldNotifyListeners,
   }) =>
       (super.noSuchMethod(
@@ -576,7 +625,7 @@ class MockTradesService extends _i1.Mock implements _i8.TradesService {
         returnValueForMissingStub: _i6.Future<void>.value(),
       ) as _i6.Future<void>);
   @override
-  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -584,7 +633,7 @@ class MockTradesService extends _i1.Mock implements _i8.TradesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -612,7 +661,7 @@ class MockTradesService extends _i1.Mock implements _i8.TradesService {
 /// A class which mocks [TradeNotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockTradeNotesService extends _i1.Mock implements _i10.TradeNotesService {
+class MockTradeNotesService extends _i1.Mock implements _i11.TradeNotesService {
   MockTradeNotesService() {
     _i1.throwOnMissingStub(this);
   }
@@ -664,7 +713,7 @@ class MockTradeNotesService extends _i1.Mock implements _i10.TradeNotesService {
         returnValueForMissingStub: _i6.Future<void>.value(),
       ) as _i6.Future<void>);
   @override
-  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -672,7 +721,7 @@ class MockTradeNotesService extends _i1.Mock implements _i10.TradeNotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -700,13 +749,13 @@ class MockTradeNotesService extends _i1.Mock implements _i10.TradeNotesService {
 /// A class which mocks [ChangeNowAPI].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
+class MockChangeNowAPI extends _i1.Mock implements _i12.ChangeNowAPI {
   MockChangeNowAPI() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  set client(_i12.Client? _client) => super.noSuchMethod(
+  set client(_i13.Client? _client) => super.noSuchMethod(
         Invocation.setter(
           #client,
           _client,
@@ -714,7 +763,7 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i6.Future<_i2.ExchangeResponse<List<_i13.Currency>>> getAvailableCurrencies({
+  _i6.Future<_i2.ExchangeResponse<List<_i14.Currency>>> getAvailableCurrencies({
     bool? fixedRate,
     bool? active,
   }) =>
@@ -728,8 +777,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
           },
         ),
         returnValue:
-            _i6.Future<_i2.ExchangeResponse<List<_i13.Currency>>>.value(
-                _FakeExchangeResponse_0<List<_i13.Currency>>(
+            _i6.Future<_i2.ExchangeResponse<List<_i14.Currency>>>.value(
+                _FakeExchangeResponse_0<List<_i14.Currency>>(
           this,
           Invocation.method(
             #getAvailableCurrencies,
@@ -740,9 +789,26 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
             },
           ),
         )),
-      ) as _i6.Future<_i2.ExchangeResponse<List<_i13.Currency>>>);
+      ) as _i6.Future<_i2.ExchangeResponse<List<_i14.Currency>>>);
+  @override
+  _i6.Future<_i2.ExchangeResponse<List<_i14.Currency>>> getCurrenciesV2() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #getCurrenciesV2,
+          [],
+        ),
+        returnValue:
+            _i6.Future<_i2.ExchangeResponse<List<_i14.Currency>>>.value(
+                _FakeExchangeResponse_0<List<_i14.Currency>>(
+          this,
+          Invocation.method(
+            #getCurrenciesV2,
+            [],
+          ),
+        )),
+      ) as _i6.Future<_i2.ExchangeResponse<List<_i14.Currency>>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<List<_i13.Currency>>> getPairedCurrencies({
+  _i6.Future<_i2.ExchangeResponse<List<_i14.Currency>>> getPairedCurrencies({
     required String? ticker,
     bool? fixedRate,
   }) =>
@@ -756,8 +822,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
           },
         ),
         returnValue:
-            _i6.Future<_i2.ExchangeResponse<List<_i13.Currency>>>.value(
-                _FakeExchangeResponse_0<List<_i13.Currency>>(
+            _i6.Future<_i2.ExchangeResponse<List<_i14.Currency>>>.value(
+                _FakeExchangeResponse_0<List<_i14.Currency>>(
           this,
           Invocation.method(
             #getPairedCurrencies,
@@ -768,9 +834,9 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
             },
           ),
         )),
-      ) as _i6.Future<_i2.ExchangeResponse<List<_i13.Currency>>>);
+      ) as _i6.Future<_i2.ExchangeResponse<List<_i14.Currency>>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<_i14.Decimal>> getMinimalExchangeAmount({
+  _i6.Future<_i2.ExchangeResponse<_i15.Decimal>> getMinimalExchangeAmount({
     required String? fromTicker,
     required String? toTicker,
     String? apiKey,
@@ -785,8 +851,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
             #apiKey: apiKey,
           },
         ),
-        returnValue: _i6.Future<_i2.ExchangeResponse<_i14.Decimal>>.value(
-            _FakeExchangeResponse_0<_i14.Decimal>(
+        returnValue: _i6.Future<_i2.ExchangeResponse<_i15.Decimal>>.value(
+            _FakeExchangeResponse_0<_i15.Decimal>(
           this,
           Invocation.method(
             #getMinimalExchangeAmount,
@@ -798,9 +864,9 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
             },
           ),
         )),
-      ) as _i6.Future<_i2.ExchangeResponse<_i14.Decimal>>);
+      ) as _i6.Future<_i2.ExchangeResponse<_i15.Decimal>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<_i15.Range>> getRange({
+  _i6.Future<_i2.ExchangeResponse<_i16.Range>> getRange({
     required String? fromTicker,
     required String? toTicker,
     required bool? isFixedRate,
@@ -817,8 +883,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
             #apiKey: apiKey,
           },
         ),
-        returnValue: _i6.Future<_i2.ExchangeResponse<_i15.Range>>.value(
-            _FakeExchangeResponse_0<_i15.Range>(
+        returnValue: _i6.Future<_i2.ExchangeResponse<_i16.Range>>.value(
+            _FakeExchangeResponse_0<_i16.Range>(
           this,
           Invocation.method(
             #getRange,
@@ -831,12 +897,12 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
             },
           ),
         )),
-      ) as _i6.Future<_i2.ExchangeResponse<_i15.Range>>);
+      ) as _i6.Future<_i2.ExchangeResponse<_i16.Range>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<_i16.Estimate>> getEstimatedExchangeAmount({
+  _i6.Future<_i2.ExchangeResponse<_i17.Estimate>> getEstimatedExchangeAmount({
     required String? fromTicker,
     required String? toTicker,
-    required _i14.Decimal? fromAmount,
+    required _i15.Decimal? fromAmount,
     String? apiKey,
   }) =>
       (super.noSuchMethod(
@@ -850,8 +916,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
             #apiKey: apiKey,
           },
         ),
-        returnValue: _i6.Future<_i2.ExchangeResponse<_i16.Estimate>>.value(
-            _FakeExchangeResponse_0<_i16.Estimate>(
+        returnValue: _i6.Future<_i2.ExchangeResponse<_i17.Estimate>>.value(
+            _FakeExchangeResponse_0<_i17.Estimate>(
           this,
           Invocation.method(
             #getEstimatedExchangeAmount,
@@ -864,13 +930,13 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
             },
           ),
         )),
-      ) as _i6.Future<_i2.ExchangeResponse<_i16.Estimate>>);
+      ) as _i6.Future<_i2.ExchangeResponse<_i17.Estimate>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<_i16.Estimate>>
+  _i6.Future<_i2.ExchangeResponse<_i17.Estimate>>
       getEstimatedExchangeAmountFixedRate({
     required String? fromTicker,
     required String? toTicker,
-    required _i14.Decimal? fromAmount,
+    required _i15.Decimal? fromAmount,
     required bool? reversed,
     bool? useRateId = true,
     String? apiKey,
@@ -888,8 +954,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
                 #apiKey: apiKey,
               },
             ),
-            returnValue: _i6.Future<_i2.ExchangeResponse<_i16.Estimate>>.value(
-                _FakeExchangeResponse_0<_i16.Estimate>(
+            returnValue: _i6.Future<_i2.ExchangeResponse<_i17.Estimate>>.value(
+                _FakeExchangeResponse_0<_i17.Estimate>(
               this,
               Invocation.method(
                 #getEstimatedExchangeAmountFixedRate,
@@ -904,17 +970,17 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
                 },
               ),
             )),
-          ) as _i6.Future<_i2.ExchangeResponse<_i16.Estimate>>);
+          ) as _i6.Future<_i2.ExchangeResponse<_i17.Estimate>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<_i17.CNExchangeEstimate>>
+  _i6.Future<_i2.ExchangeResponse<_i18.CNExchangeEstimate>>
       getEstimatedExchangeAmountV2({
     required String? fromTicker,
     required String? toTicker,
-    required _i17.CNEstimateType? fromOrTo,
-    required _i14.Decimal? amount,
+    required _i18.CNEstimateType? fromOrTo,
+    required _i15.Decimal? amount,
     String? fromNetwork,
     String? toNetwork,
-    _i17.CNFlowType? flow = _i17.CNFlowType.standard,
+    _i18.CNFlowType? flow = _i18.CNFlowType.standard,
     String? apiKey,
   }) =>
           (super.noSuchMethod(
@@ -933,8 +999,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
               },
             ),
             returnValue:
-                _i6.Future<_i2.ExchangeResponse<_i17.CNExchangeEstimate>>.value(
-                    _FakeExchangeResponse_0<_i17.CNExchangeEstimate>(
+                _i6.Future<_i2.ExchangeResponse<_i18.CNExchangeEstimate>>.value(
+                    _FakeExchangeResponse_0<_i18.CNExchangeEstimate>(
               this,
               Invocation.method(
                 #getEstimatedExchangeAmountV2,
@@ -951,9 +1017,9 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
                 },
               ),
             )),
-          ) as _i6.Future<_i2.ExchangeResponse<_i17.CNExchangeEstimate>>);
+          ) as _i6.Future<_i2.ExchangeResponse<_i18.CNExchangeEstimate>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<List<_i18.FixedRateMarket>>>
+  _i6.Future<_i2.ExchangeResponse<List<_i19.FixedRateMarket>>>
       getAvailableFixedRateMarkets({String? apiKey}) => (super.noSuchMethod(
             Invocation.method(
               #getAvailableFixedRateMarkets,
@@ -961,8 +1027,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
               {#apiKey: apiKey},
             ),
             returnValue: _i6.Future<
-                    _i2.ExchangeResponse<List<_i18.FixedRateMarket>>>.value(
-                _FakeExchangeResponse_0<List<_i18.FixedRateMarket>>(
+                    _i2.ExchangeResponse<List<_i19.FixedRateMarket>>>.value(
+                _FakeExchangeResponse_0<List<_i19.FixedRateMarket>>(
               this,
               Invocation.method(
                 #getAvailableFixedRateMarkets,
@@ -970,14 +1036,14 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
                 {#apiKey: apiKey},
               ),
             )),
-          ) as _i6.Future<_i2.ExchangeResponse<List<_i18.FixedRateMarket>>>);
+          ) as _i6.Future<_i2.ExchangeResponse<List<_i19.FixedRateMarket>>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<_i19.ExchangeTransaction>>
+  _i6.Future<_i2.ExchangeResponse<_i20.ExchangeTransaction>>
       createStandardExchangeTransaction({
     required String? fromTicker,
     required String? toTicker,
     required String? receivingAddress,
-    required _i14.Decimal? amount,
+    required _i15.Decimal? amount,
     String? extraId = r'',
     String? userId = r'',
     String? contactEmail = r'',
@@ -1003,8 +1069,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
               },
             ),
             returnValue: _i6.Future<
-                    _i2.ExchangeResponse<_i19.ExchangeTransaction>>.value(
-                _FakeExchangeResponse_0<_i19.ExchangeTransaction>(
+                    _i2.ExchangeResponse<_i20.ExchangeTransaction>>.value(
+                _FakeExchangeResponse_0<_i20.ExchangeTransaction>(
               this,
               Invocation.method(
                 #createStandardExchangeTransaction,
@@ -1023,14 +1089,14 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
                 },
               ),
             )),
-          ) as _i6.Future<_i2.ExchangeResponse<_i19.ExchangeTransaction>>);
+          ) as _i6.Future<_i2.ExchangeResponse<_i20.ExchangeTransaction>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<_i19.ExchangeTransaction>>
+  _i6.Future<_i2.ExchangeResponse<_i20.ExchangeTransaction>>
       createFixedRateExchangeTransaction({
     required String? fromTicker,
     required String? toTicker,
     required String? receivingAddress,
-    required _i14.Decimal? amount,
+    required _i15.Decimal? amount,
     required String? rateId,
     required bool? reversed,
     String? extraId = r'',
@@ -1060,8 +1126,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
               },
             ),
             returnValue: _i6.Future<
-                    _i2.ExchangeResponse<_i19.ExchangeTransaction>>.value(
-                _FakeExchangeResponse_0<_i19.ExchangeTransaction>(
+                    _i2.ExchangeResponse<_i20.ExchangeTransaction>>.value(
+                _FakeExchangeResponse_0<_i20.ExchangeTransaction>(
               this,
               Invocation.method(
                 #createFixedRateExchangeTransaction,
@@ -1082,9 +1148,9 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
                 },
               ),
             )),
-          ) as _i6.Future<_i2.ExchangeResponse<_i19.ExchangeTransaction>>);
+          ) as _i6.Future<_i2.ExchangeResponse<_i20.ExchangeTransaction>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<_i20.ExchangeTransactionStatus>>
+  _i6.Future<_i2.ExchangeResponse<_i21.ExchangeTransactionStatus>>
       getTransactionStatus({
     required String? id,
     String? apiKey,
@@ -1099,8 +1165,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
               },
             ),
             returnValue: _i6.Future<
-                    _i2.ExchangeResponse<_i20.ExchangeTransactionStatus>>.value(
-                _FakeExchangeResponse_0<_i20.ExchangeTransactionStatus>(
+                    _i2.ExchangeResponse<_i21.ExchangeTransactionStatus>>.value(
+                _FakeExchangeResponse_0<_i21.ExchangeTransactionStatus>(
               this,
               Invocation.method(
                 #getTransactionStatus,
@@ -1112,9 +1178,9 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
               ),
             )),
           ) as _i6
-              .Future<_i2.ExchangeResponse<_i20.ExchangeTransactionStatus>>);
+              .Future<_i2.ExchangeResponse<_i21.ExchangeTransactionStatus>>);
   @override
-  _i6.Future<_i2.ExchangeResponse<List<_i21.Pair>>>
+  _i6.Future<_i2.ExchangeResponse<List<_i22.Pair>>>
       getAvailableFloatingRatePairs({bool? includePartners = false}) =>
           (super.noSuchMethod(
             Invocation.method(
@@ -1123,8 +1189,8 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
               {#includePartners: includePartners},
             ),
             returnValue:
-                _i6.Future<_i2.ExchangeResponse<List<_i21.Pair>>>.value(
-                    _FakeExchangeResponse_0<List<_i21.Pair>>(
+                _i6.Future<_i2.ExchangeResponse<List<_i22.Pair>>>.value(
+                    _FakeExchangeResponse_0<List<_i22.Pair>>(
               this,
               Invocation.method(
                 #getAvailableFloatingRatePairs,
@@ -1132,5 +1198,5 @@ class MockChangeNowAPI extends _i1.Mock implements _i11.ChangeNowAPI {
                 {#includePartners: includePartners},
               ),
             )),
-          ) as _i6.Future<_i2.ExchangeResponse<List<_i21.Pair>>>);
+          ) as _i6.Future<_i2.ExchangeResponse<List<_i22.Pair>>>);
 }
diff --git a/test/screen_tests/lockscreen_view_screen_test.mocks.dart b/test/screen_tests/lockscreen_view_screen_test.mocks.dart
index c93aee6b0..27cf63a5a 100644
--- a/test/screen_tests/lockscreen_view_screen_test.mocks.dart
+++ b/test/screen_tests/lockscreen_view_screen_test.mocks.dart
@@ -1,19 +1,18 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/lockscreen_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i5;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i14;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i13;
 import 'package:stackduo/models/models.dart' as _i4;
-import 'package:stackduo/models/node_model.dart' as _i12;
+import 'package:stackduo/models/node_model.dart' as _i11;
 import 'package:stackduo/services/coins/coin_service.dart' as _i3;
-import 'package:stackduo/services/coins/manager.dart' as _i13;
-import 'package:stackduo/services/node_service.dart' as _i11;
+import 'package:stackduo/services/coins/manager.dart' as _i12;
+import 'package:stackduo/services/node_service.dart' as _i10;
 import 'package:stackduo/services/wallets_service.dart' as _i7;
 import 'package:stackduo/utilities/amount/amount.dart' as _i6;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i9;
@@ -280,7 +279,7 @@ class MockWalletsService extends _i1.Mock implements _i7.WalletsService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -288,7 +287,7 @@ class MockWalletsService extends _i1.Mock implements _i7.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -316,7 +315,7 @@ class MockWalletsService extends _i1.Mock implements _i7.WalletsService {
 /// A class which mocks [NodeService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNodeService extends _i1.Mock implements _i11.NodeService {
+class MockNodeService extends _i1.Mock implements _i10.NodeService {
   @override
   _i2.SecureStorageInterface get secureStorageInterface => (super.noSuchMethod(
         Invocation.getter(#secureStorageInterface),
@@ -326,15 +325,15 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
         ),
       ) as _i2.SecureStorageInterface);
   @override
-  List<_i12.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i11.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i12.NodeModel>[],
-      ) as List<_i12.NodeModel>);
+        returnValue: <_i11.NodeModel>[],
+      ) as List<_i11.NodeModel>);
   @override
-  List<_i12.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i11.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i12.NodeModel>[],
-      ) as List<_i12.NodeModel>);
+        returnValue: <_i11.NodeModel>[],
+      ) as List<_i11.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -352,7 +351,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
   @override
   _i8.Future<void> setPrimaryNodeFor({
     required _i9.Coin? coin,
-    required _i12.NodeModel? node,
+    required _i11.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -369,40 +368,40 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  _i12.NodeModel? getPrimaryNodeFor({required _i9.Coin? coin}) =>
+  _i11.NodeModel? getPrimaryNodeFor({required _i9.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i12.NodeModel?);
+      )) as _i11.NodeModel?);
   @override
-  List<_i12.NodeModel> getNodesFor(_i9.Coin? coin) => (super.noSuchMethod(
+  List<_i11.NodeModel> getNodesFor(_i9.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i12.NodeModel>[],
-      ) as List<_i12.NodeModel>);
+        returnValue: <_i11.NodeModel>[],
+      ) as List<_i11.NodeModel>);
   @override
-  _i12.NodeModel? getNodeById({required String? id}) =>
+  _i11.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i12.NodeModel?);
+      )) as _i11.NodeModel?);
   @override
-  List<_i12.NodeModel> failoverNodesFor({required _i9.Coin? coin}) =>
+  List<_i11.NodeModel> failoverNodesFor({required _i9.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i12.NodeModel>[],
-      ) as List<_i12.NodeModel>);
+        returnValue: <_i11.NodeModel>[],
+      ) as List<_i11.NodeModel>);
   @override
   _i8.Future<void> add(
-    _i12.NodeModel? node,
+    _i11.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -454,7 +453,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
       ) as _i8.Future<void>);
   @override
   _i8.Future<void> edit(
-    _i12.NodeModel? editedNode,
+    _i11.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -480,7 +479,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -488,7 +487,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -516,7 +515,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i13.Manager {
+class MockManager extends _i1.Mock implements _i12.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -606,16 +605,16 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i8.Future<List<_i14.Transaction>> get transactions => (super.noSuchMethod(
+  _i8.Future<List<_i13.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i8.Future<List<_i14.Transaction>>.value(<_i14.Transaction>[]),
-      ) as _i8.Future<List<_i14.Transaction>>);
+            _i8.Future<List<_i13.Transaction>>.value(<_i13.Transaction>[]),
+      ) as _i8.Future<List<_i13.Transaction>>);
   @override
-  _i8.Future<List<_i14.UTXO>> get utxos => (super.noSuchMethod(
+  _i8.Future<List<_i13.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i8.Future<List<_i14.UTXO>>.value(<_i14.UTXO>[]),
-      ) as _i8.Future<List<_i14.UTXO>>);
+        returnValue: _i8.Future<List<_i13.UTXO>>.value(<_i13.UTXO>[]),
+      ) as _i8.Future<List<_i13.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -665,6 +664,11 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -868,7 +872,7 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -876,7 +880,7 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/main_view_tests/main_view_screen_testA_test.mocks.dart b/test/screen_tests/main_view_tests/main_view_screen_testA_test.mocks.dart
index 5df61cd29..26a5c4fc1 100644
--- a/test/screen_tests/main_view_tests/main_view_screen_testA_test.mocks.dart
+++ b/test/screen_tests/main_view_tests/main_view_screen_testA_test.mocks.dart
@@ -1,19 +1,18 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/main_view_tests/main_view_screen_testA_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
-import 'dart:ui' as _i9;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i11;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i10;
 import 'package:stackduo/models/models.dart' as _i3;
 import 'package:stackduo/services/coins/coin_service.dart' as _i2;
-import 'package:stackduo/services/coins/manager.dart' as _i10;
-import 'package:stackduo/services/locale_service.dart' as _i13;
-import 'package:stackduo/services/notes_service.dart' as _i12;
+import 'package:stackduo/services/coins/manager.dart' as _i9;
+import 'package:stackduo/services/locale_service.dart' as _i12;
+import 'package:stackduo/services/notes_service.dart' as _i11;
 import 'package:stackduo/services/wallets_service.dart' as _i6;
 import 'package:stackduo/utilities/amount/amount.dart' as _i5;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i8;
@@ -267,7 +266,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -275,7 +274,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -303,7 +302,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i10.Manager {
+class MockManager extends _i1.Mock implements _i9.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -393,16 +392,16 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         ),
       ) as _i4.Balance);
   @override
-  _i7.Future<List<_i11.Transaction>> get transactions => (super.noSuchMethod(
+  _i7.Future<List<_i10.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i7.Future<List<_i11.Transaction>>.value(<_i11.Transaction>[]),
-      ) as _i7.Future<List<_i11.Transaction>>);
+            _i7.Future<List<_i10.Transaction>>.value(<_i10.Transaction>[]),
+      ) as _i7.Future<List<_i10.Transaction>>);
   @override
-  _i7.Future<List<_i11.UTXO>> get utxos => (super.noSuchMethod(
+  _i7.Future<List<_i10.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i7.Future<List<_i11.UTXO>>.value(<_i11.UTXO>[]),
-      ) as _i7.Future<List<_i11.UTXO>>);
+        returnValue: _i7.Future<List<_i10.UTXO>>.value(<_i10.UTXO>[]),
+      ) as _i7.Future<List<_i10.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -452,6 +451,11 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -655,7 +659,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -663,7 +667,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -683,7 +687,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i12.NotesService {
+class MockNotesService extends _i1.Mock implements _i11.NotesService {
   @override
   String get walletId => (super.noSuchMethod(
         Invocation.getter(#walletId),
@@ -749,7 +753,7 @@ class MockNotesService extends _i1.Mock implements _i12.NotesService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -757,7 +761,7 @@ class MockNotesService extends _i1.Mock implements _i12.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -785,7 +789,7 @@ class MockNotesService extends _i1.Mock implements _i12.NotesService {
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i12.LocaleService {
   @override
   String get locale => (super.noSuchMethod(
         Invocation.getter(#locale),
@@ -807,7 +811,7 @@ class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -815,7 +819,7 @@ class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/main_view_tests/main_view_screen_testB_test.mocks.dart b/test/screen_tests/main_view_tests/main_view_screen_testB_test.mocks.dart
index 60597cc76..22f5cf2f7 100644
--- a/test/screen_tests/main_view_tests/main_view_screen_testB_test.mocks.dart
+++ b/test/screen_tests/main_view_tests/main_view_screen_testB_test.mocks.dart
@@ -1,19 +1,18 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/main_view_tests/main_view_screen_testB_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
-import 'dart:ui' as _i9;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i11;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i10;
 import 'package:stackduo/models/models.dart' as _i3;
 import 'package:stackduo/services/coins/coin_service.dart' as _i2;
-import 'package:stackduo/services/coins/manager.dart' as _i10;
-import 'package:stackduo/services/locale_service.dart' as _i13;
-import 'package:stackduo/services/notes_service.dart' as _i12;
+import 'package:stackduo/services/coins/manager.dart' as _i9;
+import 'package:stackduo/services/locale_service.dart' as _i12;
+import 'package:stackduo/services/notes_service.dart' as _i11;
 import 'package:stackduo/services/wallets_service.dart' as _i6;
 import 'package:stackduo/utilities/amount/amount.dart' as _i5;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i8;
@@ -267,7 +266,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -275,7 +274,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -303,7 +302,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i10.Manager {
+class MockManager extends _i1.Mock implements _i9.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -393,16 +392,16 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         ),
       ) as _i4.Balance);
   @override
-  _i7.Future<List<_i11.Transaction>> get transactions => (super.noSuchMethod(
+  _i7.Future<List<_i10.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i7.Future<List<_i11.Transaction>>.value(<_i11.Transaction>[]),
-      ) as _i7.Future<List<_i11.Transaction>>);
+            _i7.Future<List<_i10.Transaction>>.value(<_i10.Transaction>[]),
+      ) as _i7.Future<List<_i10.Transaction>>);
   @override
-  _i7.Future<List<_i11.UTXO>> get utxos => (super.noSuchMethod(
+  _i7.Future<List<_i10.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i7.Future<List<_i11.UTXO>>.value(<_i11.UTXO>[]),
-      ) as _i7.Future<List<_i11.UTXO>>);
+        returnValue: _i7.Future<List<_i10.UTXO>>.value(<_i10.UTXO>[]),
+      ) as _i7.Future<List<_i10.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -452,6 +451,11 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -655,7 +659,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -663,7 +667,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -683,7 +687,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i12.NotesService {
+class MockNotesService extends _i1.Mock implements _i11.NotesService {
   @override
   String get walletId => (super.noSuchMethod(
         Invocation.getter(#walletId),
@@ -749,7 +753,7 @@ class MockNotesService extends _i1.Mock implements _i12.NotesService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -757,7 +761,7 @@ class MockNotesService extends _i1.Mock implements _i12.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -785,7 +789,7 @@ class MockNotesService extends _i1.Mock implements _i12.NotesService {
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i12.LocaleService {
   @override
   String get locale => (super.noSuchMethod(
         Invocation.getter(#locale),
@@ -807,7 +811,7 @@ class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -815,7 +819,7 @@ class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/main_view_tests/main_view_screen_testC_test.mocks.dart b/test/screen_tests/main_view_tests/main_view_screen_testC_test.mocks.dart
index 5b08e0385..a296ab840 100644
--- a/test/screen_tests/main_view_tests/main_view_screen_testC_test.mocks.dart
+++ b/test/screen_tests/main_view_tests/main_view_screen_testC_test.mocks.dart
@@ -1,19 +1,18 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/main_view_tests/main_view_screen_testC_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
-import 'dart:ui' as _i9;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i11;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i10;
 import 'package:stackduo/models/models.dart' as _i3;
 import 'package:stackduo/services/coins/coin_service.dart' as _i2;
-import 'package:stackduo/services/coins/manager.dart' as _i10;
-import 'package:stackduo/services/locale_service.dart' as _i13;
-import 'package:stackduo/services/notes_service.dart' as _i12;
+import 'package:stackduo/services/coins/manager.dart' as _i9;
+import 'package:stackduo/services/locale_service.dart' as _i12;
+import 'package:stackduo/services/notes_service.dart' as _i11;
 import 'package:stackduo/services/wallets_service.dart' as _i6;
 import 'package:stackduo/utilities/amount/amount.dart' as _i5;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i8;
@@ -267,7 +266,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -275,7 +274,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -303,7 +302,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i10.Manager {
+class MockManager extends _i1.Mock implements _i9.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -393,16 +392,16 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         ),
       ) as _i4.Balance);
   @override
-  _i7.Future<List<_i11.Transaction>> get transactions => (super.noSuchMethod(
+  _i7.Future<List<_i10.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i7.Future<List<_i11.Transaction>>.value(<_i11.Transaction>[]),
-      ) as _i7.Future<List<_i11.Transaction>>);
+            _i7.Future<List<_i10.Transaction>>.value(<_i10.Transaction>[]),
+      ) as _i7.Future<List<_i10.Transaction>>);
   @override
-  _i7.Future<List<_i11.UTXO>> get utxos => (super.noSuchMethod(
+  _i7.Future<List<_i10.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i7.Future<List<_i11.UTXO>>.value(<_i11.UTXO>[]),
-      ) as _i7.Future<List<_i11.UTXO>>);
+        returnValue: _i7.Future<List<_i10.UTXO>>.value(<_i10.UTXO>[]),
+      ) as _i7.Future<List<_i10.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -452,6 +451,11 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -655,7 +659,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -663,7 +667,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -683,7 +687,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i12.NotesService {
+class MockNotesService extends _i1.Mock implements _i11.NotesService {
   @override
   String get walletId => (super.noSuchMethod(
         Invocation.getter(#walletId),
@@ -749,7 +753,7 @@ class MockNotesService extends _i1.Mock implements _i12.NotesService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -757,7 +761,7 @@ class MockNotesService extends _i1.Mock implements _i12.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -785,7 +789,7 @@ class MockNotesService extends _i1.Mock implements _i12.NotesService {
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i12.LocaleService {
   @override
   String get locale => (super.noSuchMethod(
         Invocation.getter(#locale),
@@ -807,7 +811,7 @@ class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -815,7 +819,7 @@ class MockLocaleService extends _i1.Mock implements _i13.LocaleService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/onboarding/backup_key_view_screen_test.mocks.dart b/test/screen_tests/onboarding/backup_key_view_screen_test.mocks.dart
index 6cd533c0b..cc5c0cf44 100644
--- a/test/screen_tests/onboarding/backup_key_view_screen_test.mocks.dart
+++ b/test/screen_tests/onboarding/backup_key_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/onboarding/backup_key_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
@@ -219,6 +218,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -422,7 +426,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -430,7 +434,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/onboarding/backup_key_warning_view_screen_test.mocks.dart b/test/screen_tests/onboarding/backup_key_warning_view_screen_test.mocks.dart
index 65990a7d5..b9f6f7d32 100644
--- a/test/screen_tests/onboarding/backup_key_warning_view_screen_test.mocks.dart
+++ b/test/screen_tests/onboarding/backup_key_warning_view_screen_test.mocks.dart
@@ -1,17 +1,16 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/onboarding/backup_key_warning_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
-import 'dart:ui' as _i9;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i11;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i10;
 import 'package:stackduo/models/models.dart' as _i3;
 import 'package:stackduo/services/coins/coin_service.dart' as _i2;
-import 'package:stackduo/services/coins/manager.dart' as _i10;
+import 'package:stackduo/services/coins/manager.dart' as _i9;
 import 'package:stackduo/services/wallets_service.dart' as _i6;
 import 'package:stackduo/utilities/amount/amount.dart' as _i5;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i8;
@@ -265,7 +264,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -273,7 +272,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -301,7 +300,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i10.Manager {
+class MockManager extends _i1.Mock implements _i9.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -391,16 +390,16 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         ),
       ) as _i4.Balance);
   @override
-  _i7.Future<List<_i11.Transaction>> get transactions => (super.noSuchMethod(
+  _i7.Future<List<_i10.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i7.Future<List<_i11.Transaction>>.value(<_i11.Transaction>[]),
-      ) as _i7.Future<List<_i11.Transaction>>);
+            _i7.Future<List<_i10.Transaction>>.value(<_i10.Transaction>[]),
+      ) as _i7.Future<List<_i10.Transaction>>);
   @override
-  _i7.Future<List<_i11.UTXO>> get utxos => (super.noSuchMethod(
+  _i7.Future<List<_i10.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i7.Future<List<_i11.UTXO>>.value(<_i11.UTXO>[]),
-      ) as _i7.Future<List<_i11.UTXO>>);
+        returnValue: _i7.Future<List<_i10.UTXO>>.value(<_i10.UTXO>[]),
+      ) as _i7.Future<List<_i10.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -450,6 +449,11 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -653,7 +657,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -661,7 +665,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/onboarding/create_pin_view_screen_test.mocks.dart b/test/screen_tests/onboarding/create_pin_view_screen_test.mocks.dart
index 08aad855c..6cdbfe153 100644
--- a/test/screen_tests/onboarding/create_pin_view_screen_test.mocks.dart
+++ b/test/screen_tests/onboarding/create_pin_view_screen_test.mocks.dart
@@ -1,19 +1,18 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/onboarding/create_pin_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i5;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i14;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i13;
 import 'package:stackduo/models/models.dart' as _i4;
-import 'package:stackduo/models/node_model.dart' as _i12;
+import 'package:stackduo/models/node_model.dart' as _i11;
 import 'package:stackduo/services/coins/coin_service.dart' as _i3;
-import 'package:stackduo/services/coins/manager.dart' as _i13;
-import 'package:stackduo/services/node_service.dart' as _i11;
+import 'package:stackduo/services/coins/manager.dart' as _i12;
+import 'package:stackduo/services/node_service.dart' as _i10;
 import 'package:stackduo/services/wallets_service.dart' as _i7;
 import 'package:stackduo/utilities/amount/amount.dart' as _i6;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i9;
@@ -280,7 +279,7 @@ class MockWalletsService extends _i1.Mock implements _i7.WalletsService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -288,7 +287,7 @@ class MockWalletsService extends _i1.Mock implements _i7.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -316,7 +315,7 @@ class MockWalletsService extends _i1.Mock implements _i7.WalletsService {
 /// A class which mocks [NodeService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNodeService extends _i1.Mock implements _i11.NodeService {
+class MockNodeService extends _i1.Mock implements _i10.NodeService {
   @override
   _i2.SecureStorageInterface get secureStorageInterface => (super.noSuchMethod(
         Invocation.getter(#secureStorageInterface),
@@ -326,15 +325,15 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
         ),
       ) as _i2.SecureStorageInterface);
   @override
-  List<_i12.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i11.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i12.NodeModel>[],
-      ) as List<_i12.NodeModel>);
+        returnValue: <_i11.NodeModel>[],
+      ) as List<_i11.NodeModel>);
   @override
-  List<_i12.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i11.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i12.NodeModel>[],
-      ) as List<_i12.NodeModel>);
+        returnValue: <_i11.NodeModel>[],
+      ) as List<_i11.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -352,7 +351,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
   @override
   _i8.Future<void> setPrimaryNodeFor({
     required _i9.Coin? coin,
-    required _i12.NodeModel? node,
+    required _i11.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -369,40 +368,40 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  _i12.NodeModel? getPrimaryNodeFor({required _i9.Coin? coin}) =>
+  _i11.NodeModel? getPrimaryNodeFor({required _i9.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i12.NodeModel?);
+      )) as _i11.NodeModel?);
   @override
-  List<_i12.NodeModel> getNodesFor(_i9.Coin? coin) => (super.noSuchMethod(
+  List<_i11.NodeModel> getNodesFor(_i9.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i12.NodeModel>[],
-      ) as List<_i12.NodeModel>);
+        returnValue: <_i11.NodeModel>[],
+      ) as List<_i11.NodeModel>);
   @override
-  _i12.NodeModel? getNodeById({required String? id}) =>
+  _i11.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i12.NodeModel?);
+      )) as _i11.NodeModel?);
   @override
-  List<_i12.NodeModel> failoverNodesFor({required _i9.Coin? coin}) =>
+  List<_i11.NodeModel> failoverNodesFor({required _i9.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i12.NodeModel>[],
-      ) as List<_i12.NodeModel>);
+        returnValue: <_i11.NodeModel>[],
+      ) as List<_i11.NodeModel>);
   @override
   _i8.Future<void> add(
-    _i12.NodeModel? node,
+    _i11.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -454,7 +453,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
       ) as _i8.Future<void>);
   @override
   _i8.Future<void> edit(
-    _i12.NodeModel? editedNode,
+    _i11.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -480,7 +479,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -488,7 +487,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -516,7 +515,7 @@ class MockNodeService extends _i1.Mock implements _i11.NodeService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i13.Manager {
+class MockManager extends _i1.Mock implements _i12.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -606,16 +605,16 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i8.Future<List<_i14.Transaction>> get transactions => (super.noSuchMethod(
+  _i8.Future<List<_i13.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i8.Future<List<_i14.Transaction>>.value(<_i14.Transaction>[]),
-      ) as _i8.Future<List<_i14.Transaction>>);
+            _i8.Future<List<_i13.Transaction>>.value(<_i13.Transaction>[]),
+      ) as _i8.Future<List<_i13.Transaction>>);
   @override
-  _i8.Future<List<_i14.UTXO>> get utxos => (super.noSuchMethod(
+  _i8.Future<List<_i13.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i8.Future<List<_i14.UTXO>>.value(<_i14.UTXO>[]),
-      ) as _i8.Future<List<_i14.UTXO>>);
+        returnValue: _i8.Future<List<_i13.UTXO>>.value(<_i13.UTXO>[]),
+      ) as _i8.Future<List<_i13.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -665,6 +664,11 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -868,7 +872,7 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -876,7 +880,7 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/onboarding/name_your_wallet_view_screen_test.mocks.dart b/test/screen_tests/onboarding/name_your_wallet_view_screen_test.mocks.dart
index 841db542c..61b791b30 100644
--- a/test/screen_tests/onboarding/name_your_wallet_view_screen_test.mocks.dart
+++ b/test/screen_tests/onboarding/name_your_wallet_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/onboarding/name_your_wallet_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
-import 'dart:ui' as _i5;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/services/wallets_service.dart' as _i2;
@@ -218,7 +217,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -226,7 +225,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/onboarding/restore_wallet_view_screen_test.mocks.dart b/test/screen_tests/onboarding/restore_wallet_view_screen_test.mocks.dart
index fd1b01af8..b096c588b 100644
--- a/test/screen_tests/onboarding/restore_wallet_view_screen_test.mocks.dart
+++ b/test/screen_tests/onboarding/restore_wallet_view_screen_test.mocks.dart
@@ -1,20 +1,19 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/onboarding/restore_wallet_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
-import 'dart:ui' as _i12;
 
 import 'package:barcode_scan2/barcode_scan2.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i5;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i14;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i13;
 import 'package:stackduo/models/models.dart' as _i4;
-import 'package:stackduo/models/node_model.dart' as _i16;
+import 'package:stackduo/models/node_model.dart' as _i15;
 import 'package:stackduo/services/coins/coin_service.dart' as _i3;
-import 'package:stackduo/services/coins/manager.dart' as _i13;
-import 'package:stackduo/services/node_service.dart' as _i15;
+import 'package:stackduo/services/coins/manager.dart' as _i12;
+import 'package:stackduo/services/node_service.dart' as _i14;
 import 'package:stackduo/services/wallets_service.dart' as _i10;
 import 'package:stackduo/utilities/amount/amount.dart' as _i6;
 import 'package:stackduo/utilities/barcode_scanner_interface.dart' as _i8;
@@ -321,7 +320,7 @@ class MockWalletsService extends _i1.Mock implements _i10.WalletsService {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -329,7 +328,7 @@ class MockWalletsService extends _i1.Mock implements _i10.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -357,7 +356,7 @@ class MockWalletsService extends _i1.Mock implements _i10.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i13.Manager {
+class MockManager extends _i1.Mock implements _i12.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -447,16 +446,16 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i9.Future<List<_i14.Transaction>> get transactions => (super.noSuchMethod(
+  _i9.Future<List<_i13.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i9.Future<List<_i14.Transaction>>.value(<_i14.Transaction>[]),
-      ) as _i9.Future<List<_i14.Transaction>>);
+            _i9.Future<List<_i13.Transaction>>.value(<_i13.Transaction>[]),
+      ) as _i9.Future<List<_i13.Transaction>>);
   @override
-  _i9.Future<List<_i14.UTXO>> get utxos => (super.noSuchMethod(
+  _i9.Future<List<_i13.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i9.Future<List<_i14.UTXO>>.value(<_i14.UTXO>[]),
-      ) as _i9.Future<List<_i14.UTXO>>);
+        returnValue: _i9.Future<List<_i13.UTXO>>.value(<_i13.UTXO>[]),
+      ) as _i9.Future<List<_i13.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -506,6 +505,11 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -709,7 +713,7 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -717,7 +721,7 @@ class MockManager extends _i1.Mock implements _i13.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -737,7 +741,7 @@ class MockManager extends _i1.Mock implements _i13.Manager {
 /// A class which mocks [NodeService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNodeService extends _i1.Mock implements _i15.NodeService {
+class MockNodeService extends _i1.Mock implements _i14.NodeService {
   @override
   _i7.SecureStorageInterface get secureStorageInterface => (super.noSuchMethod(
         Invocation.getter(#secureStorageInterface),
@@ -747,15 +751,15 @@ class MockNodeService extends _i1.Mock implements _i15.NodeService {
         ),
       ) as _i7.SecureStorageInterface);
   @override
-  List<_i16.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i15.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i16.NodeModel>[],
-      ) as List<_i16.NodeModel>);
+        returnValue: <_i15.NodeModel>[],
+      ) as List<_i15.NodeModel>);
   @override
-  List<_i16.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i15.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i16.NodeModel>[],
-      ) as List<_i16.NodeModel>);
+        returnValue: <_i15.NodeModel>[],
+      ) as List<_i15.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -773,7 +777,7 @@ class MockNodeService extends _i1.Mock implements _i15.NodeService {
   @override
   _i9.Future<void> setPrimaryNodeFor({
     required _i11.Coin? coin,
-    required _i16.NodeModel? node,
+    required _i15.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -790,40 +794,40 @@ class MockNodeService extends _i1.Mock implements _i15.NodeService {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  _i16.NodeModel? getPrimaryNodeFor({required _i11.Coin? coin}) =>
+  _i15.NodeModel? getPrimaryNodeFor({required _i11.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i16.NodeModel?);
+      )) as _i15.NodeModel?);
   @override
-  List<_i16.NodeModel> getNodesFor(_i11.Coin? coin) => (super.noSuchMethod(
+  List<_i15.NodeModel> getNodesFor(_i11.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i16.NodeModel>[],
-      ) as List<_i16.NodeModel>);
+        returnValue: <_i15.NodeModel>[],
+      ) as List<_i15.NodeModel>);
   @override
-  _i16.NodeModel? getNodeById({required String? id}) =>
+  _i15.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i16.NodeModel?);
+      )) as _i15.NodeModel?);
   @override
-  List<_i16.NodeModel> failoverNodesFor({required _i11.Coin? coin}) =>
+  List<_i15.NodeModel> failoverNodesFor({required _i11.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i16.NodeModel>[],
-      ) as List<_i16.NodeModel>);
+        returnValue: <_i15.NodeModel>[],
+      ) as List<_i15.NodeModel>);
   @override
   _i9.Future<void> add(
-    _i16.NodeModel? node,
+    _i15.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -875,7 +879,7 @@ class MockNodeService extends _i1.Mock implements _i15.NodeService {
       ) as _i9.Future<void>);
   @override
   _i9.Future<void> edit(
-    _i16.NodeModel? editedNode,
+    _i15.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -901,7 +905,7 @@ class MockNodeService extends _i1.Mock implements _i15.NodeService {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -909,7 +913,7 @@ class MockNodeService extends _i1.Mock implements _i15.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/onboarding/verify_backup_key_view_screen_test.mocks.dart b/test/screen_tests/onboarding/verify_backup_key_view_screen_test.mocks.dart
index 0543f8e19..8c829f1fd 100644
--- a/test/screen_tests/onboarding/verify_backup_key_view_screen_test.mocks.dart
+++ b/test/screen_tests/onboarding/verify_backup_key_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/onboarding/verify_backup_key_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
@@ -219,6 +218,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -422,7 +426,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -430,7 +434,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.mocks.dart
index f336f7484..ff11120ac 100644
--- a/test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
@@ -219,6 +218,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -422,7 +426,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -430,7 +434,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.mocks.dart
index 57ce3c89c..74eae8db6 100644
--- a/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.mocks.dart
@@ -1,18 +1,17 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
-import 'dart:ui' as _i11;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i5;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i13;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i12;
 import 'package:stackduo/models/models.dart' as _i4;
 import 'package:stackduo/models/node_model.dart' as _i8;
 import 'package:stackduo/services/coins/coin_service.dart' as _i3;
-import 'package:stackduo/services/coins/manager.dart' as _i12;
+import 'package:stackduo/services/coins/manager.dart' as _i11;
 import 'package:stackduo/services/node_service.dart' as _i7;
 import 'package:stackduo/utilities/amount/amount.dart' as _i6;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i10;
@@ -249,7 +248,7 @@ class MockNodeService extends _i1.Mock implements _i7.NodeService {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -257,7 +256,7 @@ class MockNodeService extends _i1.Mock implements _i7.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -285,7 +284,7 @@ class MockNodeService extends _i1.Mock implements _i7.NodeService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i12.Manager {
+class MockManager extends _i1.Mock implements _i11.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -375,16 +374,16 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i9.Future<List<_i13.Transaction>> get transactions => (super.noSuchMethod(
+  _i9.Future<List<_i12.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i9.Future<List<_i13.Transaction>>.value(<_i13.Transaction>[]),
-      ) as _i9.Future<List<_i13.Transaction>>);
+            _i9.Future<List<_i12.Transaction>>.value(<_i12.Transaction>[]),
+      ) as _i9.Future<List<_i12.Transaction>>);
   @override
-  _i9.Future<List<_i13.UTXO>> get utxos => (super.noSuchMethod(
+  _i9.Future<List<_i12.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i9.Future<List<_i13.UTXO>>.value(<_i13.UTXO>[]),
-      ) as _i9.Future<List<_i13.UTXO>>);
+        returnValue: _i9.Future<List<_i12.UTXO>>.value(<_i12.UTXO>[]),
+      ) as _i9.Future<List<_i12.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -434,6 +433,11 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -637,7 +641,7 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -645,7 +649,7 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.mocks.dart
index b26913fc5..da3575947 100644
--- a/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.mocks.dart
@@ -1,18 +1,17 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i9;
-import 'dart:ui' as _i11;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i5;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i13;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i12;
 import 'package:stackduo/models/models.dart' as _i4;
 import 'package:stackduo/models/node_model.dart' as _i8;
 import 'package:stackduo/services/coins/coin_service.dart' as _i3;
-import 'package:stackduo/services/coins/manager.dart' as _i12;
+import 'package:stackduo/services/coins/manager.dart' as _i11;
 import 'package:stackduo/services/node_service.dart' as _i7;
 import 'package:stackduo/utilities/amount/amount.dart' as _i6;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i10;
@@ -249,7 +248,7 @@ class MockNodeService extends _i1.Mock implements _i7.NodeService {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -257,7 +256,7 @@ class MockNodeService extends _i1.Mock implements _i7.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -285,7 +284,7 @@ class MockNodeService extends _i1.Mock implements _i7.NodeService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i12.Manager {
+class MockManager extends _i1.Mock implements _i11.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -375,16 +374,16 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i9.Future<List<_i13.Transaction>> get transactions => (super.noSuchMethod(
+  _i9.Future<List<_i12.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i9.Future<List<_i13.Transaction>>.value(<_i13.Transaction>[]),
-      ) as _i9.Future<List<_i13.Transaction>>);
+            _i9.Future<List<_i12.Transaction>>.value(<_i12.Transaction>[]),
+      ) as _i9.Future<List<_i12.Transaction>>);
   @override
-  _i9.Future<List<_i13.UTXO>> get utxos => (super.noSuchMethod(
+  _i9.Future<List<_i12.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i9.Future<List<_i13.UTXO>>.value(<_i13.UTXO>[]),
-      ) as _i9.Future<List<_i13.UTXO>>);
+        returnValue: _i9.Future<List<_i12.UTXO>>.value(<_i12.UTXO>[]),
+      ) as _i9.Future<List<_i12.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -434,6 +433,11 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -637,7 +641,7 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValueForMissingStub: _i9.Future<void>.value(),
       ) as _i9.Future<void>);
   @override
-  void addListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -645,7 +649,7 @@ class MockManager extends _i1.Mock implements _i12.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i11.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/network_settings_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/network_settings_view_screen_test.mocks.dart
index 84bef5546..a2fb14c5d 100644
--- a/test/screen_tests/settings_view/settings_subviews/network_settings_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/network_settings_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_subviews/network_settings_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
-import 'dart:ui' as _i7;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/node_model.dart' as _i4;
@@ -202,7 +201,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i5.Future<void>.value(),
       ) as _i5.Future<void>);
   @override
-  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -210,7 +209,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.mocks.dart
index f003f64a3..12447d37a 100644
--- a/test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
@@ -219,6 +218,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -422,7 +426,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -430,7 +434,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/change_pin_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/change_pin_view_screen_test.mocks.dart
index 4ee0bcfc5..f4cb358fa 100644
--- a/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/change_pin_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/change_pin_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/change_pin_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
-import 'dart:ui' as _i5;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/services/wallets_service.dart' as _i2;
@@ -218,7 +217,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -226,7 +225,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rename_wallet_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rename_wallet_view_screen_test.mocks.dart
index 995809892..eb1987bd7 100644
--- a/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rename_wallet_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rename_wallet_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rename_wallet_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
-import 'dart:ui' as _i5;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/services/wallets_service.dart' as _i2;
@@ -218,7 +217,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: _i3.Future<void>.value(),
       ) as _i3.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -226,7 +225,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.mocks.dart
index 2c8a3e794..c32ecedb4 100644
--- a/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
@@ -219,6 +218,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -422,7 +426,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -430,7 +434,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.mocks.dart
index f4c82b201..1e9ebd946 100644
--- a/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.mocks.dart
@@ -1,17 +1,16 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
-import 'dart:ui' as _i9;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i11;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i10;
 import 'package:stackduo/models/models.dart' as _i3;
 import 'package:stackduo/services/coins/coin_service.dart' as _i2;
-import 'package:stackduo/services/coins/manager.dart' as _i10;
+import 'package:stackduo/services/coins/manager.dart' as _i9;
 import 'package:stackduo/services/wallets_service.dart' as _i6;
 import 'package:stackduo/utilities/amount/amount.dart' as _i5;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i8;
@@ -265,7 +264,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -273,7 +272,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -301,7 +300,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i10.Manager {
+class MockManager extends _i1.Mock implements _i9.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -391,16 +390,16 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         ),
       ) as _i4.Balance);
   @override
-  _i7.Future<List<_i11.Transaction>> get transactions => (super.noSuchMethod(
+  _i7.Future<List<_i10.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i7.Future<List<_i11.Transaction>>.value(<_i11.Transaction>[]),
-      ) as _i7.Future<List<_i11.Transaction>>);
+            _i7.Future<List<_i10.Transaction>>.value(<_i10.Transaction>[]),
+      ) as _i7.Future<List<_i10.Transaction>>);
   @override
-  _i7.Future<List<_i11.UTXO>> get utxos => (super.noSuchMethod(
+  _i7.Future<List<_i10.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i7.Future<List<_i11.UTXO>>.value(<_i11.UTXO>[]),
-      ) as _i7.Future<List<_i11.UTXO>>);
+        returnValue: _i7.Future<List<_i10.UTXO>>.value(<_i10.UTXO>[]),
+      ) as _i7.Future<List<_i10.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -450,6 +449,11 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -653,7 +657,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -661,7 +665,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
index df8c7958c..76cc99835 100644
--- a/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
@@ -1,25 +1,24 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.dart.
+// Mocks generated by Mockito 5.4.2 from annotations
+// in stackduo/test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i14;
 
 import 'package:local_auth/auth_strings.dart' as _i11;
 import 'package:local_auth/local_auth.dart' as _i10;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i7;
-import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i2;
-import 'package:stackwallet/models/balance.dart' as _i5;
-import 'package:stackwallet/models/isar/models/isar_models.dart' as _i16;
-import 'package:stackwallet/models/models.dart' as _i4;
-import 'package:stackwallet/services/coins/coin_service.dart' as _i3;
-import 'package:stackwallet/services/coins/manager.dart' as _i15;
-import 'package:stackwallet/services/wallets_service.dart' as _i13;
-import 'package:stackwallet/utilities/amount/amount.dart' as _i6;
-import 'package:stackwallet/utilities/biometrics.dart' as _i12;
-import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i9;
+import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i7;
+import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i2;
+import 'package:stackduo/models/balance.dart' as _i5;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i15;
+import 'package:stackduo/models/models.dart' as _i4;
+import 'package:stackduo/services/coins/coin_service.dart' as _i3;
+import 'package:stackduo/services/coins/manager.dart' as _i14;
+import 'package:stackduo/services/wallets_service.dart' as _i13;
+import 'package:stackduo/utilities/amount/amount.dart' as _i6;
+import 'package:stackduo/utilities/biometrics.dart' as _i12;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i9;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -501,7 +500,7 @@ class MockWalletsService extends _i1.Mock implements _i13.WalletsService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i14.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -509,7 +508,7 @@ class MockWalletsService extends _i1.Mock implements _i13.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i14.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -537,7 +536,7 @@ class MockWalletsService extends _i1.Mock implements _i13.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i15.Manager {
+class MockManager extends _i1.Mock implements _i14.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -627,16 +626,16 @@ class MockManager extends _i1.Mock implements _i15.Manager {
         ),
       ) as _i5.Balance);
   @override
-  _i8.Future<List<_i16.Transaction>> get transactions => (super.noSuchMethod(
+  _i8.Future<List<_i15.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i8.Future<List<_i16.Transaction>>.value(<_i16.Transaction>[]),
-      ) as _i8.Future<List<_i16.Transaction>>);
+            _i8.Future<List<_i15.Transaction>>.value(<_i15.Transaction>[]),
+      ) as _i8.Future<List<_i15.Transaction>>);
   @override
-  _i8.Future<List<_i16.UTXO>> get utxos => (super.noSuchMethod(
+  _i8.Future<List<_i15.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i8.Future<List<_i16.UTXO>>.value(<_i16.UTXO>[]),
-      ) as _i8.Future<List<_i16.UTXO>>);
+        returnValue: _i8.Future<List<_i15.UTXO>>.value(<_i15.UTXO>[]),
+      ) as _i8.Future<List<_i15.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -894,7 +893,7 @@ class MockManager extends _i1.Mock implements _i15.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i14.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -902,7 +901,7 @@ class MockManager extends _i1.Mock implements _i15.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i14.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/settings_view/settings_view_screen_test.mocks.dart b/test/screen_tests/settings_view/settings_view_screen_test.mocks.dart
index 9adc92a2c..3a2cbf82d 100644
--- a/test/screen_tests/settings_view/settings_view_screen_test.mocks.dart
+++ b/test/screen_tests/settings_view/settings_view_screen_test.mocks.dart
@@ -1,17 +1,16 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/settings_view/settings_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i7;
-import 'dart:ui' as _i9;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
-import 'package:stackduo/models/isar/models/isar_models.dart' as _i11;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i10;
 import 'package:stackduo/models/models.dart' as _i3;
 import 'package:stackduo/services/coins/coin_service.dart' as _i2;
-import 'package:stackduo/services/coins/manager.dart' as _i10;
+import 'package:stackduo/services/coins/manager.dart' as _i9;
 import 'package:stackduo/services/wallets_service.dart' as _i6;
 import 'package:stackduo/utilities/amount/amount.dart' as _i5;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i8;
@@ -265,7 +264,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -273,7 +272,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -301,7 +300,7 @@ class MockWalletsService extends _i1.Mock implements _i6.WalletsService {
 /// A class which mocks [Manager].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i10.Manager {
+class MockManager extends _i1.Mock implements _i9.Manager {
   @override
   bool get isActiveWallet => (super.noSuchMethod(
         Invocation.getter(#isActiveWallet),
@@ -391,16 +390,16 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         ),
       ) as _i4.Balance);
   @override
-  _i7.Future<List<_i11.Transaction>> get transactions => (super.noSuchMethod(
+  _i7.Future<List<_i10.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
         returnValue:
-            _i7.Future<List<_i11.Transaction>>.value(<_i11.Transaction>[]),
-      ) as _i7.Future<List<_i11.Transaction>>);
+            _i7.Future<List<_i10.Transaction>>.value(<_i10.Transaction>[]),
+      ) as _i7.Future<List<_i10.Transaction>>);
   @override
-  _i7.Future<List<_i11.UTXO>> get utxos => (super.noSuchMethod(
+  _i7.Future<List<_i10.UTXO>> get utxos => (super.noSuchMethod(
         Invocation.getter(#utxos),
-        returnValue: _i7.Future<List<_i11.UTXO>>.value(<_i11.UTXO>[]),
-      ) as _i7.Future<List<_i11.UTXO>>);
+        returnValue: _i7.Future<List<_i10.UTXO>>.value(<_i10.UTXO>[]),
+      ) as _i7.Future<List<_i10.UTXO>>);
   @override
   set walletName(String? newName) => super.noSuchMethod(
         Invocation.setter(
@@ -450,6 +449,11 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -653,7 +657,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: _i7.Future<void>.value(),
       ) as _i7.Future<void>);
   @override
-  void addListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -661,7 +665,7 @@ class MockManager extends _i1.Mock implements _i10.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i9.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/transaction_subviews/transaction_details_view_screen_test.mocks.dart b/test/screen_tests/transaction_subviews/transaction_details_view_screen_test.mocks.dart
index 22a63e60a..c67bf0e5e 100644
--- a/test/screen_tests/transaction_subviews/transaction_details_view_screen_test.mocks.dart
+++ b/test/screen_tests/transaction_subviews/transaction_details_view_screen_test.mocks.dart
@@ -1,15 +1,14 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/transaction_subviews/transaction_details_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
-import 'dart:ui' as _i5;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/isar/models/contact_entry.dart' as _i2;
-import 'package:stackduo/services/address_book_service.dart' as _i6;
-import 'package:stackduo/services/locale_service.dart' as _i7;
+import 'package:stackduo/services/address_book_service.dart' as _i5;
+import 'package:stackduo/services/locale_service.dart' as _i6;
 import 'package:stackduo/services/notes_service.dart' as _i3;
 
 // ignore_for_file: type=lint
@@ -102,7 +101,7 @@ class MockNotesService extends _i1.Mock implements _i3.NotesService {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -110,7 +109,7 @@ class MockNotesService extends _i1.Mock implements _i3.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -139,7 +138,7 @@ class MockNotesService extends _i1.Mock implements _i3.NotesService {
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockAddressBookService extends _i1.Mock
-    implements _i6.AddressBookService {
+    implements _i5.AddressBookService {
   @override
   List<_i2.ContactEntry> get contacts => (super.noSuchMethod(
         Invocation.getter(#contacts),
@@ -216,7 +215,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -224,7 +223,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -252,7 +251,7 @@ class MockAddressBookService extends _i1.Mock
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i7.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i6.LocaleService {
   @override
   String get locale => (super.noSuchMethod(
         Invocation.getter(#locale),
@@ -274,7 +273,7 @@ class MockLocaleService extends _i1.Mock implements _i7.LocaleService {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -282,7 +281,7 @@ class MockLocaleService extends _i1.Mock implements _i7.LocaleService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.mocks.dart b/test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.mocks.dart
index 865675c14..ab5382202 100644
--- a/test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.mocks.dart
+++ b/test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
@@ -12,8 +11,8 @@ import 'package:stackduo/models/isar/models/isar_models.dart' as _i9;
 import 'package:stackduo/models/models.dart' as _i3;
 import 'package:stackduo/services/coins/coin_service.dart' as _i2;
 import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/locale_service.dart' as _i12;
-import 'package:stackduo/services/notes_service.dart' as _i11;
+import 'package:stackduo/services/locale_service.dart' as _i11;
+import 'package:stackduo/services/notes_service.dart' as _i10;
 import 'package:stackduo/utilities/amount/amount.dart' as _i5;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i7;
 
@@ -221,6 +220,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -424,7 +428,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -432,7 +436,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -452,7 +456,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i11.NotesService {
+class MockNotesService extends _i1.Mock implements _i10.NotesService {
   @override
   String get walletId => (super.noSuchMethod(
         Invocation.getter(#walletId),
@@ -518,7 +522,7 @@ class MockNotesService extends _i1.Mock implements _i11.NotesService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -526,7 +530,7 @@ class MockNotesService extends _i1.Mock implements _i11.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -554,7 +558,7 @@ class MockNotesService extends _i1.Mock implements _i11.NotesService {
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i12.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i11.LocaleService {
   @override
   String get locale => (super.noSuchMethod(
         Invocation.getter(#locale),
@@ -576,7 +580,7 @@ class MockLocaleService extends _i1.Mock implements _i12.LocaleService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -584,7 +588,7 @@ class MockLocaleService extends _i1.Mock implements _i12.LocaleService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/transaction_subviews/transaction_search_view_screen_test.mocks.dart b/test/screen_tests/transaction_subviews/transaction_search_view_screen_test.mocks.dart
index 0b8520813..2cbcd57fe 100644
--- a/test/screen_tests/transaction_subviews/transaction_search_view_screen_test.mocks.dart
+++ b/test/screen_tests/transaction_subviews/transaction_search_view_screen_test.mocks.dart
@@ -1,15 +1,14 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/transaction_subviews/transaction_search_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
-import 'dart:ui' as _i5;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/isar/models/contact_entry.dart' as _i2;
 import 'package:stackduo/services/address_book_service.dart' as _i3;
-import 'package:stackduo/services/notes_service.dart' as _i6;
+import 'package:stackduo/services/notes_service.dart' as _i5;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -113,7 +112,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -121,7 +120,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -149,7 +148,7 @@ class MockAddressBookService extends _i1.Mock
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i6.NotesService {
+class MockNotesService extends _i1.Mock implements _i5.NotesService {
   @override
   String get walletId => (super.noSuchMethod(
         Invocation.getter(#walletId),
@@ -215,7 +214,7 @@ class MockNotesService extends _i1.Mock implements _i6.NotesService {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -223,7 +222,7 @@ class MockNotesService extends _i1.Mock implements _i6.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/wallet_view/confirm_send_view_screen_test.mocks.dart b/test/screen_tests/wallet_view/confirm_send_view_screen_test.mocks.dart
index 08d1ce9dd..5b874e20b 100644
--- a/test/screen_tests/wallet_view/confirm_send_view_screen_test.mocks.dart
+++ b/test/screen_tests/wallet_view/confirm_send_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/wallet_view/confirm_send_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
@@ -12,7 +11,7 @@ import 'package:stackduo/models/isar/models/isar_models.dart' as _i9;
 import 'package:stackduo/models/models.dart' as _i3;
 import 'package:stackduo/services/coins/coin_service.dart' as _i2;
 import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/notes_service.dart' as _i11;
+import 'package:stackduo/services/notes_service.dart' as _i10;
 import 'package:stackduo/utilities/amount/amount.dart' as _i5;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i7;
 
@@ -220,6 +219,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -423,7 +427,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -431,7 +435,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -451,7 +455,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i11.NotesService {
+class MockNotesService extends _i1.Mock implements _i10.NotesService {
   @override
   String get walletId => (super.noSuchMethod(
         Invocation.getter(#walletId),
@@ -517,7 +521,7 @@ class MockNotesService extends _i1.Mock implements _i11.NotesService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -525,7 +529,7 @@ class MockNotesService extends _i1.Mock implements _i11.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/wallet_view/receive_view_screen_test.mocks.dart b/test/screen_tests/wallet_view/receive_view_screen_test.mocks.dart
index 91c7e023c..5a7116c68 100644
--- a/test/screen_tests/wallet_view/receive_view_screen_test.mocks.dart
+++ b/test/screen_tests/wallet_view/receive_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/wallet_view/receive_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
@@ -219,6 +218,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -422,7 +426,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -430,7 +434,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/wallet_view/send_view_screen_test.mocks.dart b/test/screen_tests/wallet_view/send_view_screen_test.mocks.dart
index f6d4d33df..d62512015 100644
--- a/test/screen_tests/wallet_view/send_view_screen_test.mocks.dart
+++ b/test/screen_tests/wallet_view/send_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/wallet_view/send_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i12;
 
 import 'package:barcode_scan2/barcode_scan2.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
@@ -13,7 +12,7 @@ import 'package:stackduo/models/isar/models/isar_models.dart' as _i11;
 import 'package:stackduo/models/models.dart' as _i4;
 import 'package:stackduo/services/coins/coin_service.dart' as _i3;
 import 'package:stackduo/services/coins/manager.dart' as _i9;
-import 'package:stackduo/services/notes_service.dart' as _i13;
+import 'package:stackduo/services/notes_service.dart' as _i12;
 import 'package:stackduo/utilities/amount/amount.dart' as _i6;
 import 'package:stackduo/utilities/barcode_scanner_interface.dart' as _i7;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i10;
@@ -261,6 +260,11 @@ class MockManager extends _i1.Mock implements _i9.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -464,7 +468,7 @@ class MockManager extends _i1.Mock implements _i9.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -472,7 +476,7 @@ class MockManager extends _i1.Mock implements _i9.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -492,7 +496,7 @@ class MockManager extends _i1.Mock implements _i9.Manager {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i13.NotesService {
+class MockNotesService extends _i1.Mock implements _i12.NotesService {
   @override
   String get walletId => (super.noSuchMethod(
         Invocation.getter(#walletId),
@@ -558,7 +562,7 @@ class MockNotesService extends _i1.Mock implements _i13.NotesService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -566,7 +570,7 @@ class MockNotesService extends _i1.Mock implements _i13.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i12.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/screen_tests/wallet_view/wallet_view_screen_test.mocks.dart b/test/screen_tests/wallet_view/wallet_view_screen_test.mocks.dart
index f097be991..6ccae9c67 100644
--- a/test/screen_tests/wallet_view/wallet_view_screen_test.mocks.dart
+++ b/test/screen_tests/wallet_view/wallet_view_screen_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/screen_tests/wallet_view/wallet_view_screen_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i8;
-import 'dart:ui' as _i10;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/balance.dart' as _i4;
@@ -12,8 +11,8 @@ import 'package:stackduo/models/isar/models/isar_models.dart' as _i9;
 import 'package:stackduo/models/models.dart' as _i3;
 import 'package:stackduo/services/coins/coin_service.dart' as _i2;
 import 'package:stackduo/services/coins/manager.dart' as _i6;
-import 'package:stackduo/services/locale_service.dart' as _i12;
-import 'package:stackduo/services/notes_service.dart' as _i11;
+import 'package:stackduo/services/locale_service.dart' as _i11;
+import 'package:stackduo/services/notes_service.dart' as _i10;
 import 'package:stackduo/utilities/amount/amount.dart' as _i5;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i7;
 
@@ -221,6 +220,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -424,7 +428,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -432,7 +436,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -452,7 +456,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
 /// A class which mocks [NotesService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i11.NotesService {
+class MockNotesService extends _i1.Mock implements _i10.NotesService {
   @override
   String get walletId => (super.noSuchMethod(
         Invocation.getter(#walletId),
@@ -518,7 +522,7 @@ class MockNotesService extends _i1.Mock implements _i11.NotesService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -526,7 +530,7 @@ class MockNotesService extends _i1.Mock implements _i11.NotesService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -554,7 +558,7 @@ class MockNotesService extends _i1.Mock implements _i11.NotesService {
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i12.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i11.LocaleService {
   @override
   String get locale => (super.noSuchMethod(
         Invocation.getter(#locale),
@@ -576,7 +580,7 @@ class MockLocaleService extends _i1.Mock implements _i12.LocaleService {
         returnValueForMissingStub: _i8.Future<void>.value(),
       ) as _i8.Future<void>);
   @override
-  void addListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -584,7 +588,7 @@ class MockLocaleService extends _i1.Mock implements _i12.LocaleService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i10.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/services/change_now/change_now_test.mocks.dart b/test/services/change_now/change_now_test.mocks.dart
index 9251ea6eb..ac466dff9 100644
--- a/test/services/change_now/change_now_test.mocks.dart
+++ b/test/services/change_now/change_now_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/services/change_now/change_now_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart b/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart
index f88574029..36bed59f4 100644
--- a/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart
+++ b/test/services/coins/bitcoin/bitcoin_wallet_test.mocks.dart
@@ -1,5 +1,5 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/services/coins/bitcoin/bitcoin_wallet_test.dart.
+// Mocks generated by Mockito 5.4.2 from annotations
+// in stackduo/test/services/coins/bitcoin/bitcoin_wallet_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
@@ -7,11 +7,10 @@ import 'dart:async' as _i4;
 
 import 'package:decimal/decimal.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
-import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i3;
-import 'package:stackwallet/services/transaction_notification_tracker.dart'
-    as _i7;
-import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i6;
+import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i5;
+import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i3;
+import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i6;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
diff --git a/test/services/coins/manager_test.dart b/test/services/coins/manager_test.dart
index fcc246882..ffabd3916 100644
--- a/test/services/coins/manager_test.dart
+++ b/test/services/coins/manager_test.dart
@@ -1,352 +1,352 @@
-import 'package:decimal/decimal.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:stackwallet/electrumx_rpc/electrumx.dart';
-import 'package:stackwallet/models/balance.dart';
-import 'package:stackwallet/models/isar/models/isar_models.dart';
-import 'package:stackwallet/models/paymint/fee_object_model.dart';
-import 'package:stackwallet/services/coins/coin_service.dart';
-import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
-import 'package:stackwallet/services/coins/manager.dart';
-import 'package:stackwallet/utilities/amount/amount.dart';
-import 'package:stackwallet/utilities/enums/coin_enum.dart';
-
-import 'manager_test.mocks.dart';
-
-/// quick amount constructor wrapper. Using an int is bad practice but for
-/// testing with small amounts this should be fine
-Amount _a(int i) => Amount.fromDecimal(
-      Decimal.fromInt(i),
-      fractionDigits: 8,
-    );
-
-@GenerateMocks([FiroWallet, ElectrumX])
-void main() {
-  test("Manager should have a backgroundRefreshListener on initialization", () {
-    final manager = Manager(MockFiroWallet());
-
-    expect(manager.hasBackgroundRefreshListener, true);
-  });
-
-  test("get coin", () {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.coin).thenAnswer((_) => Coin.firo);
-    final manager = Manager(wallet);
-
-    expect(manager.coin, Coin.firo);
-  });
-
-  test("fees", () async {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.fees).thenAnswer((_) async => FeeObject(
-        fast: 10,
-        medium: 5,
-        slow: 1,
-        numberOfBlocksFast: 4,
-        numberOfBlocksSlow: 2,
-        numberOfBlocksAverage: 3));
-
-    final manager = Manager(wallet);
-
-    final feeObject = await manager.fees;
-
-    expect(feeObject.fast, 10);
-    expect(feeObject.medium, 5);
-    expect(feeObject.slow, 1);
-    expect(feeObject.numberOfBlocksFast, 4);
-    expect(feeObject.numberOfBlocksAverage, 3);
-    expect(feeObject.numberOfBlocksSlow, 2);
-  });
-
-  test("maxFee", () async {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.maxFee).thenAnswer((_) async => 10);
-
-    final manager = Manager(wallet);
-
-    final fee = await manager.maxFee;
-
-    expect(fee, 10);
-  });
-
-  test("get currentReceivingAddress", () async {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.currentReceivingAddress)
-        .thenAnswer((_) async => "Some address string");
-
-    final manager = Manager(wallet);
-
-    expect(await manager.currentReceivingAddress, "Some address string");
-  });
-
-  group("get balances", () {
-    test("balance", () async {
-      final CoinServiceAPI wallet = MockFiroWallet();
-      final balance = Balance(
-        total: _a(10),
-        spendable: _a(1),
-        blockedTotal: _a(0),
-        pendingSpendable: _a(9),
-      );
-
-      when(wallet.coin).thenAnswer((_) => Coin.firo);
-      when(wallet.balance).thenAnswer(
-        (_) => balance,
-      );
-
-      final manager = Manager(wallet);
-
-      expect(manager.balance, balance);
-    });
-  });
-
-  test("transactions", () async {
-    final CoinServiceAPI wallet = MockFiroWallet();
-
-    when(wallet.coin).thenAnswer((realInvocation) => Coin.firo);
-
-    final tx = Transaction(
-      walletId: "walletId",
-      txid: "txid",
-      timestamp: 6,
-      type: TransactionType.incoming,
-      subType: TransactionSubType.mint,
-      amount: 123,
-      amountString: Amount(
-        rawValue: BigInt.from(123),
-        fractionDigits: wallet.coin.decimals,
-      ).toJsonString(),
-      fee: 3,
-      height: 123,
-      isCancelled: false,
-      isLelantus: true,
-      slateId: null,
-      otherData: null,
-      nonce: null,
-      inputs: [],
-      outputs: [],
-      numberOfMessages: null,
-    );
-    when(wallet.transactions).thenAnswer((_) async => [
-          tx,
-        ]);
-
-    final manager = Manager(wallet);
-
-    final result = await manager.transactions;
-
-    expect(result.length, 1);
-
-    expect(result.first, tx);
-  });
-
-  test("refresh", () async {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.refresh()).thenAnswer((_) => Future(() => {}));
-
-    final manager = Manager(wallet);
-
-    await manager.refresh();
-
-    verify(wallet.refresh()).called(1);
-  });
-
-  test("get walletName", () {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.walletName).thenAnswer((_) => "Some wallet name");
-    final manager = Manager(wallet);
-
-    expect(manager.walletName, "Some wallet name");
-  });
-
-  test("get walletId", () {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.walletId).thenAnswer((_) => "Some wallet ID");
-
-    final manager = Manager(wallet);
-
-    expect(manager.walletId, "Some wallet ID");
-  });
-
-  group("validateAddress", () {
-    test("some valid address", () {
-      final CoinServiceAPI wallet = MockFiroWallet();
-      when(wallet.validateAddress("a valid address")).thenAnswer((_) => true);
-
-      final manager = Manager(wallet);
-
-      expect(manager.validateAddress("a valid address"), true);
-    });
-
-    test("some invalid address", () {
-      final CoinServiceAPI wallet = MockFiroWallet();
-      when(wallet.validateAddress("an invalid address"))
-          .thenAnswer((_) => false);
-
-      final manager = Manager(wallet);
-
-      expect(manager.validateAddress("an invalid address"), false);
-    });
-  });
-
-  test("get mnemonic", () async {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.mnemonic)
-        .thenAnswer((_) async => ["Some", "seed", "word", "list"]);
-
-    final manager = Manager(wallet);
-
-    expect(await manager.mnemonic, ["Some", "seed", "word", "list"]);
-  });
-
-  test("testNetworkConnection", () async {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.testNetworkConnection()).thenAnswer((_) async => true);
-
-    final manager = Manager(wallet);
-
-    expect(await manager.testNetworkConnection(), true);
-  });
-
-  group("recoverFromMnemonic", () {
-    test("successfully recover", () async {
-      final CoinServiceAPI wallet = MockFiroWallet();
-      when(wallet.recoverFromMnemonic(
-              mnemonic: "Some valid mnemonic",
-              maxUnusedAddressGap: 20,
-              maxNumberOfIndexesToCheck: 1000,
-              height: 0))
-          .thenAnswer((realInvocation) => Future(() => {}));
-
-      final manager = Manager(wallet);
-
-      await manager.recoverFromMnemonic(
-          mnemonic: "Some valid mnemonic",
-          maxUnusedAddressGap: 20,
-          maxNumberOfIndexesToCheck: 1000,
-          height: 0);
-
-      verify(wallet.recoverFromMnemonic(
-              mnemonic: "Some valid mnemonic",
-              maxUnusedAddressGap: 20,
-              maxNumberOfIndexesToCheck: 1000,
-              height: 0))
-          .called(1);
-    });
-
-    test("failed recovery", () async {
-      final CoinServiceAPI wallet = MockFiroWallet();
-      when(wallet.recoverFromMnemonic(
-              mnemonic: "Some invalid mnemonic",
-              maxUnusedAddressGap: 20,
-              maxNumberOfIndexesToCheck: 1000,
-              height: 0))
-          .thenThrow(Exception("Invalid mnemonic"));
-
-      final manager = Manager(wallet);
-
-      expect(
-          () => manager.recoverFromMnemonic(
-              mnemonic: "Some invalid mnemonic",
-              maxUnusedAddressGap: 20,
-              maxNumberOfIndexesToCheck: 1000,
-              height: 0),
-          throwsA(isA<Exception>()));
-
-      verify(wallet.recoverFromMnemonic(
-              mnemonic: "Some invalid mnemonic",
-              maxUnusedAddressGap: 20,
-              maxNumberOfIndexesToCheck: 1000,
-              height: 0))
-          .called(1);
-    });
-
-    test("failed recovery due to some other error", () async {
-      final CoinServiceAPI wallet = MockFiroWallet();
-      when(wallet.recoverFromMnemonic(
-              mnemonic: "Some valid mnemonic",
-              maxUnusedAddressGap: 20,
-              maxNumberOfIndexesToCheck: 1000,
-              height: 0))
-          .thenThrow(Error());
-
-      final manager = Manager(wallet);
-
-      expect(
-          () => manager.recoverFromMnemonic(
-              mnemonic: "Some valid mnemonic",
-              maxUnusedAddressGap: 20,
-              maxNumberOfIndexesToCheck: 1000,
-              height: 0),
-          throwsA(isA<Error>()));
-
-      verify(wallet.recoverFromMnemonic(
-              mnemonic: "Some valid mnemonic",
-              maxUnusedAddressGap: 20,
-              maxNumberOfIndexesToCheck: 1000,
-              height: 0))
-          .called(1);
-    });
-  });
-
-  test("exitCurrentWallet", () async {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
-    when(wallet.walletId).thenAnswer((realInvocation) => "some id");
-    when(wallet.walletName).thenAnswer((realInvocation) => "some name");
-
-    final manager = Manager(wallet);
-
-    await manager.exitCurrentWallet();
-
-    verify(wallet.exit()).called(1);
-    verify(wallet.walletName).called(1);
-    verify(wallet.walletId).called(1);
-
-    expect(manager.hasBackgroundRefreshListener, false);
-  });
-
-  test("dispose", () async {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
-    when(wallet.walletId).thenAnswer((realInvocation) => "some id");
-    when(wallet.walletName).thenAnswer((realInvocation) => "some name");
-
-    final manager = Manager(wallet);
-
-    expect(() => manager.dispose(), returnsNormally);
-  });
-
-  test("fullRescan succeeds", () {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.fullRescan(20, 1000)).thenAnswer((_) async {});
-
-    final manager = Manager(wallet);
-
-    expect(() => manager.fullRescan(20, 1000), returnsNormally);
-  });
-
-  test("fullRescan fails", () {
-    final CoinServiceAPI wallet = MockFiroWallet();
-    when(wallet.fullRescan(20, 1000)).thenThrow(Exception());
-
-    final manager = Manager(wallet);
-
-    expect(() => manager.fullRescan(20, 1000), throwsA(isA<Exception>()));
-  });
-
-  // test("act on event", () async {
-  //   final CoinServiceAPI wallet = MockFiroWallet();
-  //   when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
-  //
-  //   final manager = Manager(wallet);
-  //
-  //   expect(
-  //       () => GlobalEventBus.instance.fire(UpdatedInBackgroundEvent(
-  //           "act on event - test message", "wallet ID")),
-  //       returnsNormally);
-  //
-  //   expect(() => manager.dispose(), returnsNormally);
-  // });
-}
+// import 'package:decimal/decimal.dart';
+// import 'package:flutter_test/flutter_test.dart';
+// import 'package:mockito/annotations.dart';
+// import 'package:mockito/mockito.dart';
+// import 'package:stackwallet/electrumx_rpc/electrumx.dart';
+// import 'package:stackwallet/models/balance.dart';
+// import 'package:stackwallet/models/isar/models/isar_models.dart';
+// import 'package:stackwallet/models/paymint/fee_object_model.dart';
+// import 'package:stackwallet/services/coins/coin_service.dart';
+// import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
+// import 'package:stackwallet/services/coins/manager.dart';
+// import 'package:stackwallet/utilities/amount/amount.dart';
+// import 'package:stackwallet/utilities/enums/coin_enum.dart';
+//
+// import 'manager_test.mocks.dart';
+//
+// /// quick amount constructor wrapper. Using an int is bad practice but for
+// /// testing with small amounts this should be fine
+// Amount _a(int i) => Amount.fromDecimal(
+//       Decimal.fromInt(i),
+//       fractionDigits: 8,
+//     );
+//
+// @GenerateMocks([FiroWallet, ElectrumX])
+// void main() {
+//   test("Manager should have a backgroundRefreshListener on initialization", () {
+//     final manager = Manager(MockFiroWallet());
+//
+//     expect(manager.hasBackgroundRefreshListener, true);
+//   });
+//
+//   test("get coin", () {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.coin).thenAnswer((_) => Coin.firo);
+//     final manager = Manager(wallet);
+//
+//     expect(manager.coin, Coin.firo);
+//   });
+//
+//   test("fees", () async {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.fees).thenAnswer((_) async => FeeObject(
+//         fast: 10,
+//         medium: 5,
+//         slow: 1,
+//         numberOfBlocksFast: 4,
+//         numberOfBlocksSlow: 2,
+//         numberOfBlocksAverage: 3));
+//
+//     final manager = Manager(wallet);
+//
+//     final feeObject = await manager.fees;
+//
+//     expect(feeObject.fast, 10);
+//     expect(feeObject.medium, 5);
+//     expect(feeObject.slow, 1);
+//     expect(feeObject.numberOfBlocksFast, 4);
+//     expect(feeObject.numberOfBlocksAverage, 3);
+//     expect(feeObject.numberOfBlocksSlow, 2);
+//   });
+//
+//   test("maxFee", () async {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.maxFee).thenAnswer((_) async => 10);
+//
+//     final manager = Manager(wallet);
+//
+//     final fee = await manager.maxFee;
+//
+//     expect(fee, 10);
+//   });
+//
+//   test("get currentReceivingAddress", () async {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.currentReceivingAddress)
+//         .thenAnswer((_) async => "Some address string");
+//
+//     final manager = Manager(wallet);
+//
+//     expect(await manager.currentReceivingAddress, "Some address string");
+//   });
+//
+//   group("get balances", () {
+//     test("balance", () async {
+//       final CoinServiceAPI wallet = MockFiroWallet();
+//       final balance = Balance(
+//         total: _a(10),
+//         spendable: _a(1),
+//         blockedTotal: _a(0),
+//         pendingSpendable: _a(9),
+//       );
+//
+//       when(wallet.coin).thenAnswer((_) => Coin.firo);
+//       when(wallet.balance).thenAnswer(
+//         (_) => balance,
+//       );
+//
+//       final manager = Manager(wallet);
+//
+//       expect(manager.balance, balance);
+//     });
+//   });
+//
+//   test("transactions", () async {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//
+//     when(wallet.coin).thenAnswer((realInvocation) => Coin.firo);
+//
+//     final tx = Transaction(
+//       walletId: "walletId",
+//       txid: "txid",
+//       timestamp: 6,
+//       type: TransactionType.incoming,
+//       subType: TransactionSubType.mint,
+//       amount: 123,
+//       amountString: Amount(
+//         rawValue: BigInt.from(123),
+//         fractionDigits: wallet.coin.decimals,
+//       ).toJsonString(),
+//       fee: 3,
+//       height: 123,
+//       isCancelled: false,
+//       isLelantus: true,
+//       slateId: null,
+//       otherData: null,
+//       nonce: null,
+//       inputs: [],
+//       outputs: [],
+//       numberOfMessages: null,
+//     );
+//     when(wallet.transactions).thenAnswer((_) async => [
+//           tx,
+//         ]);
+//
+//     final manager = Manager(wallet);
+//
+//     final result = await manager.transactions;
+//
+//     expect(result.length, 1);
+//
+//     expect(result.first, tx);
+//   });
+//
+//   test("refresh", () async {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.refresh()).thenAnswer((_) => Future(() => {}));
+//
+//     final manager = Manager(wallet);
+//
+//     await manager.refresh();
+//
+//     verify(wallet.refresh()).called(1);
+//   });
+//
+//   test("get walletName", () {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.walletName).thenAnswer((_) => "Some wallet name");
+//     final manager = Manager(wallet);
+//
+//     expect(manager.walletName, "Some wallet name");
+//   });
+//
+//   test("get walletId", () {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.walletId).thenAnswer((_) => "Some wallet ID");
+//
+//     final manager = Manager(wallet);
+//
+//     expect(manager.walletId, "Some wallet ID");
+//   });
+//
+//   group("validateAddress", () {
+//     test("some valid address", () {
+//       final CoinServiceAPI wallet = MockFiroWallet();
+//       when(wallet.validateAddress("a valid address")).thenAnswer((_) => true);
+//
+//       final manager = Manager(wallet);
+//
+//       expect(manager.validateAddress("a valid address"), true);
+//     });
+//
+//     test("some invalid address", () {
+//       final CoinServiceAPI wallet = MockFiroWallet();
+//       when(wallet.validateAddress("an invalid address"))
+//           .thenAnswer((_) => false);
+//
+//       final manager = Manager(wallet);
+//
+//       expect(manager.validateAddress("an invalid address"), false);
+//     });
+//   });
+//
+//   test("get mnemonic", () async {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.mnemonic)
+//         .thenAnswer((_) async => ["Some", "seed", "word", "list"]);
+//
+//     final manager = Manager(wallet);
+//
+//     expect(await manager.mnemonic, ["Some", "seed", "word", "list"]);
+//   });
+//
+//   test("testNetworkConnection", () async {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.testNetworkConnection()).thenAnswer((_) async => true);
+//
+//     final manager = Manager(wallet);
+//
+//     expect(await manager.testNetworkConnection(), true);
+//   });
+//
+//   group("recoverFromMnemonic", () {
+//     test("successfully recover", () async {
+//       final CoinServiceAPI wallet = MockFiroWallet();
+//       when(wallet.recoverFromMnemonic(
+//               mnemonic: "Some valid mnemonic",
+//               maxUnusedAddressGap: 20,
+//               maxNumberOfIndexesToCheck: 1000,
+//               height: 0))
+//           .thenAnswer((realInvocation) => Future(() => {}));
+//
+//       final manager = Manager(wallet);
+//
+//       await manager.recoverFromMnemonic(
+//           mnemonic: "Some valid mnemonic",
+//           maxUnusedAddressGap: 20,
+//           maxNumberOfIndexesToCheck: 1000,
+//           height: 0);
+//
+//       verify(wallet.recoverFromMnemonic(
+//               mnemonic: "Some valid mnemonic",
+//               maxUnusedAddressGap: 20,
+//               maxNumberOfIndexesToCheck: 1000,
+//               height: 0))
+//           .called(1);
+//     });
+//
+//     test("failed recovery", () async {
+//       final CoinServiceAPI wallet = MockFiroWallet();
+//       when(wallet.recoverFromMnemonic(
+//               mnemonic: "Some invalid mnemonic",
+//               maxUnusedAddressGap: 20,
+//               maxNumberOfIndexesToCheck: 1000,
+//               height: 0))
+//           .thenThrow(Exception("Invalid mnemonic"));
+//
+//       final manager = Manager(wallet);
+//
+//       expect(
+//           () => manager.recoverFromMnemonic(
+//               mnemonic: "Some invalid mnemonic",
+//               maxUnusedAddressGap: 20,
+//               maxNumberOfIndexesToCheck: 1000,
+//               height: 0),
+//           throwsA(isA<Exception>()));
+//
+//       verify(wallet.recoverFromMnemonic(
+//               mnemonic: "Some invalid mnemonic",
+//               maxUnusedAddressGap: 20,
+//               maxNumberOfIndexesToCheck: 1000,
+//               height: 0))
+//           .called(1);
+//     });
+//
+//     test("failed recovery due to some other error", () async {
+//       final CoinServiceAPI wallet = MockFiroWallet();
+//       when(wallet.recoverFromMnemonic(
+//               mnemonic: "Some valid mnemonic",
+//               maxUnusedAddressGap: 20,
+//               maxNumberOfIndexesToCheck: 1000,
+//               height: 0))
+//           .thenThrow(Error());
+//
+//       final manager = Manager(wallet);
+//
+//       expect(
+//           () => manager.recoverFromMnemonic(
+//               mnemonic: "Some valid mnemonic",
+//               maxUnusedAddressGap: 20,
+//               maxNumberOfIndexesToCheck: 1000,
+//               height: 0),
+//           throwsA(isA<Error>()));
+//
+//       verify(wallet.recoverFromMnemonic(
+//               mnemonic: "Some valid mnemonic",
+//               maxUnusedAddressGap: 20,
+//               maxNumberOfIndexesToCheck: 1000,
+//               height: 0))
+//           .called(1);
+//     });
+//   });
+//
+//   test("exitCurrentWallet", () async {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
+//     when(wallet.walletId).thenAnswer((realInvocation) => "some id");
+//     when(wallet.walletName).thenAnswer((realInvocation) => "some name");
+//
+//     final manager = Manager(wallet);
+//
+//     await manager.exitCurrentWallet();
+//
+//     verify(wallet.exit()).called(1);
+//     verify(wallet.walletName).called(1);
+//     verify(wallet.walletId).called(1);
+//
+//     expect(manager.hasBackgroundRefreshListener, false);
+//   });
+//
+//   test("dispose", () async {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
+//     when(wallet.walletId).thenAnswer((realInvocation) => "some id");
+//     when(wallet.walletName).thenAnswer((realInvocation) => "some name");
+//
+//     final manager = Manager(wallet);
+//
+//     expect(() => manager.dispose(), returnsNormally);
+//   });
+//
+//   test("fullRescan succeeds", () {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.fullRescan(20, 1000)).thenAnswer((_) async {});
+//
+//     final manager = Manager(wallet);
+//
+//     expect(() => manager.fullRescan(20, 1000), returnsNormally);
+//   });
+//
+//   test("fullRescan fails", () {
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//     when(wallet.fullRescan(20, 1000)).thenThrow(Exception());
+//
+//     final manager = Manager(wallet);
+//
+//     expect(() => manager.fullRescan(20, 1000), throwsA(isA<Exception>()));
+//   });
+//
+//   // test("act on event", () async {
+//   //   final CoinServiceAPI wallet = MockFiroWallet();
+//   //   when(wallet.exit()).thenAnswer((realInvocation) => Future(() => {}));
+//   //
+//   //   final manager = Manager(wallet);
+//   //
+//   //   expect(
+//   //       () => GlobalEventBus.instance.fire(UpdatedInBackgroundEvent(
+//   //           "act on event - test message", "wallet ID")),
+//   //       returnsNormally);
+//   //
+//   //   expect(() => manager.dispose(), returnsNormally);
+//   // });
+// }
diff --git a/test/services/coins/manager_test.mocks.dart b/test/services/coins/manager_test.mocks.dart
deleted file mode 100644
index 821da6efc..000000000
--- a/test/services/coins/manager_test.mocks.dart
+++ /dev/null
@@ -1,1456 +0,0 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/services/coins/manager_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i11;
-
-import 'package:decimal/decimal.dart' as _i9;
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i7;
-import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i5;
-import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i4;
-import 'package:stackwallet/models/balance.dart' as _i6;
-import 'package:stackwallet/models/isar/models/isar_models.dart' as _i13;
-import 'package:stackwallet/models/lelantus_coin.dart' as _i15;
-import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i3;
-import 'package:stackwallet/models/signing_data.dart' as _i14;
-import 'package:stackwallet/services/coins/firo/firo_wallet.dart' as _i10;
-import 'package:stackwallet/services/transaction_notification_tracker.dart'
-    as _i2;
-import 'package:stackwallet/utilities/amount/amount.dart' as _i8;
-import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i12;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeTransactionNotificationTracker_0 extends _i1.SmartFake
-    implements _i2.TransactionNotificationTracker {
-  _FakeTransactionNotificationTracker_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeFeeObject_1 extends _i1.SmartFake implements _i3.FeeObject {
-  _FakeFeeObject_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeElectrumX_2 extends _i1.SmartFake implements _i4.ElectrumX {
-  _FakeElectrumX_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeCachedElectrumX_3 extends _i1.SmartFake
-    implements _i5.CachedElectrumX {
-  _FakeCachedElectrumX_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeBalance_4 extends _i1.SmartFake implements _i6.Balance {
-  _FakeBalance_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeMainDB_5 extends _i1.SmartFake implements _i7.MainDB {
-  _FakeMainDB_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeAmount_6 extends _i1.SmartFake implements _i8.Amount {
-  _FakeAmount_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeDecimal_7 extends _i1.SmartFake implements _i9.Decimal {
-  _FakeDecimal_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [FiroWallet].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockFiroWallet extends _i1.Mock implements _i10.FiroWallet {
-  MockFiroWallet() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  set timer(_i11.Timer? _timer) => super.noSuchMethod(
-        Invocation.setter(
-          #timer,
-          _timer,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i2.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
-        Invocation.getter(#txTracker),
-        returnValue: _FakeTransactionNotificationTracker_0(
-          this,
-          Invocation.getter(#txTracker),
-        ),
-      ) as _i2.TransactionNotificationTracker);
-  @override
-  set txTracker(_i2.TransactionNotificationTracker? _txTracker) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #txTracker,
-          _txTracker,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get refreshMutex => (super.noSuchMethod(
-        Invocation.getter(#refreshMutex),
-        returnValue: false,
-      ) as bool);
-  @override
-  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
-        Invocation.setter(
-          #refreshMutex,
-          _refreshMutex,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get longMutex => (super.noSuchMethod(
-        Invocation.getter(#longMutex),
-        returnValue: false,
-      ) as bool);
-  @override
-  set longMutex(bool? _longMutex) => super.noSuchMethod(
-        Invocation.setter(
-          #longMutex,
-          _longMutex,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isActive => (super.noSuchMethod(
-        Invocation.getter(#isActive),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isActive(bool? _isActive) => super.noSuchMethod(
-        Invocation.setter(
-          #isActive,
-          _isActive,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get shouldAutoSync => (super.noSuchMethod(
-        Invocation.getter(#shouldAutoSync),
-        returnValue: false,
-      ) as bool);
-  @override
-  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
-        Invocation.setter(
-          #shouldAutoSync,
-          shouldAutoSync,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set isFavorite(bool? markFavorite) => super.noSuchMethod(
-        Invocation.setter(
-          #isFavorite,
-          markFavorite,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isFavorite => (super.noSuchMethod(
-        Invocation.getter(#isFavorite),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i12.Coin get coin => (super.noSuchMethod(
-        Invocation.getter(#coin),
-        returnValue: _i12.Coin.bitcoin,
-      ) as _i12.Coin);
-  @override
-  _i11.Future<List<String>> get mnemonic => (super.noSuchMethod(
-        Invocation.getter(#mnemonic),
-        returnValue: _i11.Future<List<String>>.value(<String>[]),
-      ) as _i11.Future<List<String>>);
-  @override
-  _i11.Future<String?> get mnemonicString => (super.noSuchMethod(
-        Invocation.getter(#mnemonicString),
-        returnValue: _i11.Future<String?>.value(),
-      ) as _i11.Future<String?>);
-  @override
-  _i11.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
-        Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i11.Future<String?>.value(),
-      ) as _i11.Future<String?>);
-  @override
-  _i11.Future<int> get maxFee => (super.noSuchMethod(
-        Invocation.getter(#maxFee),
-        returnValue: _i11.Future<int>.value(0),
-      ) as _i11.Future<int>);
-  @override
-  _i11.Future<_i3.FeeObject> get fees => (super.noSuchMethod(
-        Invocation.getter(#fees),
-        returnValue: _i11.Future<_i3.FeeObject>.value(_FakeFeeObject_1(
-          this,
-          Invocation.getter(#fees),
-        )),
-      ) as _i11.Future<_i3.FeeObject>);
-  @override
-  _i11.Future<String> get currentReceivingAddress => (super.noSuchMethod(
-        Invocation.getter(#currentReceivingAddress),
-        returnValue: _i11.Future<String>.value(''),
-      ) as _i11.Future<String>);
-  @override
-  _i11.Future<String> get currentChangeAddress => (super.noSuchMethod(
-        Invocation.getter(#currentChangeAddress),
-        returnValue: _i11.Future<String>.value(''),
-      ) as _i11.Future<String>);
-  @override
-  String get walletName => (super.noSuchMethod(
-        Invocation.getter(#walletName),
-        returnValue: '',
-      ) as String);
-  @override
-  set walletName(String? newName) => super.noSuchMethod(
-        Invocation.setter(
-          #walletName,
-          newName,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
-  @override
-  bool get isConnected => (super.noSuchMethod(
-        Invocation.getter(#isConnected),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i4.ElectrumX get electrumXClient => (super.noSuchMethod(
-        Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_2(
-          this,
-          Invocation.getter(#electrumXClient),
-        ),
-      ) as _i4.ElectrumX);
-  @override
-  _i5.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
-        Invocation.getter(#cachedElectrumXClient),
-        returnValue: _FakeCachedElectrumX_3(
-          this,
-          Invocation.getter(#cachedElectrumXClient),
-        ),
-      ) as _i5.CachedElectrumX);
-  @override
-  bool get isRefreshing => (super.noSuchMethod(
-        Invocation.getter(#isRefreshing),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get hasCalledExit => (super.noSuchMethod(
-        Invocation.getter(#hasCalledExit),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i11.Future<int> get chainHeight => (super.noSuchMethod(
-        Invocation.getter(#chainHeight),
-        returnValue: _i11.Future<int>.value(0),
-      ) as _i11.Future<int>);
-  @override
-  int get storedChainHeight => (super.noSuchMethod(
-        Invocation.getter(#storedChainHeight),
-        returnValue: 0,
-      ) as int);
-  @override
-  _i6.Balance get balance => (super.noSuchMethod(
-        Invocation.getter(#balance),
-        returnValue: _FakeBalance_4(
-          this,
-          Invocation.getter(#balance),
-        ),
-      ) as _i6.Balance);
-  @override
-  _i6.Balance get balancePrivate => (super.noSuchMethod(
-        Invocation.getter(#balancePrivate),
-        returnValue: _FakeBalance_4(
-          this,
-          Invocation.getter(#balancePrivate),
-        ),
-      ) as _i6.Balance);
-  @override
-  _i11.Future<List<_i13.UTXO>> get utxos => (super.noSuchMethod(
-        Invocation.getter(#utxos),
-        returnValue: _i11.Future<List<_i13.UTXO>>.value(<_i13.UTXO>[]),
-      ) as _i11.Future<List<_i13.UTXO>>);
-  @override
-  _i11.Future<List<_i13.Transaction>> get transactions => (super.noSuchMethod(
-        Invocation.getter(#transactions),
-        returnValue:
-            _i11.Future<List<_i13.Transaction>>.value(<_i13.Transaction>[]),
-      ) as _i11.Future<List<_i13.Transaction>>);
-  @override
-  _i11.Future<String> get xpub => (super.noSuchMethod(
-        Invocation.getter(#xpub),
-        returnValue: _i11.Future<String>.value(''),
-      ) as _i11.Future<String>);
-  @override
-  set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #onIsActiveWalletChanged,
-          _onIsActiveWalletChanged,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i7.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_5(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i7.MainDB);
-  @override
-  bool validateAddress(String? address) => (super.noSuchMethod(
-        Invocation.method(
-          #validateAddress,
-          [address],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i11.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateSentCachedTxData,
-          [txData],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<bool> testNetworkConnection() => (super.noSuchMethod(
-        Invocation.method(
-          #testNetworkConnection,
-          [],
-        ),
-        returnValue: _i11.Future<bool>.value(false),
-      ) as _i11.Future<bool>);
-  @override
-  void startNetworkAlivePinging() => super.noSuchMethod(
-        Invocation.method(
-          #startNetworkAlivePinging,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void stopNetworkAlivePinging() => super.noSuchMethod(
-        Invocation.method(
-          #stopNetworkAlivePinging,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i11.Future<Map<String, dynamic>> prepareSendPublic({
-    required String? address,
-    required _i8.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareSendPublic,
-          [],
-          {
-            #address: address,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<String> confirmSendPublic({dynamic txData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #confirmSendPublic,
-          [],
-          {#txData: txData},
-        ),
-        returnValue: _i11.Future<String>.value(''),
-      ) as _i11.Future<String>);
-  @override
-  _i11.Future<Map<String, dynamic>> prepareSend({
-    required String? address,
-    required _i8.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareSend,
-          [],
-          {
-            #address: address,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #confirmSend,
-          [],
-          {#txData: txData},
-        ),
-        returnValue: _i11.Future<String>.value(''),
-      ) as _i11.Future<String>);
-  @override
-  int estimateTxFee({
-    required int? vSize,
-    required int? feeRatePerKB,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateTxFee,
-          [],
-          {
-            #vSize: vSize,
-            #feeRatePerKB: feeRatePerKB,
-          },
-        ),
-        returnValue: 0,
-      ) as int);
-  @override
-  dynamic coinSelection(
-    int? satoshiAmountToSend,
-    int? selectedTxFeeRate,
-    String? _recipientAddress,
-    bool? isSendAll, {
-    int? additionalOutputs = 0,
-    List<_i13.UTXO>? utxos,
-  }) =>
-      super.noSuchMethod(Invocation.method(
-        #coinSelection,
-        [
-          satoshiAmountToSend,
-          selectedTxFeeRate,
-          _recipientAddress,
-          isSendAll,
-        ],
-        {
-          #additionalOutputs: additionalOutputs,
-          #utxos: utxos,
-        },
-      ));
-  @override
-  _i11.Future<List<_i14.SigningData>> fetchBuildTxData(
-          List<_i13.UTXO>? utxosToUse) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchBuildTxData,
-          [utxosToUse],
-        ),
-        returnValue:
-            _i11.Future<List<_i14.SigningData>>.value(<_i14.SigningData>[]),
-      ) as _i11.Future<List<_i14.SigningData>>);
-  @override
-  _i11.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i14.SigningData>? utxoSigningData,
-    required List<String>? recipients,
-    required List<int>? satoshiAmounts,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #buildTransaction,
-          [],
-          {
-            #utxoSigningData: utxoSigningData,
-            #recipients: recipients,
-            #satoshiAmounts: satoshiAmounts,
-          },
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
-        Invocation.method(
-          #updateNode,
-          [shouldRefresh],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<void> initializeNew() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeNew,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<void> initializeExisting() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeExisting,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
-        Invocation.method(
-          #refreshIfThereIsNewData,
-          [],
-        ),
-        returnValue: _i11.Future<bool>.value(false),
-      ) as _i11.Future<bool>);
-  @override
-  _i11.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
-        Invocation.method(
-          #getAllTxsToWatch,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<void> refresh() => (super.noSuchMethod(
-        Invocation.method(
-          #refresh,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  List<Map<dynamic, _i15.LelantusCoin>> getLelantusCoinMap() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getLelantusCoinMap,
-          [],
-        ),
-        returnValue: <Map<dynamic, _i15.LelantusCoin>>[],
-      ) as List<Map<dynamic, _i15.LelantusCoin>>);
-  @override
-  _i11.Future<void> anonymizeAllPublicFunds() => (super.noSuchMethod(
-        Invocation.method(
-          #anonymizeAllPublicFunds,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<List<Map<String, dynamic>>> createMintsFromAmount(int? total) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #createMintsFromAmount,
-          [total],
-        ),
-        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i11.Future<List<Map<String, dynamic>>>);
-  @override
-  _i11.Future<String> submitHexToNetwork(String? hex) => (super.noSuchMethod(
-        Invocation.method(
-          #submitHexToNetwork,
-          [hex],
-        ),
-        returnValue: _i11.Future<String>.value(''),
-      ) as _i11.Future<String>);
-  @override
-  _i11.Future<Map<String, dynamic>> buildMintTransaction(
-    List<_i13.UTXO>? utxosToUse,
-    int? satoshisPerRecipient,
-    List<Map<String, dynamic>>? mintsMap,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #buildMintTransaction,
-          [
-            utxosToUse,
-            satoshisPerRecipient,
-            mintsMap,
-          ],
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<void> checkReceivingAddressForTransactions() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkReceivingAddressForTransactions,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<void> checkChangeAddressForTransactions() => (super.noSuchMethod(
-        Invocation.method(
-          #checkChangeAddressForTransactions,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<void> fullRescan(
-    int? maxUnusedAddressGap,
-    int? maxNumberOfIndexesToCheck,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fullRescan,
-          [
-            maxUnusedAddressGap,
-            maxNumberOfIndexesToCheck,
-          ],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<void> recoverFromMnemonic({
-    required String? mnemonic,
-    String? mnemonicPassphrase,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required int? height,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #recoverFromMnemonic,
-          [],
-          {
-            #mnemonic: mnemonic,
-            #mnemonicPassphrase: mnemonicPassphrase,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #height: height,
-          },
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<Map<int, dynamic>> getSetDataMap(int? latestSetId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getSetDataMap,
-          [latestSetId],
-        ),
-        returnValue: _i11.Future<Map<int, dynamic>>.value(<int, dynamic>{}),
-      ) as _i11.Future<Map<int, dynamic>>);
-  @override
-  _i11.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getTransactionCacheEarly,
-          [allAddresses],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<List<Map<String, dynamic>>> fetchAnonymitySets() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAnonymitySets,
-          [],
-        ),
-        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i11.Future<List<Map<String, dynamic>>>);
-  @override
-  _i11.Future<int> getLatestSetId() => (super.noSuchMethod(
-        Invocation.method(
-          #getLatestSetId,
-          [],
-        ),
-        returnValue: _i11.Future<int>.value(0),
-      ) as _i11.Future<int>);
-  @override
-  _i11.Future<List<String>> getUsedCoinSerials() => (super.noSuchMethod(
-        Invocation.method(
-          #getUsedCoinSerials,
-          [],
-        ),
-        returnValue: _i11.Future<List<String>>.value(<String>[]),
-      ) as _i11.Future<List<String>>);
-  @override
-  _i11.Future<void> exit() => (super.noSuchMethod(
-        Invocation.method(
-          #exit,
-          [],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<dynamic> getCoinsToJoinSplit(int? required) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getCoinsToJoinSplit,
-          [required],
-        ),
-        returnValue: _i11.Future<dynamic>.value(),
-      ) as _i11.Future<dynamic>);
-  @override
-  _i11.Future<int> estimateJoinSplitFee(int? spendAmount) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateJoinSplitFee,
-          [spendAmount],
-        ),
-        returnValue: _i11.Future<int>.value(0),
-      ) as _i11.Future<int>);
-  @override
-  _i11.Future<_i8.Amount> estimateFeeFor(
-    _i8.Amount? amount,
-    int? feeRate,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFeeFor,
-          [
-            amount,
-            feeRate,
-          ],
-        ),
-        returnValue: _i11.Future<_i8.Amount>.value(_FakeAmount_6(
-          this,
-          Invocation.method(
-            #estimateFeeFor,
-            [
-              amount,
-              feeRate,
-            ],
-          ),
-        )),
-      ) as _i11.Future<_i8.Amount>);
-  @override
-  _i11.Future<_i8.Amount> estimateFeeForPublic(
-    _i8.Amount? amount,
-    int? feeRate,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFeeForPublic,
-          [
-            amount,
-            feeRate,
-          ],
-        ),
-        returnValue: _i11.Future<_i8.Amount>.value(_FakeAmount_6(
-          this,
-          Invocation.method(
-            #estimateFeeForPublic,
-            [
-              amount,
-              feeRate,
-            ],
-          ),
-        )),
-      ) as _i11.Future<_i8.Amount>);
-  @override
-  _i8.Amount roughFeeEstimate(
-    int? inputCount,
-    int? outputCount,
-    int? feeRatePerKB,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #roughFeeEstimate,
-          [
-            inputCount,
-            outputCount,
-            feeRatePerKB,
-          ],
-        ),
-        returnValue: _FakeAmount_6(
-          this,
-          Invocation.method(
-            #roughFeeEstimate,
-            [
-              inputCount,
-              outputCount,
-              feeRatePerKB,
-            ],
-          ),
-        ),
-      ) as _i8.Amount);
-  @override
-  _i11.Future<_i8.Amount> sweepAllEstimate(int? feeRate) => (super.noSuchMethod(
-        Invocation.method(
-          #sweepAllEstimate,
-          [feeRate],
-        ),
-        returnValue: _i11.Future<_i8.Amount>.value(_FakeAmount_6(
-          this,
-          Invocation.method(
-            #sweepAllEstimate,
-            [feeRate],
-          ),
-        )),
-      ) as _i11.Future<_i8.Amount>);
-  @override
-  _i11.Future<List<Map<String, dynamic>>> fastFetch(
-          List<String>? allTxHashes) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fastFetch,
-          [allTxHashes],
-        ),
-        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i11.Future<List<Map<String, dynamic>>>);
-  @override
-  _i11.Future<Map<_i13.Address, _i13.Transaction>> getJMintTransactions(
-    _i5.CachedElectrumX? cachedClient,
-    List<String>? transactions,
-    _i12.Coin? coin,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getJMintTransactions,
-          [
-            cachedClient,
-            transactions,
-            coin,
-          ],
-        ),
-        returnValue: _i11.Future<Map<_i13.Address, _i13.Transaction>>.value(
-            <_i13.Address, _i13.Transaction>{}),
-      ) as _i11.Future<Map<_i13.Address, _i13.Transaction>>);
-  @override
-  _i11.Future<bool> generateNewAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #generateNewAddress,
-          [],
-        ),
-        returnValue: _i11.Future<bool>.value(false),
-      ) as _i11.Future<bool>);
-  @override
-  _i8.Amount availablePrivateBalance() => (super.noSuchMethod(
-        Invocation.method(
-          #availablePrivateBalance,
-          [],
-        ),
-        returnValue: _FakeAmount_6(
-          this,
-          Invocation.method(
-            #availablePrivateBalance,
-            [],
-          ),
-        ),
-      ) as _i8.Amount);
-  @override
-  _i8.Amount availablePublicBalance() => (super.noSuchMethod(
-        Invocation.method(
-          #availablePublicBalance,
-          [],
-        ),
-        returnValue: _FakeAmount_6(
-          this,
-          Invocation.method(
-            #availablePublicBalance,
-            [],
-          ),
-        ),
-      ) as _i8.Amount);
-  @override
-  void initCache(
-    String? walletId,
-    _i12.Coin? coin,
-  ) =>
-      super.noSuchMethod(
-        Invocation.method(
-          #initCache,
-          [
-            walletId,
-            coin,
-          ],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i11.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedId,
-          [id],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  int getCachedChainHeight() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedChainHeight,
-          [],
-        ),
-        returnValue: 0,
-      ) as int);
-  @override
-  _i11.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedChainHeight,
-          [height],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  bool getCachedIsFavorite() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedIsFavorite,
-          [],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i11.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedIsFavorite,
-          [isFavorite],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i6.Balance getCachedBalance() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedBalance,
-          [],
-        ),
-        returnValue: _FakeBalance_4(
-          this,
-          Invocation.method(
-            #getCachedBalance,
-            [],
-          ),
-        ),
-      ) as _i6.Balance);
-  @override
-  _i11.Future<void> updateCachedBalance(_i6.Balance? balance) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedBalance,
-          [balance],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i6.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedBalanceSecondary,
-          [],
-        ),
-        returnValue: _FakeBalance_4(
-          this,
-          Invocation.method(
-            #getCachedBalanceSecondary,
-            [],
-          ),
-        ),
-      ) as _i6.Balance);
-  @override
-  _i11.Future<void> updateCachedBalanceSecondary(_i6.Balance? balance) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedBalanceSecondary,
-          [balance],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
-        Invocation.method(
-          #getWalletTokenContractAddresses,
-          [],
-        ),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  _i11.Future<void> updateWalletTokenContractAddresses(
-          List<String>? contractAddresses) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateWalletTokenContractAddresses,
-          [contractAddresses],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
-        Invocation.method(
-          #initWalletDB,
-          [],
-          {#mockableOverride: mockableOverride},
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void initFiroHive(String? walletId) => super.noSuchMethod(
-        Invocation.method(
-          #initFiroHive,
-          [walletId],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i11.Future<void> firoUpdateJIndex(List<dynamic>? jIndex) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #firoUpdateJIndex,
-          [jIndex],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  _i11.Future<void> firoUpdateLelantusCoins(List<dynamic>? lelantusCoins) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #firoUpdateLelantusCoins,
-          [lelantusCoins],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-  @override
-  int firoGetMintIndex() => (super.noSuchMethod(
-        Invocation.method(
-          #firoGetMintIndex,
-          [],
-        ),
-        returnValue: 0,
-      ) as int);
-  @override
-  _i11.Future<void> firoUpdateMintIndex(int? mintIndex) => (super.noSuchMethod(
-        Invocation.method(
-          #firoUpdateMintIndex,
-          [mintIndex],
-        ),
-        returnValue: _i11.Future<void>.value(),
-        returnValueForMissingStub: _i11.Future<void>.value(),
-      ) as _i11.Future<void>);
-}
-
-/// A class which mocks [ElectrumX].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockElectrumX extends _i1.Mock implements _i4.ElectrumX {
-  MockElectrumX() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  set failovers(List<_i4.ElectrumXNode>? _failovers) => super.noSuchMethod(
-        Invocation.setter(
-          #failovers,
-          _failovers,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get currentFailoverIndex => (super.noSuchMethod(
-        Invocation.getter(#currentFailoverIndex),
-        returnValue: 0,
-      ) as int);
-  @override
-  set currentFailoverIndex(int? _currentFailoverIndex) => super.noSuchMethod(
-        Invocation.setter(
-          #currentFailoverIndex,
-          _currentFailoverIndex,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get host => (super.noSuchMethod(
-        Invocation.getter(#host),
-        returnValue: '',
-      ) as String);
-  @override
-  int get port => (super.noSuchMethod(
-        Invocation.getter(#port),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get useSSL => (super.noSuchMethod(
-        Invocation.getter(#useSSL),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i11.Future<dynamic> request({
-    required String? command,
-    List<dynamic>? args = const [],
-    Duration? connectionTimeout = const Duration(seconds: 60),
-    String? requestID,
-    int? retries = 2,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #request,
-          [],
-          {
-            #command: command,
-            #args: args,
-            #connectionTimeout: connectionTimeout,
-            #requestID: requestID,
-            #retries: retries,
-          },
-        ),
-        returnValue: _i11.Future<dynamic>.value(),
-      ) as _i11.Future<dynamic>);
-  @override
-  _i11.Future<List<Map<String, dynamic>>> batchRequest({
-    required String? command,
-    required Map<String, List<dynamic>>? args,
-    Duration? connectionTimeout = const Duration(seconds: 60),
-    int? retries = 2,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #batchRequest,
-          [],
-          {
-            #command: command,
-            #args: args,
-            #connectionTimeout: connectionTimeout,
-            #retries: retries,
-          },
-        ),
-        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i11.Future<List<Map<String, dynamic>>>);
-  @override
-  _i11.Future<bool> ping({
-    String? requestID,
-    int? retryCount = 1,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #ping,
-          [],
-          {
-            #requestID: requestID,
-            #retryCount: retryCount,
-          },
-        ),
-        returnValue: _i11.Future<bool>.value(false),
-      ) as _i11.Future<bool>);
-  @override
-  _i11.Future<Map<String, dynamic>> getBlockHeadTip({String? requestID}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getBlockHeadTip,
-          [],
-          {#requestID: requestID},
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<Map<String, dynamic>> getServerFeatures({String? requestID}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getServerFeatures,
-          [],
-          {#requestID: requestID},
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<String> broadcastTransaction({
-    required String? rawTx,
-    String? requestID,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #broadcastTransaction,
-          [],
-          {
-            #rawTx: rawTx,
-            #requestID: requestID,
-          },
-        ),
-        returnValue: _i11.Future<String>.value(''),
-      ) as _i11.Future<String>);
-  @override
-  _i11.Future<Map<String, dynamic>> getBalance({
-    required String? scripthash,
-    String? requestID,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getBalance,
-          [],
-          {
-            #scripthash: scripthash,
-            #requestID: requestID,
-          },
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<List<Map<String, dynamic>>> getHistory({
-    required String? scripthash,
-    String? requestID,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getHistory,
-          [],
-          {
-            #scripthash: scripthash,
-            #requestID: requestID,
-          },
-        ),
-        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i11.Future<List<Map<String, dynamic>>>);
-  @override
-  _i11.Future<Map<String, List<Map<String, dynamic>>>> getBatchHistory(
-          {required Map<String, List<dynamic>>? args}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getBatchHistory,
-          [],
-          {#args: args},
-        ),
-        returnValue: _i11.Future<Map<String, List<Map<String, dynamic>>>>.value(
-            <String, List<Map<String, dynamic>>>{}),
-      ) as _i11.Future<Map<String, List<Map<String, dynamic>>>>);
-  @override
-  _i11.Future<List<Map<String, dynamic>>> getUTXOs({
-    required String? scripthash,
-    String? requestID,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getUTXOs,
-          [],
-          {
-            #scripthash: scripthash,
-            #requestID: requestID,
-          },
-        ),
-        returnValue: _i11.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i11.Future<List<Map<String, dynamic>>>);
-  @override
-  _i11.Future<Map<String, List<Map<String, dynamic>>>> getBatchUTXOs(
-          {required Map<String, List<dynamic>>? args}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getBatchUTXOs,
-          [],
-          {#args: args},
-        ),
-        returnValue: _i11.Future<Map<String, List<Map<String, dynamic>>>>.value(
-            <String, List<Map<String, dynamic>>>{}),
-      ) as _i11.Future<Map<String, List<Map<String, dynamic>>>>);
-  @override
-  _i11.Future<Map<String, dynamic>> getTransaction({
-    required String? txHash,
-    bool? verbose = true,
-    String? requestID,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getTransaction,
-          [],
-          {
-            #txHash: txHash,
-            #verbose: verbose,
-            #requestID: requestID,
-          },
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<Map<String, dynamic>> getAnonymitySet({
-    String? groupId = r'1',
-    String? blockhash = r'',
-    String? requestID,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getAnonymitySet,
-          [],
-          {
-            #groupId: groupId,
-            #blockhash: blockhash,
-            #requestID: requestID,
-          },
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<dynamic> getMintData({
-    dynamic mints,
-    String? requestID,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getMintData,
-          [],
-          {
-            #mints: mints,
-            #requestID: requestID,
-          },
-        ),
-        returnValue: _i11.Future<dynamic>.value(),
-      ) as _i11.Future<dynamic>);
-  @override
-  _i11.Future<Map<String, dynamic>> getUsedCoinSerials({
-    String? requestID,
-    required int? startNumber,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getUsedCoinSerials,
-          [],
-          {
-            #requestID: requestID,
-            #startNumber: startNumber,
-          },
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<int> getLatestCoinId({String? requestID}) => (super.noSuchMethod(
-        Invocation.method(
-          #getLatestCoinId,
-          [],
-          {#requestID: requestID},
-        ),
-        returnValue: _i11.Future<int>.value(0),
-      ) as _i11.Future<int>);
-  @override
-  _i11.Future<Map<String, dynamic>> getFeeRate({String? requestID}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getFeeRate,
-          [],
-          {#requestID: requestID},
-        ),
-        returnValue:
-            _i11.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i11.Future<Map<String, dynamic>>);
-  @override
-  _i11.Future<_i9.Decimal> estimateFee({
-    String? requestID,
-    required int? blocks,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFee,
-          [],
-          {
-            #requestID: requestID,
-            #blocks: blocks,
-          },
-        ),
-        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_7(
-          this,
-          Invocation.method(
-            #estimateFee,
-            [],
-            {
-              #requestID: requestID,
-              #blocks: blocks,
-            },
-          ),
-        )),
-      ) as _i11.Future<_i9.Decimal>);
-  @override
-  _i11.Future<_i9.Decimal> relayFee({String? requestID}) => (super.noSuchMethod(
-        Invocation.method(
-          #relayFee,
-          [],
-          {#requestID: requestID},
-        ),
-        returnValue: _i11.Future<_i9.Decimal>.value(_FakeDecimal_7(
-          this,
-          Invocation.method(
-            #relayFee,
-            [],
-            {#requestID: requestID},
-          ),
-        )),
-      ) as _i11.Future<_i9.Decimal>);
-}
diff --git a/test/services/node_service_test.dart b/test/services/node_service_test.dart
index 1c5f53aa7..4439e44b2 100644
--- a/test/services/node_service_test.dart
+++ b/test/services/node_service_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hive/hive.dart';
 import 'package:hive_test/hive_test.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/models/node_model.dart';
 import 'package:stackduo/services/node_service.dart';
 import 'package:stackduo/utilities/default_nodes.dart';
diff --git a/test/services/wallets_service_test.dart b/test/services/wallets_service_test.dart
index eb598a0d9..b60e33160 100644
--- a/test/services/wallets_service_test.dart
+++ b/test/services/wallets_service_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:hive/hive.dart';
 import 'package:hive_test/hive_test.dart';
 import 'package:mockito/annotations.dart';
-import 'package:stackduo/hive/db.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/services/wallets_service.dart';
 import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/flutter_secure_storage_interface.dart';
diff --git a/test/services/wallets_service_test.mocks.dart b/test/services/wallets_service_test.mocks.dart
index e9f219940..f3caf16e4 100644
--- a/test/services/wallets_service_test.mocks.dart
+++ b/test/services/wallets_service_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/services/wallets_service_test.dart.
 // Do not manually edit this file.
 
diff --git a/test/widget_tests/address_book_card_test.mocks.dart b/test/widget_tests/address_book_card_test.mocks.dart
index 186bb028b..9b66437f8 100644
--- a/test/widget_tests/address_book_card_test.mocks.dart
+++ b/test/widget_tests/address_book_card_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/widget_tests/address_book_card_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
-import 'dart:ui' as _i5;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/isar/models/contact_entry.dart' as _i2;
@@ -116,7 +115,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
   @override
-  void addListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -124,7 +123,7 @@ class MockAddressBookService extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i5.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart b/test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart
deleted file mode 100644
index 59e02607b..000000000
--- a/test/widget_tests/custom_buttons/favorite_toggle_test.mocks.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/widget_tests/custom_buttons/favorite_toggle_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-import 'dart:typed_data' as _i6;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i2;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
-import 'package:stackwallet/themes/theme_service.dart' as _i3;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
-  _FakeMainDB_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i3.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_0(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i2.MainDB);
-  @override
-  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i4.StackTheme>[],
-      ) as List<_i4.StackTheme>);
-  @override
-  void init(_i2.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
-  @override
-  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
-            <_i3.StackThemeMetaData>[]),
-      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
-  @override
-  _i5.Future<_i6.Uint8List> fetchTheme(
-          {required _i3.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
-      ) as _i5.Future<_i6.Uint8List>);
-  @override
-  _i4.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i4.StackTheme?);
-}
diff --git a/test/widget_tests/custom_loading_overlay_test.mocks.dart b/test/widget_tests/custom_loading_overlay_test.mocks.dart
deleted file mode 100644
index f192714d8..000000000
--- a/test/widget_tests/custom_loading_overlay_test.mocks.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/widget_tests/custom_loading_overlay_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-import 'dart:typed_data' as _i6;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i2;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
-import 'package:stackwallet/themes/theme_service.dart' as _i3;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
-  _FakeMainDB_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i3.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_0(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i2.MainDB);
-  @override
-  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i4.StackTheme>[],
-      ) as List<_i4.StackTheme>);
-  @override
-  void init(_i2.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
-  @override
-  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
-            <_i3.StackThemeMetaData>[]),
-      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
-  @override
-  _i5.Future<_i6.Uint8List> fetchTheme(
-          {required _i3.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
-      ) as _i5.Future<_i6.Uint8List>);
-  @override
-  _i4.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i4.StackTheme?);
-}
diff --git a/test/widget_tests/desktop/desktop_scaffold_test.mocks.dart b/test/widget_tests/desktop/desktop_scaffold_test.mocks.dart
deleted file mode 100644
index 5972c21c2..000000000
--- a/test/widget_tests/desktop/desktop_scaffold_test.mocks.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/widget_tests/desktop/desktop_scaffold_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-import 'dart:typed_data' as _i6;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i2;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
-import 'package:stackwallet/themes/theme_service.dart' as _i3;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
-  _FakeMainDB_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i3.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_0(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i2.MainDB);
-  @override
-  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i4.StackTheme>[],
-      ) as List<_i4.StackTheme>);
-  @override
-  void init(_i2.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
-  @override
-  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
-            <_i3.StackThemeMetaData>[]),
-      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
-  @override
-  _i5.Future<_i6.Uint8List> fetchTheme(
-          {required _i3.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
-      ) as _i5.Future<_i6.Uint8List>);
-  @override
-  _i4.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i4.StackTheme?);
-}
diff --git a/test/widget_tests/managed_favorite_test.mocks.dart b/test/widget_tests/managed_favorite_test.mocks.dart
index 5bd694533..0984ce454 100644
--- a/test/widget_tests/managed_favorite_test.mocks.dart
+++ b/test/widget_tests/managed_favorite_test.mocks.dart
@@ -1,11 +1,10 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/widget_tests/managed_favorite_test.dart.
+// Mocks generated by Mockito 5.4.2 from annotations
+// in stackduo/test/widget_tests/managed_favorite_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i23;
-import 'dart:typed_data' as _i29;
-import 'dart:ui' as _i25;
+import 'dart:typed_data' as _i28;
 
 import 'package:bip32/bip32.dart' as _i16;
 import 'package:bip47/bip47.dart' as _i18;
@@ -13,31 +12,28 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i12;
-import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i10;
-import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i9;
-import 'package:stackwallet/models/balance.dart' as _i11;
-import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i31;
-import 'package:stackwallet/models/node_model.dart' as _i33;
-import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i8;
-import 'package:stackwallet/models/signing_data.dart' as _i28;
-import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i26;
-import 'package:stackwallet/services/coins/coin_service.dart' as _i20;
-import 'package:stackwallet/services/coins/manager.dart' as _i6;
-import 'package:stackwallet/services/locale_service.dart' as _i32;
-import 'package:stackwallet/services/node_service.dart' as _i3;
-import 'package:stackwallet/services/transaction_notification_tracker.dart'
-    as _i7;
-import 'package:stackwallet/services/wallets.dart' as _i21;
-import 'package:stackwallet/services/wallets_service.dart' as _i2;
-import 'package:stackwallet/themes/theme_service.dart' as _i30;
-import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
-import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i27;
-import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
+import 'package:stackduo/db/isar/main_db.dart' as _i12;
+import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
+import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
+import 'package:stackduo/models/balance.dart' as _i11;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackduo/models/node_model.dart' as _i30;
+import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
+import 'package:stackduo/models/signing_data.dart' as _i27;
+import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i25;
+import 'package:stackduo/services/coins/coin_service.dart' as _i20;
+import 'package:stackduo/services/coins/manager.dart' as _i6;
+import 'package:stackduo/services/locale_service.dart' as _i29;
+import 'package:stackduo/services/node_service.dart' as _i3;
+import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
+import 'package:stackduo/services/wallets.dart' as _i21;
+import 'package:stackduo/services/wallets_service.dart' as _i2;
+import 'package:stackduo/utilities/amount/amount.dart' as _i14;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i22;
+import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i26;
+import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
     as _i19;
-import 'package:stackwallet/utilities/prefs.dart' as _i24;
+import 'package:stackduo/utilities/prefs.dart' as _i24;
 import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
@@ -431,7 +427,7 @@ class MockWallets extends _i1.Mock implements _i21.Wallets {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -439,7 +435,7 @@ class MockWallets extends _i1.Mock implements _i21.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -657,7 +653,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -665,7 +661,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -693,7 +689,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
 /// A class which mocks [BitcoinWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
+class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
   MockBitcoinWallet() {
     _i1.throwOnMissingStub(this);
   }
@@ -954,15 +950,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i27.DerivePathType addressType({required String? address}) =>
+  _i26.DerivePathType addressType({required String? address}) =>
       (super.noSuchMethod(
         Invocation.method(
           #addressType,
           [],
           {#address: address},
         ),
-        returnValue: _i27.DerivePathType.bip44,
-      ) as _i27.DerivePathType);
+        returnValue: _i26.DerivePathType.bip44,
+      ) as _i26.DerivePathType);
   @override
   _i23.Future<void> recoverFromMnemonic({
     required String? mnemonic,
@@ -1198,6 +1194,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     required String? recipientAddress,
     required bool? coinControl,
     required bool? isSendAll,
+    int? satsPerVByte,
     int? additionalOutputs = 0,
     List<_i17.UTXO>? utxos,
   }) =>
@@ -1210,12 +1207,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
           #recipientAddress: recipientAddress,
           #coinControl: coinControl,
           #isSendAll: isSendAll,
+          #satsPerVByte: satsPerVByte,
           #additionalOutputs: additionalOutputs,
           #utxos: utxos,
         },
       ));
   @override
-  _i23.Future<List<_i28.SigningData>> fetchBuildTxData(
+  _i23.Future<List<_i27.SigningData>> fetchBuildTxData(
           List<_i17.UTXO>? utxosToUse) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1223,11 +1221,11 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
           [utxosToUse],
         ),
         returnValue:
-            _i23.Future<List<_i28.SigningData>>.value(<_i28.SigningData>[]),
-      ) as _i23.Future<List<_i28.SigningData>>);
+            _i23.Future<List<_i27.SigningData>>.value(<_i27.SigningData>[]),
+      ) as _i23.Future<List<_i27.SigningData>>);
   @override
   _i23.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i28.SigningData>? utxoSigningData,
+    required List<_i27.SigningData>? utxoSigningData,
     required List<String>? recipients,
     required List<int>? satoshiAmounts,
   }) =>
@@ -1442,25 +1440,6 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
-        Invocation.method(
-          #getWalletTokenContractAddresses,
-          [],
-        ),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  _i23.Future<void> updateWalletTokenContractAddresses(
-          List<String>? contractAddresses) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateWalletTokenContractAddresses,
-          [contractAddresses],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
   void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
@@ -1535,7 +1514,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     })?
         prepareSend,
     required _i23.Future<int> Function({required String address})? getTxCount,
-    required _i23.Future<List<_i28.SigningData>> Function(List<_i17.UTXO>)?
+    required _i23.Future<List<_i27.SigningData>> Function(List<_i17.UTXO>)?
         fetchBuildTxData,
     required _i23.Future<void> Function()? refresh,
     required _i23.Future<void> Function()? checkChangeAddressForTransactions,
@@ -1585,7 +1564,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         )),
       ) as _i23.Future<_i16.BIP32>);
   @override
-  _i23.Future<_i29.Uint8List> getPrivateKeyForPaynymReceivingAddress({
+  _i23.Future<_i28.Uint8List> getPrivateKeyForPaynymReceivingAddress({
     required String? paymentCodeString,
     required int? index,
   }) =>
@@ -1598,8 +1577,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
             #index: index,
           },
         ),
-        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i23.Future<_i29.Uint8List>);
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
   @override
   _i23.Future<_i17.Address> currentReceivingPaynymAddress({
     required _i18.PaymentCode? sender,
@@ -1685,14 +1664,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         )),
       ) as _i23.Future<_i18.PaymentCode>);
   @override
-  _i23.Future<_i29.Uint8List> signWithNotificationKey(_i29.Uint8List? data) =>
+  _i23.Future<_i28.Uint8List> signWithNotificationKey(_i28.Uint8List? data) =>
       (super.noSuchMethod(
         Invocation.method(
           #signWithNotificationKey,
           [data],
         ),
-        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i23.Future<_i29.Uint8List>);
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
   @override
   _i23.Future<String> signStringWithNotificationKey(String? data) =>
       (super.noSuchMethod(
@@ -1957,109 +1936,10 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
       ) as _i23.Future<void>);
 }
 
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i30.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i12.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_9(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i12.MainDB);
-  @override
-  List<_i31.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i31.StackTheme>[],
-      ) as List<_i31.StackTheme>);
-  @override
-  void init(_i12.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<void> install({required _i29.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<List<_i30.StackThemeMetaData>> fetchThemes() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i23.Future<List<_i30.StackThemeMetaData>>.value(
-            <_i30.StackThemeMetaData>[]),
-      ) as _i23.Future<List<_i30.StackThemeMetaData>>);
-  @override
-  _i23.Future<_i29.Uint8List> fetchTheme(
-          {required _i30.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i23.Future<_i29.Uint8List>);
-  @override
-  _i31.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i31.StackTheme?);
-}
-
 /// A class which mocks [LocaleService].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i32.LocaleService {
+class MockLocaleService extends _i1.Mock implements _i29.LocaleService {
   MockLocaleService() {
     _i1.throwOnMissingStub(this);
   }
@@ -2085,7 +1965,7 @@ class MockLocaleService extends _i1.Mock implements _i32.LocaleService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -2093,7 +1973,7 @@ class MockLocaleService extends _i1.Mock implements _i32.LocaleService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -2131,15 +2011,15 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         ),
       ) as _i19.SecureStorageInterface);
   @override
-  List<_i33.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i30.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i33.NodeModel>[],
-      ) as List<_i33.NodeModel>);
+        returnValue: <_i30.NodeModel>[],
+      ) as List<_i30.NodeModel>);
   @override
-  List<_i33.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i30.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i33.NodeModel>[],
-      ) as List<_i33.NodeModel>);
+        returnValue: <_i30.NodeModel>[],
+      ) as List<_i30.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -2157,7 +2037,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
   @override
   _i23.Future<void> setPrimaryNodeFor({
     required _i22.Coin? coin,
-    required _i33.NodeModel? node,
+    required _i30.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -2174,40 +2054,40 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i33.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
+  _i30.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i33.NodeModel?);
+      )) as _i30.NodeModel?);
   @override
-  List<_i33.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
+  List<_i30.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i33.NodeModel>[],
-      ) as List<_i33.NodeModel>);
+        returnValue: <_i30.NodeModel>[],
+      ) as List<_i30.NodeModel>);
   @override
-  _i33.NodeModel? getNodeById({required String? id}) =>
+  _i30.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i33.NodeModel?);
+      )) as _i30.NodeModel?);
   @override
-  List<_i33.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
+  List<_i30.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i33.NodeModel>[],
-      ) as List<_i33.NodeModel>);
+        returnValue: <_i30.NodeModel>[],
+      ) as List<_i30.NodeModel>);
   @override
   _i23.Future<void> add(
-    _i33.NodeModel? node,
+    _i30.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2259,7 +2139,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
       ) as _i23.Future<void>);
   @override
   _i23.Future<void> edit(
-    _i33.NodeModel? editedNode,
+    _i30.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2285,7 +2165,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -2293,7 +2173,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -2678,7 +2558,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -2686,7 +2566,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/widget_tests/node_card_test.mocks.dart b/test/widget_tests/node_card_test.mocks.dart
index 59c032c4c..790991f1e 100644
--- a/test/widget_tests/node_card_test.mocks.dart
+++ b/test/widget_tests/node_card_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/widget_tests/node_card_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
-import 'dart:ui' as _i7;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:stackduo/models/node_model.dart' as _i4;
@@ -206,7 +205,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i5.Future<void>.value(),
       ) as _i5.Future<void>);
   @override
-  void addListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -214,7 +213,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i7.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/widget_tests/node_options_sheet_test.mocks.dart b/test/widget_tests/node_options_sheet_test.mocks.dart
index 56bfe6949..03ca0e9fa 100644
--- a/test/widget_tests/node_options_sheet_test.mocks.dart
+++ b/test/widget_tests/node_options_sheet_test.mocks.dart
@@ -1,10 +1,9 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/widget_tests/node_options_sheet_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i11;
-import 'dart:ui' as _i13;
 
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
@@ -14,9 +13,10 @@ import 'package:stackduo/services/coins/manager.dart' as _i6;
 import 'package:stackduo/services/node_service.dart' as _i3;
 import 'package:stackduo/services/wallets.dart' as _i8;
 import 'package:stackduo/services/wallets_service.dart' as _i2;
-import 'package:stackduo/utilities/enums/backup_frequency_type.dart' as _i15;
+import 'package:stackduo/utilities/amount/amount_unit.dart' as _i15;
+import 'package:stackduo/utilities/enums/backup_frequency_type.dart' as _i14;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i9;
-import 'package:stackduo/utilities/enums/sync_type_enum.dart' as _i14;
+import 'package:stackduo/utilities/enums/sync_type_enum.dart' as _i13;
 import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
     as _i7;
 import 'package:stackduo/utilities/prefs.dart' as _i12;
@@ -269,7 +269,7 @@ class MockWallets extends _i1.Mock implements _i8.Wallets {
         returnValueForMissingStub: _i11.Future<void>.value(),
       ) as _i11.Future<void>);
   @override
-  void addListener(_i13.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -277,7 +277,7 @@ class MockWallets extends _i1.Mock implements _i8.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i13.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -353,12 +353,12 @@ class MockPrefs extends _i1.Mock implements _i12.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  _i14.SyncingType get syncType => (super.noSuchMethod(
+  _i13.SyncingType get syncType => (super.noSuchMethod(
         Invocation.getter(#syncType),
-        returnValue: _i14.SyncingType.currentWalletOnly,
-      ) as _i14.SyncingType);
+        returnValue: _i13.SyncingType.currentWalletOnly,
+      ) as _i13.SyncingType);
   @override
-  set syncType(_i14.SyncingType? syncType) => super.noSuchMethod(
+  set syncType(_i13.SyncingType? syncType) => super.noSuchMethod(
         Invocation.setter(
           #syncType,
           syncType,
@@ -504,12 +504,12 @@ class MockPrefs extends _i1.Mock implements _i12.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  _i15.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
+  _i14.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
         Invocation.getter(#backupFrequencyType),
-        returnValue: _i15.BackupFrequencyType.everyTenMinutes,
-      ) as _i15.BackupFrequencyType);
+        returnValue: _i14.BackupFrequencyType.everyTenMinutes,
+      ) as _i14.BackupFrequencyType);
   @override
-  set backupFrequencyType(_i15.BackupFrequencyType? backupFrequencyType) =>
+  set backupFrequencyType(_i14.BackupFrequencyType? backupFrequencyType) =>
       super.noSuchMethod(
         Invocation.setter(
           #backupFrequencyType,
@@ -691,7 +691,55 @@ class MockPrefs extends _i1.Mock implements _i12.Prefs {
         returnValueForMissingStub: _i11.Future<void>.value(),
       ) as _i11.Future<void>);
   @override
-  void addListener(_i13.VoidCallback? listener) => super.noSuchMethod(
+  _i15.AmountUnit amountUnit(_i9.Coin? coin) => (super.noSuchMethod(
+        Invocation.method(
+          #amountUnit,
+          [coin],
+        ),
+        returnValue: _i15.AmountUnit.normal,
+      ) as _i15.AmountUnit);
+  @override
+  void updateAmountUnit({
+    required _i9.Coin? coin,
+    required _i15.AmountUnit? amountUnit,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #updateAmountUnit,
+          [],
+          {
+            #coin: coin,
+            #amountUnit: amountUnit,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int maxDecimals(_i9.Coin? coin) => (super.noSuchMethod(
+        Invocation.method(
+          #maxDecimals,
+          [coin],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  void updateMaxDecimals({
+    required _i9.Coin? coin,
+    required int? maxDecimals,
+  }) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #updateMaxDecimals,
+          [],
+          {
+            #coin: coin,
+            #maxDecimals: maxDecimals,
+          },
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -699,7 +747,7 @@ class MockPrefs extends _i1.Mock implements _i12.Prefs {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i13.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -895,7 +943,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i11.Future<void>.value(),
       ) as _i11.Future<void>);
   @override
-  void addListener(_i13.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -903,7 +951,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i13.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/widget_tests/table_view/table_view_row_test.mocks.dart b/test/widget_tests/table_view/table_view_row_test.mocks.dart
index d86e3d82d..feca2694f 100644
--- a/test/widget_tests/table_view/table_view_row_test.mocks.dart
+++ b/test/widget_tests/table_view/table_view_row_test.mocks.dart
@@ -1,11 +1,10 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/widget_tests/table_view/table_view_row_test.dart.
+// Mocks generated by Mockito 5.4.2 from annotations
+// in stackduo/test/widget_tests/table_view/table_view_row_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i22;
-import 'dart:typed_data' as _i27;
-import 'dart:ui' as _i24;
+import 'dart:typed_data' as _i28;
 
 import 'package:bip32/bip32.dart' as _i16;
 import 'package:bip47/bip47.dart' as _i18;
@@ -13,29 +12,26 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i7;
-import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i11;
-import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i10;
-import 'package:stackwallet/models/balance.dart' as _i12;
-import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i26;
-import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i9;
-import 'package:stackwallet/models/signing_data.dart' as _i30;
-import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i28;
-import 'package:stackwallet/services/coins/coin_service.dart' as _i19;
-import 'package:stackwallet/services/coins/manager.dart' as _i6;
-import 'package:stackwallet/services/node_service.dart' as _i3;
-import 'package:stackwallet/services/transaction_notification_tracker.dart'
-    as _i8;
-import 'package:stackwallet/services/wallets.dart' as _i20;
-import 'package:stackwallet/services/wallets_service.dart' as _i2;
-import 'package:stackwallet/themes/theme_service.dart' as _i25;
-import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
-import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i21;
-import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i29;
-import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
-    as _i31;
-import 'package:stackwallet/utilities/prefs.dart' as _i23;
+import 'package:stackduo/db/isar/main_db.dart' as _i12;
+import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
+import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
+import 'package:stackduo/models/balance.dart' as _i11;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
+import 'package:stackduo/models/signing_data.dart' as _i26;
+import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i24;
+import 'package:stackduo/services/coins/coin_service.dart' as _i19;
+import 'package:stackduo/services/coins/manager.dart' as _i6;
+import 'package:stackduo/services/node_service.dart' as _i3;
+import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
+import 'package:stackduo/services/wallets.dart' as _i20;
+import 'package:stackduo/services/wallets_service.dart' as _i2;
+import 'package:stackduo/utilities/amount/amount.dart' as _i14;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i21;
+import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i25;
+import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
+    as _i27;
+import 'package:stackduo/utilities/prefs.dart' as _i23;
 import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
@@ -91,8 +87,9 @@ class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
         );
 }
 
-class _FakeMainDB_4 extends _i1.SmartFake implements _i7.MainDB {
-  _FakeMainDB_4(
+class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
+    implements _i7.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_4(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -101,9 +98,8 @@ class _FakeMainDB_4 extends _i1.SmartFake implements _i7.MainDB {
         );
 }
 
-class _FakeTransactionNotificationTracker_5 extends _i1.SmartFake
-    implements _i8.TransactionNotificationTracker {
-  _FakeTransactionNotificationTracker_5(
+class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
+  _FakeFeeObject_5(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -112,8 +108,8 @@ class _FakeTransactionNotificationTracker_5 extends _i1.SmartFake
         );
 }
 
-class _FakeFeeObject_6 extends _i1.SmartFake implements _i9.FeeObject {
-  _FakeFeeObject_6(
+class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
+  _FakeElectrumX_6(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -122,8 +118,9 @@ class _FakeFeeObject_6 extends _i1.SmartFake implements _i9.FeeObject {
         );
 }
 
-class _FakeElectrumX_7 extends _i1.SmartFake implements _i10.ElectrumX {
-  _FakeElectrumX_7(
+class _FakeCachedElectrumX_7 extends _i1.SmartFake
+    implements _i10.CachedElectrumX {
+  _FakeCachedElectrumX_7(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -132,9 +129,8 @@ class _FakeElectrumX_7 extends _i1.SmartFake implements _i10.ElectrumX {
         );
 }
 
-class _FakeCachedElectrumX_8 extends _i1.SmartFake
-    implements _i11.CachedElectrumX {
-  _FakeCachedElectrumX_8(
+class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
+  _FakeBalance_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -143,8 +139,8 @@ class _FakeCachedElectrumX_8 extends _i1.SmartFake
         );
 }
 
-class _FakeBalance_9 extends _i1.SmartFake implements _i12.Balance {
-  _FakeBalance_9(
+class _FakeMainDB_9 extends _i1.SmartFake implements _i12.MainDB {
+  _FakeMainDB_9(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -163,8 +159,7 @@ class _FakeNetworkType_10 extends _i1.SmartFake implements _i13.NetworkType {
         );
 }
 
-class _FakeElectrumXNode_11 extends _i1.SmartFake
-    implements _i10.ElectrumXNode {
+class _FakeElectrumXNode_11 extends _i1.SmartFake implements _i9.ElectrumXNode {
   _FakeElectrumXNode_11(
     Object parent,
     Invocation parentInvocation,
@@ -419,7 +414,7 @@ class MockWallets extends _i1.Mock implements _i20.Wallets {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  void addListener(_i24.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -427,7 +422,7 @@ class MockWallets extends _i1.Mock implements _i20.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i24.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -645,7 +640,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  void addListener(_i24.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -653,7 +648,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i24.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -678,109 +673,10 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
       );
 }
 
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i25.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i7.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_4(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i7.MainDB);
-  @override
-  List<_i26.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i26.StackTheme>[],
-      ) as List<_i26.StackTheme>);
-  @override
-  void init(_i7.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i22.Future<void> install({required _i27.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
-  @override
-  _i22.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
-  @override
-  _i22.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
-  @override
-  _i22.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i22.Future<bool>.value(false),
-      ) as _i22.Future<bool>);
-  @override
-  _i22.Future<List<_i25.StackThemeMetaData>> fetchThemes() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i22.Future<List<_i25.StackThemeMetaData>>.value(
-            <_i25.StackThemeMetaData>[]),
-      ) as _i22.Future<List<_i25.StackThemeMetaData>>);
-  @override
-  _i22.Future<_i27.Uint8List> fetchTheme(
-          {required _i25.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i22.Future<_i27.Uint8List>.value(_i27.Uint8List(0)),
-      ) as _i22.Future<_i27.Uint8List>);
-  @override
-  _i26.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i26.StackTheme?);
-}
-
 /// A class which mocks [BitcoinWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
+class MockBitcoinWallet extends _i1.Mock implements _i24.BitcoinWallet {
   MockBitcoinWallet() {
     _i1.throwOnMissingStub(this);
   }
@@ -794,15 +690,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i8.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+  _i7.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
         Invocation.getter(#txTracker),
-        returnValue: _FakeTransactionNotificationTracker_5(
+        returnValue: _FakeTransactionNotificationTracker_4(
           this,
           Invocation.getter(#txTracker),
         ),
-      ) as _i8.TransactionNotificationTracker);
+      ) as _i7.TransactionNotificationTracker);
   @override
-  set txTracker(_i8.TransactionNotificationTracker? _txTracker) =>
+  set txTracker(_i7.TransactionNotificationTracker? _txTracker) =>
       super.noSuchMethod(
         Invocation.setter(
           #txTracker,
@@ -899,13 +795,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i22.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
+  _i22.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i22.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
+        returnValue: _i22.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i22.Future<_i9.FeeObject>);
+      ) as _i22.Future<_i8.FeeObject>);
   @override
   _i22.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -978,29 +874,29 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i10.ElectrumX get electrumXClient => (super.noSuchMethod(
+  _i9.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_7(
+        returnValue: _FakeElectrumX_6(
           this,
           Invocation.getter(#electrumXClient),
         ),
-      ) as _i10.ElectrumX);
+      ) as _i9.ElectrumX);
   @override
-  _i11.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+  _i10.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
         Invocation.getter(#cachedElectrumXClient),
-        returnValue: _FakeCachedElectrumX_8(
+        returnValue: _FakeCachedElectrumX_7(
           this,
           Invocation.getter(#cachedElectrumXClient),
         ),
-      ) as _i11.CachedElectrumX);
+      ) as _i10.CachedElectrumX);
   @override
-  _i12.Balance get balance => (super.noSuchMethod(
+  _i11.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
   _i22.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
@@ -1016,13 +912,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i7.MainDB get db => (super.noSuchMethod(
+  _i12.MainDB get db => (super.noSuchMethod(
         Invocation.getter(#db),
-        returnValue: _FakeMainDB_4(
+        returnValue: _FakeMainDB_9(
           this,
           Invocation.getter(#db),
         ),
-      ) as _i7.MainDB);
+      ) as _i12.MainDB);
   @override
   _i13.NetworkType get networkType => (super.noSuchMethod(
         Invocation.getter(#networkType),
@@ -1041,15 +937,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i29.DerivePathType addressType({required String? address}) =>
+  _i25.DerivePathType addressType({required String? address}) =>
       (super.noSuchMethod(
         Invocation.method(
           #addressType,
           [],
           {#address: address},
         ),
-        returnValue: _i29.DerivePathType.bip44,
-      ) as _i29.DerivePathType);
+        returnValue: _i25.DerivePathType.bip44,
+      ) as _i25.DerivePathType);
   @override
   _i22.Future<void> recoverFromMnemonic({
     required String? mnemonic,
@@ -1208,20 +1104,19 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i22.Future<_i10.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+  _i22.Future<_i9.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
         Invocation.method(
           #getCurrentNode,
           [],
         ),
-        returnValue:
-            _i22.Future<_i10.ElectrumXNode>.value(_FakeElectrumXNode_11(
+        returnValue: _i22.Future<_i9.ElectrumXNode>.value(_FakeElectrumXNode_11(
           this,
           Invocation.method(
             #getCurrentNode,
             [],
           ),
         )),
-      ) as _i22.Future<_i10.ElectrumXNode>);
+      ) as _i22.Future<_i9.ElectrumXNode>);
   @override
   _i22.Future<List<Map<String, dynamic>>> fastFetch(
           List<String>? allTxHashes) =>
@@ -1286,6 +1181,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
     required String? recipientAddress,
     required bool? coinControl,
     required bool? isSendAll,
+    int? satsPerVByte,
     int? additionalOutputs = 0,
     List<_i17.UTXO>? utxos,
   }) =>
@@ -1298,12 +1194,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
           #recipientAddress: recipientAddress,
           #coinControl: coinControl,
           #isSendAll: isSendAll,
+          #satsPerVByte: satsPerVByte,
           #additionalOutputs: additionalOutputs,
           #utxos: utxos,
         },
       ));
   @override
-  _i22.Future<List<_i30.SigningData>> fetchBuildTxData(
+  _i22.Future<List<_i26.SigningData>> fetchBuildTxData(
           List<_i17.UTXO>? utxosToUse) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1311,11 +1208,11 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
           [utxosToUse],
         ),
         returnValue:
-            _i22.Future<List<_i30.SigningData>>.value(<_i30.SigningData>[]),
-      ) as _i22.Future<List<_i30.SigningData>>);
+            _i22.Future<List<_i26.SigningData>>.value(<_i26.SigningData>[]),
+      ) as _i22.Future<List<_i26.SigningData>>);
   @override
   _i22.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i30.SigningData>? utxoSigningData,
+    required List<_i26.SigningData>? utxoSigningData,
     required List<String>? recipients,
     required List<int>? satoshiAmounts,
   }) =>
@@ -1482,21 +1379,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i12.Balance getCachedBalance() => (super.noSuchMethod(
+  _i11.Balance getCachedBalance() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalance,
           [],
         ),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.method(
             #getCachedBalance,
             [],
           ),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
-  _i22.Future<void> updateCachedBalance(_i12.Balance? balance) =>
+  _i22.Future<void> updateCachedBalance(_i11.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalance,
@@ -1506,21 +1403,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  _i12.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+  _i11.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalanceSecondary,
           [],
         ),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.method(
             #getCachedBalanceSecondary,
             [],
           ),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
-  _i22.Future<void> updateCachedBalanceSecondary(_i12.Balance? balance) =>
+  _i22.Future<void> updateCachedBalanceSecondary(_i11.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalanceSecondary,
@@ -1530,26 +1427,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
-        Invocation.method(
-          #getWalletTokenContractAddresses,
-          [],
-        ),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  _i22.Future<void> updateWalletTokenContractAddresses(
-          List<String>? contractAddresses) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateWalletTokenContractAddresses,
-          [contractAddresses],
-        ),
-        returnValue: _i22.Future<void>.value(),
-        returnValueForMissingStub: _i22.Future<void>.value(),
-      ) as _i22.Future<void>);
-  @override
-  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
+  void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
           [],
@@ -1601,9 +1479,9 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
     required String? walletName,
     required _i13.NetworkType? network,
     required _i21.Coin? coin,
-    required _i7.MainDB? db,
-    required _i10.ElectrumX? electrumXClient,
-    required _i31.SecureStorageInterface? secureStorage,
+    required _i12.MainDB? db,
+    required _i9.ElectrumX? electrumXClient,
+    required _i27.SecureStorageInterface? secureStorage,
     required int? dustLimit,
     required int? dustLimitP2PKH,
     required int? minConfirms,
@@ -1623,7 +1501,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
     })?
         prepareSend,
     required _i22.Future<int> Function({required String address})? getTxCount,
-    required _i22.Future<List<_i30.SigningData>> Function(List<_i17.UTXO>)?
+    required _i22.Future<List<_i26.SigningData>> Function(List<_i17.UTXO>)?
         fetchBuildTxData,
     required _i22.Future<void> Function()? refresh,
     required _i22.Future<void> Function()? checkChangeAddressForTransactions,
@@ -1673,7 +1551,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         )),
       ) as _i22.Future<_i16.BIP32>);
   @override
-  _i22.Future<_i27.Uint8List> getPrivateKeyForPaynymReceivingAddress({
+  _i22.Future<_i28.Uint8List> getPrivateKeyForPaynymReceivingAddress({
     required String? paymentCodeString,
     required int? index,
   }) =>
@@ -1686,8 +1564,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
             #index: index,
           },
         ),
-        returnValue: _i22.Future<_i27.Uint8List>.value(_i27.Uint8List(0)),
-      ) as _i22.Future<_i27.Uint8List>);
+        returnValue: _i22.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i22.Future<_i28.Uint8List>);
   @override
   _i22.Future<_i17.Address> currentReceivingPaynymAddress({
     required _i18.PaymentCode? sender,
@@ -1773,14 +1651,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
         )),
       ) as _i22.Future<_i18.PaymentCode>);
   @override
-  _i22.Future<_i27.Uint8List> signWithNotificationKey(_i27.Uint8List? data) =>
+  _i22.Future<_i28.Uint8List> signWithNotificationKey(_i28.Uint8List? data) =>
       (super.noSuchMethod(
         Invocation.method(
           #signWithNotificationKey,
           [data],
         ),
-        returnValue: _i22.Future<_i27.Uint8List>.value(_i27.Uint8List(0)),
-      ) as _i22.Future<_i27.Uint8List>);
+        returnValue: _i22.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i22.Future<_i28.Uint8List>);
   @override
   _i22.Future<String> signStringWithNotificationKey(String? data) =>
       (super.noSuchMethod(
@@ -2013,9 +1891,9 @@ class MockBitcoinWallet extends _i1.Mock implements _i28.BitcoinWallet {
     required String? walletId,
     required String? walletName,
     required _i21.Coin? coin,
-    required _i7.MainDB? db,
+    required _i12.MainDB? db,
     required _i22.Future<int> Function()? getChainHeight,
-    required _i22.Future<void> Function(_i12.Balance)? refreshedBalanceCallback,
+    required _i22.Future<void> Function(_i11.Balance)? refreshedBalanceCallback,
   }) =>
       super.noSuchMethod(
         Invocation.method(
@@ -2112,13 +1990,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i22.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
+  _i22.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i22.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
+        returnValue: _i22.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i22.Future<_i9.FeeObject>);
+      ) as _i22.Future<_i8.FeeObject>);
   @override
   _i22.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2130,13 +2008,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: _i22.Future<String>.value(''),
       ) as _i22.Future<String>);
   @override
-  _i12.Balance get balance => (super.noSuchMethod(
+  _i11.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
   _i22.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
@@ -2405,7 +2283,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i22.Future<void>.value(),
       ) as _i22.Future<void>);
   @override
-  void addListener(_i24.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -2413,7 +2291,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i24.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -2480,13 +2358,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i19.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i22.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
+  _i22.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i22.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
+        returnValue: _i22.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i22.Future<_i9.FeeObject>);
+      ) as _i22.Future<_i8.FeeObject>);
   @override
   _i22.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2498,13 +2376,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i19.CoinServiceAPI {
         returnValue: _i22.Future<String>.value(''),
       ) as _i22.Future<String>);
   @override
-  _i12.Balance get balance => (super.noSuchMethod(
+  _i11.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
   _i22.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
diff --git a/test/widget_tests/trade_card_test.mocks.dart b/test/widget_tests/trade_card_test.mocks.dart
deleted file mode 100644
index 55895389f..000000000
--- a/test/widget_tests/trade_card_test.mocks.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/widget_tests/trade_card_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i5;
-import 'dart:typed_data' as _i6;
-
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i2;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i4;
-import 'package:stackwallet/themes/theme_service.dart' as _i3;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeMainDB_0 extends _i1.SmartFake implements _i2.MainDB {
-  _FakeMainDB_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i3.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_0(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i2.MainDB);
-  @override
-  List<_i4.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i4.StackTheme>[],
-      ) as List<_i4.StackTheme>);
-  @override
-  void init(_i2.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i5.Future<void> install({required _i6.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i5.Future<bool>.value(false),
-      ) as _i5.Future<bool>);
-  @override
-  _i5.Future<List<_i3.StackThemeMetaData>> fetchThemes() => (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i5.Future<List<_i3.StackThemeMetaData>>.value(
-            <_i3.StackThemeMetaData>[]),
-      ) as _i5.Future<List<_i3.StackThemeMetaData>>);
-  @override
-  _i5.Future<_i6.Uint8List> fetchTheme(
-          {required _i3.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i5.Future<_i6.Uint8List>.value(_i6.Uint8List(0)),
-      ) as _i5.Future<_i6.Uint8List>);
-  @override
-  _i4.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i4.StackTheme?);
-}
diff --git a/test/widget_tests/transaction_card_test.dart b/test/widget_tests/transaction_card_test.dart
index d3d16b655..a5e2209af 100644
--- a/test/widget_tests/transaction_card_test.dart
+++ b/test/widget_tests/transaction_card_test.dart
@@ -1,505 +1,505 @@
-import 'package:decimal/decimal.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_feather_icons/flutter_feather_icons.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mockingjay/mockingjay.dart' as mockingjay;
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
-import 'package:stackwallet/models/isar/models/blockchain_data/transaction.dart';
-import 'package:stackwallet/models/isar/stack_theme.dart';
-import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart';
-import 'package:stackwallet/providers/providers.dart';
-import 'package:stackwallet/services/coins/coin_service.dart';
-import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
-import 'package:stackwallet/services/coins/manager.dart';
-import 'package:stackwallet/services/locale_service.dart';
-import 'package:stackwallet/services/notes_service.dart';
-import 'package:stackwallet/services/price_service.dart';
-import 'package:stackwallet/services/wallets.dart';
-import 'package:stackwallet/themes/stack_colors.dart';
-import 'package:stackwallet/themes/theme_service.dart';
-import 'package:stackwallet/utilities/amount/amount.dart';
-import 'package:stackwallet/utilities/enums/coin_enum.dart';
-import 'package:stackwallet/utilities/prefs.dart';
-import 'package:stackwallet/utilities/util.dart';
-import 'package:stackwallet/widgets/transaction_card.dart';
-import 'package:tuple/tuple.dart';
-
-import '../sample_data/theme_json.dart';
-import 'transaction_card_test.mocks.dart';
-
-@GenerateMocks([
-  Wallets,
-  Manager,
-  CoinServiceAPI,
-  FiroWallet,
-  LocaleService,
-  Prefs,
-  PriceService,
-  NotesService,
-  ThemeService,
-], customMocks: [])
-void main() {
-  TestWidgetsFlutterBinding.ensureInitialized();
-  testWidgets("Sent confirmed tx displays correctly", (tester) async {
-    final mockManager = MockManager();
-    final mockLocaleService = MockLocaleService();
-    final wallets = MockWallets();
-    final mockPrefs = MockPrefs();
-    final mockPriceService = MockPriceService();
-    final mockThemeService = MockThemeService();
-
-    final tx = Transaction(
-      txid: "some txid",
-      timestamp: 1648595998,
-      type: TransactionType.outgoing,
-      amount: 100000000,
-      amountString: Amount(
-        rawValue: BigInt.from(100000000),
-        fractionDigits: Coin.firo.decimals,
-      ).toJsonString(),
-      fee: 3794,
-      height: 450123,
-      subType: TransactionSubType.none,
-      isCancelled: false,
-      walletId: '',
-      isLelantus: null,
-      slateId: '',
-      otherData: '',
-      nonce: null,
-      inputs: [],
-      outputs: [],
-      numberOfMessages: null,
-    )..address.value = Address(
-        walletId: "walletId",
-        value: "",
-        publicKey: [],
-        derivationIndex: 0,
-        derivationPath: null,
-        type: AddressType.p2pkh,
-        subType: AddressSubType.receiving);
-
-    final CoinServiceAPI wallet = MockFiroWallet();
-
-    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
-      (_) => StackTheme.fromJson(
-        json: lightThemeJsonMap,
-        applicationThemesDirectoryPath: "test",
-      ),
-    );
-    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
-    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-    when(mockPrefs.currency).thenAnswer((_) => "USD");
-    when(mockPrefs.externalCalls).thenAnswer((_) => true);
-    when(mockPriceService.getPrice(Coin.firo))
-        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
-
-    when(wallet.coin).thenAnswer((_) => Coin.firo);
-
-    when(wallets.getManager("wallet-id"))
-        .thenAnswer((realInvocation) => Manager(wallet));
-
-    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
-    //
-    await tester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          walletsChangeNotifierProvider.overrideWithValue(wallets),
-          localeServiceChangeNotifierProvider
-              .overrideWithValue(mockLocaleService),
-          pThemeService.overrideWithValue(mockThemeService),
-          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-          priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
-        ],
-        child: MaterialApp(
-          theme: ThemeData(
-            extensions: [
-              StackColors.fromStackColorTheme(
-                StackTheme.fromJson(
-                  json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
-                ),
-              ),
-            ],
-          ),
-          home: TransactionCard(transaction: tx, walletId: "wallet-id"),
-        ),
-      ),
-    );
-
-    //
-    final title = find.text("Sent");
-    // final price1 = find.text("0.00 USD");
-    final amount = Util.isDesktop
-        ? find.text("-1.00000000 FIRO")
-        : find.text("1.00000000 FIRO");
-
-    final icon = find.byIcon(FeatherIcons.arrowUp);
-
-    expect(title, findsOneWidget);
-    // expect(price1, findsOneWidget);
-    expect(amount, findsOneWidget);
-    // expect(icon, findsOneWidget);
-    //
-    await tester.pumpAndSettle(const Duration(seconds: 2));
-    //
-    // final price2 = find.text("\$10.00");
-    // expect(price2, findsOneWidget);
-    //
-    // verify(mockManager.addListener(any)).called(1);
-    verify(mockLocaleService.addListener(any)).called(1);
-
-    verify(mockPrefs.currency).called(1);
-    verify(mockPriceService.getPrice(Coin.firo)).called(1);
-    verify(wallet.coin.ticker).called(1);
-
-    verify(mockLocaleService.locale).called(1);
-
-    verifyNoMoreInteractions(mockManager);
-    verifyNoMoreInteractions(mockLocaleService);
-  });
-
-  testWidgets("Anonymized confirmed tx displays correctly", (tester) async {
-    final mockManager = MockManager();
-    final mockLocaleService = MockLocaleService();
-    final wallets = MockWallets();
-    final mockPrefs = MockPrefs();
-    final mockPriceService = MockPriceService();
-    final mockThemeService = MockThemeService();
-
-    final tx = Transaction(
-      txid: "some txid",
-      timestamp: 1648595998,
-      type: TransactionType.outgoing,
-      amount: 9659,
-      amountString: Amount(
-        rawValue: BigInt.from(9659),
-        fractionDigits: Coin.firo.decimals,
-      ).toJsonString(),
-      fee: 3794,
-      height: 450123,
-      subType: TransactionSubType.mint,
-      isCancelled: false,
-      walletId: '',
-      isLelantus: null,
-      slateId: '',
-      otherData: '',
-      nonce: null,
-      inputs: [],
-      outputs: [],
-      numberOfMessages: null,
-    )..address.value = Address(
-        walletId: "walletId",
-        value: "",
-        publicKey: [],
-        derivationIndex: 0,
-        derivationPath: null,
-        type: AddressType.p2pkh,
-        subType: AddressSubType.receiving);
-
-    final CoinServiceAPI wallet = MockFiroWallet();
-
-    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
-      (_) => StackTheme.fromJson(
-        json: lightThemeJsonMap,
-        applicationThemesDirectoryPath: "test",
-      ),
-    );
-    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
-    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-    when(mockPrefs.currency).thenAnswer((_) => "USD");
-    when(mockPrefs.externalCalls).thenAnswer((_) => true);
-    when(mockPriceService.getPrice(Coin.firo))
-        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
-
-    when(wallet.coin).thenAnswer((_) => Coin.firo);
-    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
-
-    when(wallets.getManager("wallet-id"))
-        .thenAnswer((realInvocation) => Manager(wallet));
-    //
-    await tester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          walletsChangeNotifierProvider.overrideWithValue(wallets),
-          localeServiceChangeNotifierProvider
-              .overrideWithValue(mockLocaleService),
-          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-          pThemeService.overrideWithValue(mockThemeService),
-          priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
-        ],
-        child: MaterialApp(
-          theme: ThemeData(
-            extensions: [
-              StackColors.fromStackColorTheme(
-                StackTheme.fromJson(
-                  json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
-                ),
-              ),
-            ],
-          ),
-          home: TransactionCard(transaction: tx, walletId: "wallet-id"),
-        ),
-      ),
-    );
-
-    //
-    final title = find.text("Anonymized");
-    // final price1 = find.text("0.00 USD");
-    final amount = find.text("-0.00009659 FIRO");
-
-    final icon = find.byIcon(FeatherIcons.arrowUp);
-
-    expect(title, findsOneWidget);
-    // expect(price1, findsOneWidget);
-    expect(amount, findsOneWidget);
-    // expect(icon, findsOneWidget);
-    //
-    await tester.pumpAndSettle(const Duration(seconds: 2));
-    //
-    // final price2 = find.text("\$10.00");
-    // expect(price2, findsOneWidget);
-    //
-    // verify(mockManager.addListener(any)).called(1);
-    verify(mockLocaleService.addListener(any)).called(1);
-
-    verify(mockPrefs.currency).called(1);
-    verify(mockPriceService.getPrice(Coin.firo)).called(1);
-    verify(wallet.coin.ticker).called(1);
-
-    verify(mockLocaleService.locale).called(1);
-
-    verifyNoMoreInteractions(mockManager);
-    verifyNoMoreInteractions(mockLocaleService);
-  });
-
-  testWidgets("Received unconfirmed tx displays correctly", (tester) async {
-    final mockManager = MockManager();
-    final mockLocaleService = MockLocaleService();
-    final wallets = MockWallets();
-    final mockPrefs = MockPrefs();
-    final mockPriceService = MockPriceService();
-    final mockThemeService = MockThemeService();
-
-    final tx = Transaction(
-      txid: "some txid",
-      timestamp: 1648595998,
-      type: TransactionType.incoming,
-      amount: 100000000,
-      amountString: Amount(
-        rawValue: BigInt.from(100000000),
-        fractionDigits: Coin.firo.decimals,
-      ).toJsonString(),
-      fee: 3794,
-      height: 450123,
-      subType: TransactionSubType.none,
-      isCancelled: false,
-      walletId: '',
-      isLelantus: null,
-      slateId: '',
-      otherData: '',
-      nonce: null,
-      inputs: [],
-      outputs: [],
-      numberOfMessages: null,
-    )..address.value = Address(
-        walletId: "walletId",
-        value: "",
-        publicKey: [],
-        derivationIndex: 0,
-        derivationPath: null,
-        type: AddressType.p2pkh,
-        subType: AddressSubType.receiving);
-
-    final CoinServiceAPI wallet = MockFiroWallet();
-
-    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
-      (_) => StackTheme.fromJson(
-        json: lightThemeJsonMap,
-        applicationThemesDirectoryPath: "test",
-      ),
-    );
-    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
-    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-    when(mockPrefs.currency).thenAnswer((_) => "USD");
-    when(mockPrefs.externalCalls).thenAnswer((_) => true);
-    when(mockPriceService.getPrice(Coin.firo))
-        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
-
-    when(wallet.coin).thenAnswer((_) => Coin.firo);
-
-    when(wallets.getManager("wallet-id"))
-        .thenAnswer((realInvocation) => Manager(wallet));
-
-    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
-
-    await tester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          walletsChangeNotifierProvider.overrideWithValue(wallets),
-          localeServiceChangeNotifierProvider
-              .overrideWithValue(mockLocaleService),
-          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-          pThemeService.overrideWithValue(mockThemeService),
-          priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
-        ],
-        child: MaterialApp(
-          theme: ThemeData(
-            extensions: [
-              StackColors.fromStackColorTheme(
-                StackTheme.fromJson(
-                  json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
-                ),
-              ),
-            ],
-          ),
-          home: TransactionCard(transaction: tx, walletId: "wallet-id"),
-        ),
-      ),
-    );
-
-    final title = find.text("Received");
-    final amount = Util.isDesktop
-        ? find.text("+1.00000000 FIRO")
-        : find.text("1.00000000 FIRO");
-
-    expect(title, findsOneWidget);
-    expect(amount, findsOneWidget);
-
-    await tester.pumpAndSettle(const Duration(seconds: 2));
-
-    verify(mockLocaleService.addListener(any)).called(1);
-
-    verify(mockPrefs.currency).called(1);
-    verify(mockPriceService.getPrice(Coin.firo)).called(1);
-    verify(wallet.coin.ticker).called(1);
-
-    verify(mockLocaleService.locale).called(1);
-
-    verifyNoMoreInteractions(mockManager);
-    verifyNoMoreInteractions(mockLocaleService);
-  });
-
-  testWidgets("Tap gesture", (tester) async {
-    final mockManager = MockManager();
-    final mockLocaleService = MockLocaleService();
-    final wallets = MockWallets();
-    final mockPrefs = MockPrefs();
-    final mockPriceService = MockPriceService();
-    final mockThemeService = MockThemeService();
-    final navigator = mockingjay.MockNavigator();
-
-    final tx = Transaction(
-      txid: "some txid",
-      timestamp: 1648595998,
-      type: TransactionType.outgoing,
-      amount: 100000000,
-      amountString: Amount(
-        rawValue: BigInt.from(100000000),
-        fractionDigits: Coin.firo.decimals,
-      ).toJsonString(),
-      fee: 3794,
-      height: 450123,
-      subType: TransactionSubType.none,
-      isCancelled: false,
-      walletId: '',
-      isLelantus: null,
-      slateId: '',
-      otherData: '',
-      nonce: null,
-      inputs: [],
-      outputs: [],
-      numberOfMessages: null,
-    )..address.value = Address(
-        walletId: "walletId",
-        value: "",
-        publicKey: [],
-        derivationIndex: 0,
-        derivationPath: null,
-        type: AddressType.p2pkh,
-        subType: AddressSubType.receiving);
-
-    final CoinServiceAPI wallet = MockFiroWallet();
-
-    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
-      (_) => StackTheme.fromJson(
-        json: lightThemeJsonMap,
-        applicationThemesDirectoryPath: "test",
-      ),
-    );
-    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
-    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-    when(mockPrefs.currency).thenAnswer((_) => "USD");
-    when(mockPrefs.externalCalls).thenAnswer((_) => true);
-    when(mockPriceService.getPrice(Coin.firo))
-        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
-
-    when(wallet.coin).thenAnswer((_) => Coin.firo);
-
-    when(wallets.getManager("wallet id"))
-        .thenAnswer((realInvocation) => Manager(wallet));
-
-    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
-
-    mockingjay
-        .when(() => navigator.pushNamed("/transactionDetails",
-            arguments: Tuple3(tx, Coin.firo, "wallet id")))
-        .thenAnswer((_) async => {});
-
-    await tester.pumpWidget(
-      ProviderScope(
-        overrides: [
-          walletsChangeNotifierProvider.overrideWithValue(wallets),
-          localeServiceChangeNotifierProvider
-              .overrideWithValue(mockLocaleService),
-          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-          pThemeService.overrideWithValue(mockThemeService),
-          priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
-        ],
-        child: MaterialApp(
-          theme: ThemeData(
-            extensions: [
-              StackColors.fromStackColorTheme(
-                StackTheme.fromJson(
-                  json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
-                ),
-              ),
-            ],
-          ),
-          home: mockingjay.MockNavigatorProvider(
-              navigator: navigator,
-              child: TransactionCard(transaction: tx, walletId: "wallet id")),
-        ),
-      ),
-    );
-
-    expect(find.byType(GestureDetector), findsOneWidget);
-
-    await tester.tap(find.byType(GestureDetector));
-    await tester.pump();
-
-    verify(mockLocaleService.addListener(any)).called(1);
-
-    verify(mockPrefs.currency).called(2);
-    verify(mockLocaleService.locale).called(4);
-    verify(wallet.coin.ticker).called(1);
-    verify(wallet.storedChainHeight).called(2);
-
-    verifyNoMoreInteractions(wallet);
-    verifyNoMoreInteractions(mockLocaleService);
-
-    if (Util.isDesktop) {
-      expect(find.byType(TransactionDetailsView), findsOneWidget);
-    } else {
-      mockingjay
-          .verify(() => navigator.pushNamed("/transactionDetails",
-              arguments: Tuple3(tx, Coin.firo, "wallet id")))
-          .called(1);
-    }
-  });
-}
+// import 'package:decimal/decimal.dart';
+// import 'package:flutter/material.dart';
+// import 'package:flutter_feather_icons/flutter_feather_icons.dart';
+// import 'package:flutter_riverpod/flutter_riverpod.dart';
+// import 'package:flutter_test/flutter_test.dart';
+// import 'package:mockingjay/mockingjay.dart' as mockingjay;
+// import 'package:mockito/annotations.dart';
+// import 'package:mockito/mockito.dart';
+// import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
+// import 'package:stackwallet/models/isar/models/blockchain_data/transaction.dart';
+// import 'package:stackwallet/models/isar/stack_theme.dart';
+// import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart';
+// import 'package:stackwallet/providers/providers.dart';
+// import 'package:stackwallet/services/coins/coin_service.dart';
+// import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
+// import 'package:stackwallet/services/coins/manager.dart';
+// import 'package:stackwallet/services/locale_service.dart';
+// import 'package:stackwallet/services/notes_service.dart';
+// import 'package:stackwallet/services/price_service.dart';
+// import 'package:stackwallet/services/wallets.dart';
+// import 'package:stackwallet/themes/stack_colors.dart';
+// import 'package:stackwallet/themes/theme_service.dart';
+// import 'package:stackwallet/utilities/amount/amount.dart';
+// import 'package:stackwallet/utilities/enums/coin_enum.dart';
+// import 'package:stackwallet/utilities/prefs.dart';
+// import 'package:stackwallet/utilities/util.dart';
+// import 'package:stackwallet/widgets/transaction_card.dart';
+// import 'package:tuple/tuple.dart';
+//
+// import '../sample_data/theme_json.dart';
+// import 'transaction_card_test.mocks.dart';
+//
+// @GenerateMocks([
+//   Wallets,
+//   Manager,
+//   CoinServiceAPI,
+//   FiroWallet,
+//   LocaleService,
+//   Prefs,
+//   PriceService,
+//   NotesService,
+//   ThemeService,
+// ], customMocks: [])
+// void main() {
+//   TestWidgetsFlutterBinding.ensureInitialized();
+//   testWidgets("Sent confirmed tx displays correctly", (tester) async {
+//     final mockManager = MockManager();
+//     final mockLocaleService = MockLocaleService();
+//     final wallets = MockWallets();
+//     final mockPrefs = MockPrefs();
+//     final mockPriceService = MockPriceService();
+//     final mockThemeService = MockThemeService();
+//
+//     final tx = Transaction(
+//       txid: "some txid",
+//       timestamp: 1648595998,
+//       type: TransactionType.outgoing,
+//       amount: 100000000,
+//       amountString: Amount(
+//         rawValue: BigInt.from(100000000),
+//         fractionDigits: Coin.firo.decimals,
+//       ).toJsonString(),
+//       fee: 3794,
+//       height: 450123,
+//       subType: TransactionSubType.none,
+//       isCancelled: false,
+//       walletId: '',
+//       isLelantus: null,
+//       slateId: '',
+//       otherData: '',
+//       nonce: null,
+//       inputs: [],
+//       outputs: [],
+//       numberOfMessages: null,
+//     )..address.value = Address(
+//         walletId: "walletId",
+//         value: "",
+//         publicKey: [],
+//         derivationIndex: 0,
+//         derivationPath: null,
+//         type: AddressType.p2pkh,
+//         subType: AddressSubType.receiving);
+//
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//
+//     when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+//       (_) => StackTheme.fromJson(
+//         json: lightThemeJsonMap,
+//         applicationThemesDirectoryPath: "test",
+//       ),
+//     );
+//     when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
+//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+//     when(mockPrefs.currency).thenAnswer((_) => "USD");
+//     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+//     when(mockPriceService.getPrice(Coin.firo))
+//         .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+//
+//     when(wallet.coin).thenAnswer((_) => Coin.firo);
+//
+//     when(wallets.getManager("wallet-id"))
+//         .thenAnswer((realInvocation) => Manager(wallet));
+//
+//     when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+//     //
+//     await tester.pumpWidget(
+//       ProviderScope(
+//         overrides: [
+//           walletsChangeNotifierProvider.overrideWithValue(wallets),
+//           localeServiceChangeNotifierProvider
+//               .overrideWithValue(mockLocaleService),
+//           pThemeService.overrideWithValue(mockThemeService),
+//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+//           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
+//         ],
+//         child: MaterialApp(
+//           theme: ThemeData(
+//             extensions: [
+//               StackColors.fromStackColorTheme(
+//                 StackTheme.fromJson(
+//                   json: lightThemeJsonMap,
+//                   applicationThemesDirectoryPath: "test",
+//                 ),
+//               ),
+//             ],
+//           ),
+//           home: TransactionCard(transaction: tx, walletId: "wallet-id"),
+//         ),
+//       ),
+//     );
+//
+//     //
+//     final title = find.text("Sent");
+//     // final price1 = find.text("0.00 USD");
+//     final amount = Util.isDesktop
+//         ? find.text("-1.00000000 FIRO")
+//         : find.text("1.00000000 FIRO");
+//
+//     final icon = find.byIcon(FeatherIcons.arrowUp);
+//
+//     expect(title, findsOneWidget);
+//     // expect(price1, findsOneWidget);
+//     expect(amount, findsOneWidget);
+//     // expect(icon, findsOneWidget);
+//     //
+//     await tester.pumpAndSettle(const Duration(seconds: 2));
+//     //
+//     // final price2 = find.text("\$10.00");
+//     // expect(price2, findsOneWidget);
+//     //
+//     // verify(mockManager.addListener(any)).called(1);
+//     verify(mockLocaleService.addListener(any)).called(1);
+//
+//     verify(mockPrefs.currency).called(1);
+//     verify(mockPriceService.getPrice(Coin.firo)).called(1);
+//     verify(wallet.coin.ticker).called(1);
+//
+//     verify(mockLocaleService.locale).called(1);
+//
+//     verifyNoMoreInteractions(mockManager);
+//     verifyNoMoreInteractions(mockLocaleService);
+//   });
+//
+//   testWidgets("Anonymized confirmed tx displays correctly", (tester) async {
+//     final mockManager = MockManager();
+//     final mockLocaleService = MockLocaleService();
+//     final wallets = MockWallets();
+//     final mockPrefs = MockPrefs();
+//     final mockPriceService = MockPriceService();
+//     final mockThemeService = MockThemeService();
+//
+//     final tx = Transaction(
+//       txid: "some txid",
+//       timestamp: 1648595998,
+//       type: TransactionType.outgoing,
+//       amount: 9659,
+//       amountString: Amount(
+//         rawValue: BigInt.from(9659),
+//         fractionDigits: Coin.firo.decimals,
+//       ).toJsonString(),
+//       fee: 3794,
+//       height: 450123,
+//       subType: TransactionSubType.mint,
+//       isCancelled: false,
+//       walletId: '',
+//       isLelantus: null,
+//       slateId: '',
+//       otherData: '',
+//       nonce: null,
+//       inputs: [],
+//       outputs: [],
+//       numberOfMessages: null,
+//     )..address.value = Address(
+//         walletId: "walletId",
+//         value: "",
+//         publicKey: [],
+//         derivationIndex: 0,
+//         derivationPath: null,
+//         type: AddressType.p2pkh,
+//         subType: AddressSubType.receiving);
+//
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//
+//     when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+//       (_) => StackTheme.fromJson(
+//         json: lightThemeJsonMap,
+//         applicationThemesDirectoryPath: "test",
+//       ),
+//     );
+//     when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
+//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+//     when(mockPrefs.currency).thenAnswer((_) => "USD");
+//     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+//     when(mockPriceService.getPrice(Coin.firo))
+//         .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+//
+//     when(wallet.coin).thenAnswer((_) => Coin.firo);
+//     when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+//
+//     when(wallets.getManager("wallet-id"))
+//         .thenAnswer((realInvocation) => Manager(wallet));
+//     //
+//     await tester.pumpWidget(
+//       ProviderScope(
+//         overrides: [
+//           walletsChangeNotifierProvider.overrideWithValue(wallets),
+//           localeServiceChangeNotifierProvider
+//               .overrideWithValue(mockLocaleService),
+//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+//           pThemeService.overrideWithValue(mockThemeService),
+//           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
+//         ],
+//         child: MaterialApp(
+//           theme: ThemeData(
+//             extensions: [
+//               StackColors.fromStackColorTheme(
+//                 StackTheme.fromJson(
+//                   json: lightThemeJsonMap,
+//                   applicationThemesDirectoryPath: "test",
+//                 ),
+//               ),
+//             ],
+//           ),
+//           home: TransactionCard(transaction: tx, walletId: "wallet-id"),
+//         ),
+//       ),
+//     );
+//
+//     //
+//     final title = find.text("Anonymized");
+//     // final price1 = find.text("0.00 USD");
+//     final amount = find.text("-0.00009659 FIRO");
+//
+//     final icon = find.byIcon(FeatherIcons.arrowUp);
+//
+//     expect(title, findsOneWidget);
+//     // expect(price1, findsOneWidget);
+//     expect(amount, findsOneWidget);
+//     // expect(icon, findsOneWidget);
+//     //
+//     await tester.pumpAndSettle(const Duration(seconds: 2));
+//     //
+//     // final price2 = find.text("\$10.00");
+//     // expect(price2, findsOneWidget);
+//     //
+//     // verify(mockManager.addListener(any)).called(1);
+//     verify(mockLocaleService.addListener(any)).called(1);
+//
+//     verify(mockPrefs.currency).called(1);
+//     verify(mockPriceService.getPrice(Coin.firo)).called(1);
+//     verify(wallet.coin.ticker).called(1);
+//
+//     verify(mockLocaleService.locale).called(1);
+//
+//     verifyNoMoreInteractions(mockManager);
+//     verifyNoMoreInteractions(mockLocaleService);
+//   });
+//
+//   testWidgets("Received unconfirmed tx displays correctly", (tester) async {
+//     final mockManager = MockManager();
+//     final mockLocaleService = MockLocaleService();
+//     final wallets = MockWallets();
+//     final mockPrefs = MockPrefs();
+//     final mockPriceService = MockPriceService();
+//     final mockThemeService = MockThemeService();
+//
+//     final tx = Transaction(
+//       txid: "some txid",
+//       timestamp: 1648595998,
+//       type: TransactionType.incoming,
+//       amount: 100000000,
+//       amountString: Amount(
+//         rawValue: BigInt.from(100000000),
+//         fractionDigits: Coin.firo.decimals,
+//       ).toJsonString(),
+//       fee: 3794,
+//       height: 450123,
+//       subType: TransactionSubType.none,
+//       isCancelled: false,
+//       walletId: '',
+//       isLelantus: null,
+//       slateId: '',
+//       otherData: '',
+//       nonce: null,
+//       inputs: [],
+//       outputs: [],
+//       numberOfMessages: null,
+//     )..address.value = Address(
+//         walletId: "walletId",
+//         value: "",
+//         publicKey: [],
+//         derivationIndex: 0,
+//         derivationPath: null,
+//         type: AddressType.p2pkh,
+//         subType: AddressSubType.receiving);
+//
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//
+//     when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+//       (_) => StackTheme.fromJson(
+//         json: lightThemeJsonMap,
+//         applicationThemesDirectoryPath: "test",
+//       ),
+//     );
+//     when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
+//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+//     when(mockPrefs.currency).thenAnswer((_) => "USD");
+//     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+//     when(mockPriceService.getPrice(Coin.firo))
+//         .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+//
+//     when(wallet.coin).thenAnswer((_) => Coin.firo);
+//
+//     when(wallets.getManager("wallet-id"))
+//         .thenAnswer((realInvocation) => Manager(wallet));
+//
+//     when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+//
+//     await tester.pumpWidget(
+//       ProviderScope(
+//         overrides: [
+//           walletsChangeNotifierProvider.overrideWithValue(wallets),
+//           localeServiceChangeNotifierProvider
+//               .overrideWithValue(mockLocaleService),
+//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+//           pThemeService.overrideWithValue(mockThemeService),
+//           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
+//         ],
+//         child: MaterialApp(
+//           theme: ThemeData(
+//             extensions: [
+//               StackColors.fromStackColorTheme(
+//                 StackTheme.fromJson(
+//                   json: lightThemeJsonMap,
+//                   applicationThemesDirectoryPath: "test",
+//                 ),
+//               ),
+//             ],
+//           ),
+//           home: TransactionCard(transaction: tx, walletId: "wallet-id"),
+//         ),
+//       ),
+//     );
+//
+//     final title = find.text("Received");
+//     final amount = Util.isDesktop
+//         ? find.text("+1.00000000 FIRO")
+//         : find.text("1.00000000 FIRO");
+//
+//     expect(title, findsOneWidget);
+//     expect(amount, findsOneWidget);
+//
+//     await tester.pumpAndSettle(const Duration(seconds: 2));
+//
+//     verify(mockLocaleService.addListener(any)).called(1);
+//
+//     verify(mockPrefs.currency).called(1);
+//     verify(mockPriceService.getPrice(Coin.firo)).called(1);
+//     verify(wallet.coin.ticker).called(1);
+//
+//     verify(mockLocaleService.locale).called(1);
+//
+//     verifyNoMoreInteractions(mockManager);
+//     verifyNoMoreInteractions(mockLocaleService);
+//   });
+//
+//   testWidgets("Tap gesture", (tester) async {
+//     final mockManager = MockManager();
+//     final mockLocaleService = MockLocaleService();
+//     final wallets = MockWallets();
+//     final mockPrefs = MockPrefs();
+//     final mockPriceService = MockPriceService();
+//     final mockThemeService = MockThemeService();
+//     final navigator = mockingjay.MockNavigator();
+//
+//     final tx = Transaction(
+//       txid: "some txid",
+//       timestamp: 1648595998,
+//       type: TransactionType.outgoing,
+//       amount: 100000000,
+//       amountString: Amount(
+//         rawValue: BigInt.from(100000000),
+//         fractionDigits: Coin.firo.decimals,
+//       ).toJsonString(),
+//       fee: 3794,
+//       height: 450123,
+//       subType: TransactionSubType.none,
+//       isCancelled: false,
+//       walletId: '',
+//       isLelantus: null,
+//       slateId: '',
+//       otherData: '',
+//       nonce: null,
+//       inputs: [],
+//       outputs: [],
+//       numberOfMessages: null,
+//     )..address.value = Address(
+//         walletId: "walletId",
+//         value: "",
+//         publicKey: [],
+//         derivationIndex: 0,
+//         derivationPath: null,
+//         type: AddressType.p2pkh,
+//         subType: AddressSubType.receiving);
+//
+//     final CoinServiceAPI wallet = MockFiroWallet();
+//
+//     when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+//       (_) => StackTheme.fromJson(
+//         json: lightThemeJsonMap,
+//         applicationThemesDirectoryPath: "test",
+//       ),
+//     );
+//     when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
+//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+//     when(mockPrefs.currency).thenAnswer((_) => "USD");
+//     when(mockPrefs.externalCalls).thenAnswer((_) => true);
+//     when(mockPriceService.getPrice(Coin.firo))
+//         .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+//
+//     when(wallet.coin).thenAnswer((_) => Coin.firo);
+//
+//     when(wallets.getManager("wallet id"))
+//         .thenAnswer((realInvocation) => Manager(wallet));
+//
+//     when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+//
+//     mockingjay
+//         .when(() => navigator.pushNamed("/transactionDetails",
+//             arguments: Tuple3(tx, Coin.firo, "wallet id")))
+//         .thenAnswer((_) async => {});
+//
+//     await tester.pumpWidget(
+//       ProviderScope(
+//         overrides: [
+//           walletsChangeNotifierProvider.overrideWithValue(wallets),
+//           localeServiceChangeNotifierProvider
+//               .overrideWithValue(mockLocaleService),
+//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+//           pThemeService.overrideWithValue(mockThemeService),
+//           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
+//         ],
+//         child: MaterialApp(
+//           theme: ThemeData(
+//             extensions: [
+//               StackColors.fromStackColorTheme(
+//                 StackTheme.fromJson(
+//                   json: lightThemeJsonMap,
+//                   applicationThemesDirectoryPath: "test",
+//                 ),
+//               ),
+//             ],
+//           ),
+//           home: mockingjay.MockNavigatorProvider(
+//               navigator: navigator,
+//               child: TransactionCard(transaction: tx, walletId: "wallet id")),
+//         ),
+//       ),
+//     );
+//
+//     expect(find.byType(GestureDetector), findsOneWidget);
+//
+//     await tester.tap(find.byType(GestureDetector));
+//     await tester.pump();
+//
+//     verify(mockLocaleService.addListener(any)).called(1);
+//
+//     verify(mockPrefs.currency).called(2);
+//     verify(mockLocaleService.locale).called(4);
+//     verify(wallet.coin.ticker).called(1);
+//     verify(wallet.storedChainHeight).called(2);
+//
+//     verifyNoMoreInteractions(wallet);
+//     verifyNoMoreInteractions(mockLocaleService);
+//
+//     if (Util.isDesktop) {
+//       expect(find.byType(TransactionDetailsView), findsOneWidget);
+//     } else {
+//       mockingjay
+//           .verify(() => navigator.pushNamed("/transactionDetails",
+//               arguments: Tuple3(tx, Coin.firo, "wallet id")))
+//           .called(1);
+//     }
+//   });
+// }
diff --git a/test/widget_tests/transaction_card_test.mocks.dart b/test/widget_tests/transaction_card_test.mocks.dart
deleted file mode 100644
index 93cc0c9a7..000000000
--- a/test/widget_tests/transaction_card_test.mocks.dart
+++ /dev/null
@@ -1,2921 +0,0 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/widget_tests/transaction_card_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i18;
-import 'dart:typed_data' as _i32;
-import 'dart:ui' as _i20;
-
-import 'package:decimal/decimal.dart' as _i28;
-import 'package:flutter/foundation.dart' as _i4;
-import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i14;
-import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i13;
-import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i12;
-import 'package:stackwallet/models/balance.dart' as _i9;
-import 'package:stackwallet/models/isar/models/isar_models.dart' as _i21;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i31;
-import 'package:stackwallet/models/models.dart' as _i8;
-import 'package:stackwallet/models/signing_data.dart' as _i23;
-import 'package:stackwallet/services/coins/coin_service.dart' as _i7;
-import 'package:stackwallet/services/coins/firo/firo_wallet.dart' as _i22;
-import 'package:stackwallet/services/coins/manager.dart' as _i6;
-import 'package:stackwallet/services/locale_service.dart' as _i24;
-import 'package:stackwallet/services/node_service.dart' as _i3;
-import 'package:stackwallet/services/notes_service.dart' as _i29;
-import 'package:stackwallet/services/price_service.dart' as _i27;
-import 'package:stackwallet/services/transaction_notification_tracker.dart'
-    as _i11;
-import 'package:stackwallet/services/wallets.dart' as _i16;
-import 'package:stackwallet/services/wallets_service.dart' as _i2;
-import 'package:stackwallet/themes/theme_service.dart' as _i30;
-import 'package:stackwallet/utilities/amount/amount.dart' as _i10;
-import 'package:stackwallet/utilities/enums/backup_frequency_type.dart' as _i26;
-import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i17;
-import 'package:stackwallet/utilities/enums/sync_type_enum.dart' as _i25;
-import 'package:stackwallet/utilities/prefs.dart' as _i19;
-import 'package:tuple/tuple.dart' as _i15;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeWalletsService_0 extends _i1.SmartFake
-    implements _i2.WalletsService {
-  _FakeWalletsService_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeNodeService_1 extends _i1.SmartFake implements _i3.NodeService {
-  _FakeNodeService_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeChangeNotifierProvider_2<Notifier extends _i4.ChangeNotifier?>
-    extends _i1.SmartFake implements _i5.ChangeNotifierProvider<Notifier> {
-  _FakeChangeNotifierProvider_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
-  _FakeManager_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeCoinServiceAPI_4 extends _i1.SmartFake
-    implements _i7.CoinServiceAPI {
-  _FakeCoinServiceAPI_4(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
-  _FakeFeeObject_5(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeBalance_6 extends _i1.SmartFake implements _i9.Balance {
-  _FakeBalance_6(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeAmount_7 extends _i1.SmartFake implements _i10.Amount {
-  _FakeAmount_7(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeTransactionNotificationTracker_8 extends _i1.SmartFake
-    implements _i11.TransactionNotificationTracker {
-  _FakeTransactionNotificationTracker_8(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeElectrumX_9 extends _i1.SmartFake implements _i12.ElectrumX {
-  _FakeElectrumX_9(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeCachedElectrumX_10 extends _i1.SmartFake
-    implements _i13.CachedElectrumX {
-  _FakeCachedElectrumX_10(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeMainDB_11 extends _i1.SmartFake implements _i14.MainDB {
-  _FakeMainDB_11(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeDuration_12 extends _i1.SmartFake implements Duration {
-  _FakeDuration_12(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeTuple2_13<T1, T2> extends _i1.SmartFake
-    implements _i15.Tuple2<T1, T2> {
-  _FakeTuple2_13(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [Wallets].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockWallets extends _i1.Mock implements _i16.Wallets {
-  MockWallets() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i2.WalletsService get walletsService => (super.noSuchMethod(
-        Invocation.getter(#walletsService),
-        returnValue: _FakeWalletsService_0(
-          this,
-          Invocation.getter(#walletsService),
-        ),
-      ) as _i2.WalletsService);
-  @override
-  set walletsService(_i2.WalletsService? _walletsService) => super.noSuchMethod(
-        Invocation.setter(
-          #walletsService,
-          _walletsService,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i3.NodeService get nodeService => (super.noSuchMethod(
-        Invocation.getter(#nodeService),
-        returnValue: _FakeNodeService_1(
-          this,
-          Invocation.getter(#nodeService),
-        ),
-      ) as _i3.NodeService);
-  @override
-  set nodeService(_i3.NodeService? _nodeService) => super.noSuchMethod(
-        Invocation.setter(
-          #nodeService,
-          _nodeService,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasWallets => (super.noSuchMethod(
-        Invocation.getter(#hasWallets),
-        returnValue: false,
-      ) as bool);
-  @override
-  List<_i5.ChangeNotifierProvider<_i6.Manager>> get managerProviders =>
-      (super.noSuchMethod(
-        Invocation.getter(#managerProviders),
-        returnValue: <_i5.ChangeNotifierProvider<_i6.Manager>>[],
-      ) as List<_i5.ChangeNotifierProvider<_i6.Manager>>);
-  @override
-  List<_i6.Manager> get managers => (super.noSuchMethod(
-        Invocation.getter(#managers),
-        returnValue: <_i6.Manager>[],
-      ) as List<_i6.Manager>);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  List<String> getWalletIdsFor({required _i17.Coin? coin}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getWalletIdsFor,
-          [],
-          {#coin: coin},
-        ),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  List<_i15.Tuple2<_i17.Coin, List<_i5.ChangeNotifierProvider<_i6.Manager>>>>
-      getManagerProvidersByCoin() => (super.noSuchMethod(
-            Invocation.method(
-              #getManagerProvidersByCoin,
-              [],
-            ),
-            returnValue: <
-                _i15.Tuple2<_i17.Coin,
-                    List<_i5.ChangeNotifierProvider<_i6.Manager>>>>[],
-          ) as List<
-              _i15.Tuple2<_i17.Coin,
-                  List<_i5.ChangeNotifierProvider<_i6.Manager>>>>);
-  @override
-  List<_i5.ChangeNotifierProvider<_i6.Manager>> getManagerProvidersForCoin(
-          _i17.Coin? coin) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getManagerProvidersForCoin,
-          [coin],
-        ),
-        returnValue: <_i5.ChangeNotifierProvider<_i6.Manager>>[],
-      ) as List<_i5.ChangeNotifierProvider<_i6.Manager>>);
-  @override
-  _i5.ChangeNotifierProvider<_i6.Manager> getManagerProvider(
-          String? walletId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getManagerProvider,
-          [walletId],
-        ),
-        returnValue: _FakeChangeNotifierProvider_2<_i6.Manager>(
-          this,
-          Invocation.method(
-            #getManagerProvider,
-            [walletId],
-          ),
-        ),
-      ) as _i5.ChangeNotifierProvider<_i6.Manager>);
-  @override
-  _i6.Manager getManager(String? walletId) => (super.noSuchMethod(
-        Invocation.method(
-          #getManager,
-          [walletId],
-        ),
-        returnValue: _FakeManager_3(
-          this,
-          Invocation.method(
-            #getManager,
-            [walletId],
-          ),
-        ),
-      ) as _i6.Manager);
-  @override
-  void addWallet({
-    required String? walletId,
-    required _i6.Manager? manager,
-  }) =>
-      super.noSuchMethod(
-        Invocation.method(
-          #addWallet,
-          [],
-          {
-            #walletId: walletId,
-            #manager: manager,
-          },
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeWallet({required String? walletId}) => super.noSuchMethod(
-        Invocation.method(
-          #removeWallet,
-          [],
-          {#walletId: walletId},
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i18.Future<void> load(_i19.Prefs? prefs) => (super.noSuchMethod(
-        Invocation.method(
-          #load,
-          [prefs],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> loadAfterStackRestore(
-    _i19.Prefs? prefs,
-    List<_i6.Manager>? managers,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #loadAfterStackRestore,
-          [
-            prefs,
-            managers,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [Manager].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockManager extends _i1.Mock implements _i6.Manager {
-  MockManager() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  bool get isActiveWallet => (super.noSuchMethod(
-        Invocation.getter(#isActiveWallet),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isActiveWallet(bool? isActive) => super.noSuchMethod(
-        Invocation.setter(
-          #isActiveWallet,
-          isActive,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i7.CoinServiceAPI get wallet => (super.noSuchMethod(
-        Invocation.getter(#wallet),
-        returnValue: _FakeCoinServiceAPI_4(
-          this,
-          Invocation.getter(#wallet),
-        ),
-      ) as _i7.CoinServiceAPI);
-  @override
-  bool get hasBackgroundRefreshListener => (super.noSuchMethod(
-        Invocation.getter(#hasBackgroundRefreshListener),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i17.Coin get coin => (super.noSuchMethod(
-        Invocation.getter(#coin),
-        returnValue: _i17.Coin.bitcoin,
-      ) as _i17.Coin);
-  @override
-  bool get isRefreshing => (super.noSuchMethod(
-        Invocation.getter(#isRefreshing),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get shouldAutoSync => (super.noSuchMethod(
-        Invocation.getter(#shouldAutoSync),
-        returnValue: false,
-      ) as bool);
-  @override
-  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
-        Invocation.setter(
-          #shouldAutoSync,
-          shouldAutoSync,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isFavorite => (super.noSuchMethod(
-        Invocation.getter(#isFavorite),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isFavorite(bool? markFavorite) => super.noSuchMethod(
-        Invocation.setter(
-          #isFavorite,
-          markFavorite,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i18.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
-        Invocation.getter(#fees),
-        returnValue: _i18.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
-          this,
-          Invocation.getter(#fees),
-        )),
-      ) as _i18.Future<_i8.FeeObject>);
-  @override
-  _i18.Future<int> get maxFee => (super.noSuchMethod(
-        Invocation.getter(#maxFee),
-        returnValue: _i18.Future<int>.value(0),
-      ) as _i18.Future<int>);
-  @override
-  _i18.Future<String> get currentReceivingAddress => (super.noSuchMethod(
-        Invocation.getter(#currentReceivingAddress),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  _i9.Balance get balance => (super.noSuchMethod(
-        Invocation.getter(#balance),
-        returnValue: _FakeBalance_6(
-          this,
-          Invocation.getter(#balance),
-        ),
-      ) as _i9.Balance);
-  @override
-  _i18.Future<List<_i21.Transaction>> get transactions => (super.noSuchMethod(
-        Invocation.getter(#transactions),
-        returnValue:
-            _i18.Future<List<_i21.Transaction>>.value(<_i21.Transaction>[]),
-      ) as _i18.Future<List<_i21.Transaction>>);
-  @override
-  _i18.Future<List<_i21.UTXO>> get utxos => (super.noSuchMethod(
-        Invocation.getter(#utxos),
-        returnValue: _i18.Future<List<_i21.UTXO>>.value(<_i21.UTXO>[]),
-      ) as _i18.Future<List<_i21.UTXO>>);
-  @override
-  set walletName(String? newName) => super.noSuchMethod(
-        Invocation.setter(
-          #walletName,
-          newName,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get walletName => (super.noSuchMethod(
-        Invocation.getter(#walletName),
-        returnValue: '',
-      ) as String);
-  @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
-  @override
-  _i18.Future<List<String>> get mnemonic => (super.noSuchMethod(
-        Invocation.getter(#mnemonic),
-        returnValue: _i18.Future<List<String>>.value(<String>[]),
-      ) as _i18.Future<List<String>>);
-  @override
-  _i18.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
-        Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i18.Future<String?>.value(),
-      ) as _i18.Future<String?>);
-  @override
-  bool get isConnected => (super.noSuchMethod(
-        Invocation.getter(#isConnected),
-        returnValue: false,
-      ) as bool);
-  @override
-  int get currentHeight => (super.noSuchMethod(
-        Invocation.getter(#currentHeight),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get hasPaynymSupport => (super.noSuchMethod(
-        Invocation.getter(#hasPaynymSupport),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get hasCoinControlSupport => (super.noSuchMethod(
-        Invocation.getter(#hasCoinControlSupport),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get hasTokenSupport => (super.noSuchMethod(
-        Invocation.getter(#hasTokenSupport),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get hasWhirlpoolSupport => (super.noSuchMethod(
-        Invocation.getter(#hasWhirlpoolSupport),
-        returnValue: false,
-      ) as bool);
-  @override
-  int get rescanOnOpenVersion => (super.noSuchMethod(
-        Invocation.getter(#rescanOnOpenVersion),
-        returnValue: 0,
-      ) as int);
-  @override
-  bool get hasXPub => (super.noSuchMethod(
-        Invocation.getter(#hasXPub),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<String> get xpub => (super.noSuchMethod(
-        Invocation.getter(#xpub),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
-        Invocation.method(
-          #updateNode,
-          [shouldRefresh],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i18.Future<Map<String, dynamic>> prepareSend({
-    required String? address,
-    required _i10.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareSend,
-          [],
-          {
-            #address: address,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i18.Future<Map<String, dynamic>>);
-  @override
-  _i18.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #confirmSend,
-          [],
-          {#txData: txData},
-        ),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  _i18.Future<void> refresh() => (super.noSuchMethod(
-        Invocation.method(
-          #refresh,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  bool validateAddress(String? address) => (super.noSuchMethod(
-        Invocation.method(
-          #validateAddress,
-          [address],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<bool> testNetworkConnection() => (super.noSuchMethod(
-        Invocation.method(
-          #testNetworkConnection,
-          [],
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
-  @override
-  _i18.Future<void> initializeNew() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeNew,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> initializeExisting() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeExisting,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> recoverFromMnemonic({
-    required String? mnemonic,
-    String? mnemonicPassphrase,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required int? height,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #recoverFromMnemonic,
-          [],
-          {
-            #mnemonic: mnemonic,
-            #mnemonicPassphrase: mnemonicPassphrase,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #height: height,
-          },
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> exitCurrentWallet() => (super.noSuchMethod(
-        Invocation.method(
-          #exitCurrentWallet,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> fullRescan(
-    int? maxUnusedAddressGap,
-    int? maxNumberOfIndexesToCheck,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fullRescan,
-          [
-            maxUnusedAddressGap,
-            maxNumberOfIndexesToCheck,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<_i10.Amount> estimateFeeFor(
-    _i10.Amount? amount,
-    int? feeRate,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFeeFor,
-          [
-            amount,
-            feeRate,
-          ],
-        ),
-        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
-          this,
-          Invocation.method(
-            #estimateFeeFor,
-            [
-              amount,
-              feeRate,
-            ],
-          ),
-        )),
-      ) as _i18.Future<_i10.Amount>);
-  @override
-  _i18.Future<bool> generateNewAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #generateNewAddress,
-          [],
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
-  @override
-  _i18.Future<void> resetRescanOnOpen() => (super.noSuchMethod(
-        Invocation.method(
-          #resetRescanOnOpen,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [CoinServiceAPI].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockCoinServiceAPI extends _i1.Mock implements _i7.CoinServiceAPI {
-  MockCoinServiceAPI() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #onIsActiveWalletChanged,
-          _onIsActiveWalletChanged,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i17.Coin get coin => (super.noSuchMethod(
-        Invocation.getter(#coin),
-        returnValue: _i17.Coin.bitcoin,
-      ) as _i17.Coin);
-  @override
-  bool get isRefreshing => (super.noSuchMethod(
-        Invocation.getter(#isRefreshing),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get shouldAutoSync => (super.noSuchMethod(
-        Invocation.getter(#shouldAutoSync),
-        returnValue: false,
-      ) as bool);
-  @override
-  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
-        Invocation.setter(
-          #shouldAutoSync,
-          shouldAutoSync,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isFavorite => (super.noSuchMethod(
-        Invocation.getter(#isFavorite),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isFavorite(bool? markFavorite) => super.noSuchMethod(
-        Invocation.setter(
-          #isFavorite,
-          markFavorite,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i18.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
-        Invocation.getter(#fees),
-        returnValue: _i18.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
-          this,
-          Invocation.getter(#fees),
-        )),
-      ) as _i18.Future<_i8.FeeObject>);
-  @override
-  _i18.Future<int> get maxFee => (super.noSuchMethod(
-        Invocation.getter(#maxFee),
-        returnValue: _i18.Future<int>.value(0),
-      ) as _i18.Future<int>);
-  @override
-  _i18.Future<String> get currentReceivingAddress => (super.noSuchMethod(
-        Invocation.getter(#currentReceivingAddress),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  _i9.Balance get balance => (super.noSuchMethod(
-        Invocation.getter(#balance),
-        returnValue: _FakeBalance_6(
-          this,
-          Invocation.getter(#balance),
-        ),
-      ) as _i9.Balance);
-  @override
-  _i18.Future<List<_i21.Transaction>> get transactions => (super.noSuchMethod(
-        Invocation.getter(#transactions),
-        returnValue:
-            _i18.Future<List<_i21.Transaction>>.value(<_i21.Transaction>[]),
-      ) as _i18.Future<List<_i21.Transaction>>);
-  @override
-  _i18.Future<List<_i21.UTXO>> get utxos => (super.noSuchMethod(
-        Invocation.getter(#utxos),
-        returnValue: _i18.Future<List<_i21.UTXO>>.value(<_i21.UTXO>[]),
-      ) as _i18.Future<List<_i21.UTXO>>);
-  @override
-  set walletName(String? newName) => super.noSuchMethod(
-        Invocation.setter(
-          #walletName,
-          newName,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get walletName => (super.noSuchMethod(
-        Invocation.getter(#walletName),
-        returnValue: '',
-      ) as String);
-  @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
-  @override
-  _i18.Future<List<String>> get mnemonic => (super.noSuchMethod(
-        Invocation.getter(#mnemonic),
-        returnValue: _i18.Future<List<String>>.value(<String>[]),
-      ) as _i18.Future<List<String>>);
-  @override
-  _i18.Future<String?> get mnemonicString => (super.noSuchMethod(
-        Invocation.getter(#mnemonicString),
-        returnValue: _i18.Future<String?>.value(),
-      ) as _i18.Future<String?>);
-  @override
-  _i18.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
-        Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i18.Future<String?>.value(),
-      ) as _i18.Future<String?>);
-  @override
-  bool get hasCalledExit => (super.noSuchMethod(
-        Invocation.getter(#hasCalledExit),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get isConnected => (super.noSuchMethod(
-        Invocation.getter(#isConnected),
-        returnValue: false,
-      ) as bool);
-  @override
-  int get storedChainHeight => (super.noSuchMethod(
-        Invocation.getter(#storedChainHeight),
-        returnValue: 0,
-      ) as int);
-  @override
-  _i18.Future<Map<String, dynamic>> prepareSend({
-    required String? address,
-    required _i10.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareSend,
-          [],
-          {
-            #address: address,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i18.Future<Map<String, dynamic>>);
-  @override
-  _i18.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #confirmSend,
-          [],
-          {#txData: txData},
-        ),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  _i18.Future<void> refresh() => (super.noSuchMethod(
-        Invocation.method(
-          #refresh,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
-        Invocation.method(
-          #updateNode,
-          [shouldRefresh],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  bool validateAddress(String? address) => (super.noSuchMethod(
-        Invocation.method(
-          #validateAddress,
-          [address],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<bool> testNetworkConnection() => (super.noSuchMethod(
-        Invocation.method(
-          #testNetworkConnection,
-          [],
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
-  @override
-  _i18.Future<void> recoverFromMnemonic({
-    required String? mnemonic,
-    String? mnemonicPassphrase,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required int? height,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #recoverFromMnemonic,
-          [],
-          {
-            #mnemonic: mnemonic,
-            #mnemonicPassphrase: mnemonicPassphrase,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #height: height,
-          },
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> initializeNew() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeNew,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> initializeExisting() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeExisting,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> exit() => (super.noSuchMethod(
-        Invocation.method(
-          #exit,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> fullRescan(
-    int? maxUnusedAddressGap,
-    int? maxNumberOfIndexesToCheck,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fullRescan,
-          [
-            maxUnusedAddressGap,
-            maxNumberOfIndexesToCheck,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<_i10.Amount> estimateFeeFor(
-    _i10.Amount? amount,
-    int? feeRate,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFeeFor,
-          [
-            amount,
-            feeRate,
-          ],
-        ),
-        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
-          this,
-          Invocation.method(
-            #estimateFeeFor,
-            [
-              amount,
-              feeRate,
-            ],
-          ),
-        )),
-      ) as _i18.Future<_i10.Amount>);
-  @override
-  _i18.Future<bool> generateNewAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #generateNewAddress,
-          [],
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
-  @override
-  _i18.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateSentCachedTxData,
-          [txData],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-}
-
-/// A class which mocks [FiroWallet].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockFiroWallet extends _i1.Mock implements _i22.FiroWallet {
-  MockFiroWallet() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  set timer(_i18.Timer? _timer) => super.noSuchMethod(
-        Invocation.setter(
-          #timer,
-          _timer,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i11.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
-        Invocation.getter(#txTracker),
-        returnValue: _FakeTransactionNotificationTracker_8(
-          this,
-          Invocation.getter(#txTracker),
-        ),
-      ) as _i11.TransactionNotificationTracker);
-  @override
-  set txTracker(_i11.TransactionNotificationTracker? _txTracker) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #txTracker,
-          _txTracker,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get refreshMutex => (super.noSuchMethod(
-        Invocation.getter(#refreshMutex),
-        returnValue: false,
-      ) as bool);
-  @override
-  set refreshMutex(bool? _refreshMutex) => super.noSuchMethod(
-        Invocation.setter(
-          #refreshMutex,
-          _refreshMutex,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get longMutex => (super.noSuchMethod(
-        Invocation.getter(#longMutex),
-        returnValue: false,
-      ) as bool);
-  @override
-  set longMutex(bool? _longMutex) => super.noSuchMethod(
-        Invocation.setter(
-          #longMutex,
-          _longMutex,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isActive => (super.noSuchMethod(
-        Invocation.getter(#isActive),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isActive(bool? _isActive) => super.noSuchMethod(
-        Invocation.setter(
-          #isActive,
-          _isActive,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get shouldAutoSync => (super.noSuchMethod(
-        Invocation.getter(#shouldAutoSync),
-        returnValue: false,
-      ) as bool);
-  @override
-  set shouldAutoSync(bool? shouldAutoSync) => super.noSuchMethod(
-        Invocation.setter(
-          #shouldAutoSync,
-          shouldAutoSync,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set isFavorite(bool? markFavorite) => super.noSuchMethod(
-        Invocation.setter(
-          #isFavorite,
-          markFavorite,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isFavorite => (super.noSuchMethod(
-        Invocation.getter(#isFavorite),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i17.Coin get coin => (super.noSuchMethod(
-        Invocation.getter(#coin),
-        returnValue: _i17.Coin.bitcoin,
-      ) as _i17.Coin);
-  @override
-  _i18.Future<List<String>> get mnemonic => (super.noSuchMethod(
-        Invocation.getter(#mnemonic),
-        returnValue: _i18.Future<List<String>>.value(<String>[]),
-      ) as _i18.Future<List<String>>);
-  @override
-  _i18.Future<String?> get mnemonicString => (super.noSuchMethod(
-        Invocation.getter(#mnemonicString),
-        returnValue: _i18.Future<String?>.value(),
-      ) as _i18.Future<String?>);
-  @override
-  _i18.Future<String?> get mnemonicPassphrase => (super.noSuchMethod(
-        Invocation.getter(#mnemonicPassphrase),
-        returnValue: _i18.Future<String?>.value(),
-      ) as _i18.Future<String?>);
-  @override
-  _i18.Future<int> get maxFee => (super.noSuchMethod(
-        Invocation.getter(#maxFee),
-        returnValue: _i18.Future<int>.value(0),
-      ) as _i18.Future<int>);
-  @override
-  _i18.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
-        Invocation.getter(#fees),
-        returnValue: _i18.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
-          this,
-          Invocation.getter(#fees),
-        )),
-      ) as _i18.Future<_i8.FeeObject>);
-  @override
-  _i18.Future<String> get currentReceivingAddress => (super.noSuchMethod(
-        Invocation.getter(#currentReceivingAddress),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  _i18.Future<String> get currentChangeAddress => (super.noSuchMethod(
-        Invocation.getter(#currentChangeAddress),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  String get walletName => (super.noSuchMethod(
-        Invocation.getter(#walletName),
-        returnValue: '',
-      ) as String);
-  @override
-  set walletName(String? newName) => super.noSuchMethod(
-        Invocation.setter(
-          #walletName,
-          newName,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
-  @override
-  bool get isConnected => (super.noSuchMethod(
-        Invocation.getter(#isConnected),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i12.ElectrumX get electrumXClient => (super.noSuchMethod(
-        Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_9(
-          this,
-          Invocation.getter(#electrumXClient),
-        ),
-      ) as _i12.ElectrumX);
-  @override
-  _i13.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
-        Invocation.getter(#cachedElectrumXClient),
-        returnValue: _FakeCachedElectrumX_10(
-          this,
-          Invocation.getter(#cachedElectrumXClient),
-        ),
-      ) as _i13.CachedElectrumX);
-  @override
-  bool get isRefreshing => (super.noSuchMethod(
-        Invocation.getter(#isRefreshing),
-        returnValue: false,
-      ) as bool);
-  @override
-  bool get hasCalledExit => (super.noSuchMethod(
-        Invocation.getter(#hasCalledExit),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<int> get chainHeight => (super.noSuchMethod(
-        Invocation.getter(#chainHeight),
-        returnValue: _i18.Future<int>.value(0),
-      ) as _i18.Future<int>);
-  @override
-  int get storedChainHeight => (super.noSuchMethod(
-        Invocation.getter(#storedChainHeight),
-        returnValue: 0,
-      ) as int);
-  @override
-  _i9.Balance get balance => (super.noSuchMethod(
-        Invocation.getter(#balance),
-        returnValue: _FakeBalance_6(
-          this,
-          Invocation.getter(#balance),
-        ),
-      ) as _i9.Balance);
-  @override
-  _i9.Balance get balancePrivate => (super.noSuchMethod(
-        Invocation.getter(#balancePrivate),
-        returnValue: _FakeBalance_6(
-          this,
-          Invocation.getter(#balancePrivate),
-        ),
-      ) as _i9.Balance);
-  @override
-  _i18.Future<List<_i21.UTXO>> get utxos => (super.noSuchMethod(
-        Invocation.getter(#utxos),
-        returnValue: _i18.Future<List<_i21.UTXO>>.value(<_i21.UTXO>[]),
-      ) as _i18.Future<List<_i21.UTXO>>);
-  @override
-  _i18.Future<List<_i21.Transaction>> get transactions => (super.noSuchMethod(
-        Invocation.getter(#transactions),
-        returnValue:
-            _i18.Future<List<_i21.Transaction>>.value(<_i21.Transaction>[]),
-      ) as _i18.Future<List<_i21.Transaction>>);
-  @override
-  _i18.Future<String> get xpub => (super.noSuchMethod(
-        Invocation.getter(#xpub),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  set onIsActiveWalletChanged(void Function(bool)? _onIsActiveWalletChanged) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #onIsActiveWalletChanged,
-          _onIsActiveWalletChanged,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i14.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_11(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i14.MainDB);
-  @override
-  bool validateAddress(String? address) => (super.noSuchMethod(
-        Invocation.method(
-          #validateAddress,
-          [address],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<void> updateSentCachedTxData(Map<String, dynamic>? txData) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateSentCachedTxData,
-          [txData],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<bool> testNetworkConnection() => (super.noSuchMethod(
-        Invocation.method(
-          #testNetworkConnection,
-          [],
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
-  @override
-  void startNetworkAlivePinging() => super.noSuchMethod(
-        Invocation.method(
-          #startNetworkAlivePinging,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void stopNetworkAlivePinging() => super.noSuchMethod(
-        Invocation.method(
-          #stopNetworkAlivePinging,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i18.Future<Map<String, dynamic>> prepareSendPublic({
-    required String? address,
-    required _i10.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareSendPublic,
-          [],
-          {
-            #address: address,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i18.Future<Map<String, dynamic>>);
-  @override
-  _i18.Future<String> confirmSendPublic({dynamic txData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #confirmSendPublic,
-          [],
-          {#txData: txData},
-        ),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  _i18.Future<Map<String, dynamic>> prepareSend({
-    required String? address,
-    required _i10.Amount? amount,
-    Map<String, dynamic>? args,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #prepareSend,
-          [],
-          {
-            #address: address,
-            #amount: amount,
-            #args: args,
-          },
-        ),
-        returnValue:
-            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i18.Future<Map<String, dynamic>>);
-  @override
-  _i18.Future<String> confirmSend({required Map<String, dynamic>? txData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #confirmSend,
-          [],
-          {#txData: txData},
-        ),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  int estimateTxFee({
-    required int? vSize,
-    required int? feeRatePerKB,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateTxFee,
-          [],
-          {
-            #vSize: vSize,
-            #feeRatePerKB: feeRatePerKB,
-          },
-        ),
-        returnValue: 0,
-      ) as int);
-  @override
-  dynamic coinSelection(
-    int? satoshiAmountToSend,
-    int? selectedTxFeeRate,
-    String? _recipientAddress,
-    bool? isSendAll, {
-    int? additionalOutputs = 0,
-    List<_i21.UTXO>? utxos,
-  }) =>
-      super.noSuchMethod(Invocation.method(
-        #coinSelection,
-        [
-          satoshiAmountToSend,
-          selectedTxFeeRate,
-          _recipientAddress,
-          isSendAll,
-        ],
-        {
-          #additionalOutputs: additionalOutputs,
-          #utxos: utxos,
-        },
-      ));
-  @override
-  _i18.Future<List<_i23.SigningData>> fetchBuildTxData(
-          List<_i21.UTXO>? utxosToUse) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchBuildTxData,
-          [utxosToUse],
-        ),
-        returnValue:
-            _i18.Future<List<_i23.SigningData>>.value(<_i23.SigningData>[]),
-      ) as _i18.Future<List<_i23.SigningData>>);
-  @override
-  _i18.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i23.SigningData>? utxoSigningData,
-    required List<String>? recipients,
-    required List<int>? satoshiAmounts,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #buildTransaction,
-          [],
-          {
-            #utxoSigningData: utxoSigningData,
-            #recipients: recipients,
-            #satoshiAmounts: satoshiAmounts,
-          },
-        ),
-        returnValue:
-            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i18.Future<Map<String, dynamic>>);
-  @override
-  _i18.Future<void> updateNode(bool? shouldRefresh) => (super.noSuchMethod(
-        Invocation.method(
-          #updateNode,
-          [shouldRefresh],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> initializeNew() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeNew,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> initializeExisting() => (super.noSuchMethod(
-        Invocation.method(
-          #initializeExisting,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<bool> refreshIfThereIsNewData() => (super.noSuchMethod(
-        Invocation.method(
-          #refreshIfThereIsNewData,
-          [],
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
-  @override
-  _i18.Future<void> getAllTxsToWatch() => (super.noSuchMethod(
-        Invocation.method(
-          #getAllTxsToWatch,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> refresh() => (super.noSuchMethod(
-        Invocation.method(
-          #refresh,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  List<Map<dynamic, _i8.LelantusCoin>> getLelantusCoinMap() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getLelantusCoinMap,
-          [],
-        ),
-        returnValue: <Map<dynamic, _i8.LelantusCoin>>[],
-      ) as List<Map<dynamic, _i8.LelantusCoin>>);
-  @override
-  _i18.Future<void> anonymizeAllPublicFunds() => (super.noSuchMethod(
-        Invocation.method(
-          #anonymizeAllPublicFunds,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<List<Map<String, dynamic>>> createMintsFromAmount(int? total) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #createMintsFromAmount,
-          [total],
-        ),
-        returnValue: _i18.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i18.Future<List<Map<String, dynamic>>>);
-  @override
-  _i18.Future<String> submitHexToNetwork(String? hex) => (super.noSuchMethod(
-        Invocation.method(
-          #submitHexToNetwork,
-          [hex],
-        ),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  _i18.Future<Map<String, dynamic>> buildMintTransaction(
-    List<_i21.UTXO>? utxosToUse,
-    int? satoshisPerRecipient,
-    List<Map<String, dynamic>>? mintsMap,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #buildMintTransaction,
-          [
-            utxosToUse,
-            satoshisPerRecipient,
-            mintsMap,
-          ],
-        ),
-        returnValue:
-            _i18.Future<Map<String, dynamic>>.value(<String, dynamic>{}),
-      ) as _i18.Future<Map<String, dynamic>>);
-  @override
-  _i18.Future<void> checkReceivingAddressForTransactions() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #checkReceivingAddressForTransactions,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> checkChangeAddressForTransactions() => (super.noSuchMethod(
-        Invocation.method(
-          #checkChangeAddressForTransactions,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> fullRescan(
-    int? maxUnusedAddressGap,
-    int? maxNumberOfIndexesToCheck,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fullRescan,
-          [
-            maxUnusedAddressGap,
-            maxNumberOfIndexesToCheck,
-          ],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> recoverFromMnemonic({
-    required String? mnemonic,
-    String? mnemonicPassphrase,
-    required int? maxUnusedAddressGap,
-    required int? maxNumberOfIndexesToCheck,
-    required int? height,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #recoverFromMnemonic,
-          [],
-          {
-            #mnemonic: mnemonic,
-            #mnemonicPassphrase: mnemonicPassphrase,
-            #maxUnusedAddressGap: maxUnusedAddressGap,
-            #maxNumberOfIndexesToCheck: maxNumberOfIndexesToCheck,
-            #height: height,
-          },
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<Map<int, dynamic>> getSetDataMap(int? latestSetId) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getSetDataMap,
-          [latestSetId],
-        ),
-        returnValue: _i18.Future<Map<int, dynamic>>.value(<int, dynamic>{}),
-      ) as _i18.Future<Map<int, dynamic>>);
-  @override
-  _i18.Future<void> getTransactionCacheEarly(List<String>? allAddresses) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getTransactionCacheEarly,
-          [allAddresses],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<List<Map<String, dynamic>>> fetchAnonymitySets() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchAnonymitySets,
-          [],
-        ),
-        returnValue: _i18.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i18.Future<List<Map<String, dynamic>>>);
-  @override
-  _i18.Future<int> getLatestSetId() => (super.noSuchMethod(
-        Invocation.method(
-          #getLatestSetId,
-          [],
-        ),
-        returnValue: _i18.Future<int>.value(0),
-      ) as _i18.Future<int>);
-  @override
-  _i18.Future<List<String>> getUsedCoinSerials() => (super.noSuchMethod(
-        Invocation.method(
-          #getUsedCoinSerials,
-          [],
-        ),
-        returnValue: _i18.Future<List<String>>.value(<String>[]),
-      ) as _i18.Future<List<String>>);
-  @override
-  _i18.Future<void> exit() => (super.noSuchMethod(
-        Invocation.method(
-          #exit,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<dynamic> getCoinsToJoinSplit(int? required) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getCoinsToJoinSplit,
-          [required],
-        ),
-        returnValue: _i18.Future<dynamic>.value(),
-      ) as _i18.Future<dynamic>);
-  @override
-  _i18.Future<int> estimateJoinSplitFee(int? spendAmount) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateJoinSplitFee,
-          [spendAmount],
-        ),
-        returnValue: _i18.Future<int>.value(0),
-      ) as _i18.Future<int>);
-  @override
-  _i18.Future<_i10.Amount> estimateFeeFor(
-    _i10.Amount? amount,
-    int? feeRate,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFeeFor,
-          [
-            amount,
-            feeRate,
-          ],
-        ),
-        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
-          this,
-          Invocation.method(
-            #estimateFeeFor,
-            [
-              amount,
-              feeRate,
-            ],
-          ),
-        )),
-      ) as _i18.Future<_i10.Amount>);
-  @override
-  _i18.Future<_i10.Amount> estimateFeeForPublic(
-    _i10.Amount? amount,
-    int? feeRate,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #estimateFeeForPublic,
-          [
-            amount,
-            feeRate,
-          ],
-        ),
-        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
-          this,
-          Invocation.method(
-            #estimateFeeForPublic,
-            [
-              amount,
-              feeRate,
-            ],
-          ),
-        )),
-      ) as _i18.Future<_i10.Amount>);
-  @override
-  _i10.Amount roughFeeEstimate(
-    int? inputCount,
-    int? outputCount,
-    int? feeRatePerKB,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #roughFeeEstimate,
-          [
-            inputCount,
-            outputCount,
-            feeRatePerKB,
-          ],
-        ),
-        returnValue: _FakeAmount_7(
-          this,
-          Invocation.method(
-            #roughFeeEstimate,
-            [
-              inputCount,
-              outputCount,
-              feeRatePerKB,
-            ],
-          ),
-        ),
-      ) as _i10.Amount);
-  @override
-  _i18.Future<_i10.Amount> sweepAllEstimate(int? feeRate) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #sweepAllEstimate,
-          [feeRate],
-        ),
-        returnValue: _i18.Future<_i10.Amount>.value(_FakeAmount_7(
-          this,
-          Invocation.method(
-            #sweepAllEstimate,
-            [feeRate],
-          ),
-        )),
-      ) as _i18.Future<_i10.Amount>);
-  @override
-  _i18.Future<List<Map<String, dynamic>>> fastFetch(
-          List<String>? allTxHashes) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fastFetch,
-          [allTxHashes],
-        ),
-        returnValue: _i18.Future<List<Map<String, dynamic>>>.value(
-            <Map<String, dynamic>>[]),
-      ) as _i18.Future<List<Map<String, dynamic>>>);
-  @override
-  _i18.Future<Map<_i21.Address, _i21.Transaction>> getJMintTransactions(
-    _i13.CachedElectrumX? cachedClient,
-    List<String>? transactions,
-    _i17.Coin? coin,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getJMintTransactions,
-          [
-            cachedClient,
-            transactions,
-            coin,
-          ],
-        ),
-        returnValue: _i18.Future<Map<_i21.Address, _i21.Transaction>>.value(
-            <_i21.Address, _i21.Transaction>{}),
-      ) as _i18.Future<Map<_i21.Address, _i21.Transaction>>);
-  @override
-  _i18.Future<bool> generateNewAddress() => (super.noSuchMethod(
-        Invocation.method(
-          #generateNewAddress,
-          [],
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
-  @override
-  _i10.Amount availablePrivateBalance() => (super.noSuchMethod(
-        Invocation.method(
-          #availablePrivateBalance,
-          [],
-        ),
-        returnValue: _FakeAmount_7(
-          this,
-          Invocation.method(
-            #availablePrivateBalance,
-            [],
-          ),
-        ),
-      ) as _i10.Amount);
-  @override
-  _i10.Amount availablePublicBalance() => (super.noSuchMethod(
-        Invocation.method(
-          #availablePublicBalance,
-          [],
-        ),
-        returnValue: _FakeAmount_7(
-          this,
-          Invocation.method(
-            #availablePublicBalance,
-            [],
-          ),
-        ),
-      ) as _i10.Amount);
-  @override
-  void initCache(
-    String? walletId,
-    _i17.Coin? coin,
-  ) =>
-      super.noSuchMethod(
-        Invocation.method(
-          #initCache,
-          [
-            walletId,
-            coin,
-          ],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i18.Future<void> updateCachedId(String? id) => (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedId,
-          [id],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  int getCachedChainHeight() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedChainHeight,
-          [],
-        ),
-        returnValue: 0,
-      ) as int);
-  @override
-  _i18.Future<void> updateCachedChainHeight(int? height) => (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedChainHeight,
-          [height],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  bool getCachedIsFavorite() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedIsFavorite,
-          [],
-        ),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<void> updateCachedIsFavorite(bool? isFavorite) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedIsFavorite,
-          [isFavorite],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i9.Balance getCachedBalance() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedBalance,
-          [],
-        ),
-        returnValue: _FakeBalance_6(
-          this,
-          Invocation.method(
-            #getCachedBalance,
-            [],
-          ),
-        ),
-      ) as _i9.Balance);
-  @override
-  _i18.Future<void> updateCachedBalance(_i9.Balance? balance) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedBalance,
-          [balance],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i9.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
-        Invocation.method(
-          #getCachedBalanceSecondary,
-          [],
-        ),
-        returnValue: _FakeBalance_6(
-          this,
-          Invocation.method(
-            #getCachedBalanceSecondary,
-            [],
-          ),
-        ),
-      ) as _i9.Balance);
-  @override
-  _i18.Future<void> updateCachedBalanceSecondary(_i9.Balance? balance) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateCachedBalanceSecondary,
-          [balance],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
-        Invocation.method(
-          #getWalletTokenContractAddresses,
-          [],
-        ),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  _i18.Future<void> updateWalletTokenContractAddresses(
-          List<String>? contractAddresses) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateWalletTokenContractAddresses,
-          [contractAddresses],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  void initWalletDB({_i14.MainDB? mockableOverride}) => super.noSuchMethod(
-        Invocation.method(
-          #initWalletDB,
-          [],
-          {#mockableOverride: mockableOverride},
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void initFiroHive(String? walletId) => super.noSuchMethod(
-        Invocation.method(
-          #initFiroHive,
-          [walletId],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i18.Future<void> firoUpdateJIndex(List<dynamic>? jIndex) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #firoUpdateJIndex,
-          [jIndex],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> firoUpdateLelantusCoins(List<dynamic>? lelantusCoins) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #firoUpdateLelantusCoins,
-          [lelantusCoins],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  int firoGetMintIndex() => (super.noSuchMethod(
-        Invocation.method(
-          #firoGetMintIndex,
-          [],
-        ),
-        returnValue: 0,
-      ) as int);
-  @override
-  _i18.Future<void> firoUpdateMintIndex(int? mintIndex) => (super.noSuchMethod(
-        Invocation.method(
-          #firoUpdateMintIndex,
-          [mintIndex],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-}
-
-/// A class which mocks [LocaleService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockLocaleService extends _i1.Mock implements _i24.LocaleService {
-  MockLocaleService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  String get locale => (super.noSuchMethod(
-        Invocation.getter(#locale),
-        returnValue: '',
-      ) as String);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<void> loadLocale({bool? notify = true}) => (super.noSuchMethod(
-        Invocation.method(
-          #loadLocale,
-          [],
-          {#notify: notify},
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [Prefs].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockPrefs extends _i1.Mock implements _i19.Prefs {
-  MockPrefs() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  bool get isInitialized => (super.noSuchMethod(
-        Invocation.getter(#isInitialized),
-        returnValue: false,
-      ) as bool);
-  @override
-  int get lastUnlockedTimeout => (super.noSuchMethod(
-        Invocation.getter(#lastUnlockedTimeout),
-        returnValue: 0,
-      ) as int);
-  @override
-  set lastUnlockedTimeout(int? lastUnlockedTimeout) => super.noSuchMethod(
-        Invocation.setter(
-          #lastUnlockedTimeout,
-          lastUnlockedTimeout,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get lastUnlocked => (super.noSuchMethod(
-        Invocation.getter(#lastUnlocked),
-        returnValue: 0,
-      ) as int);
-  @override
-  set lastUnlocked(int? lastUnlocked) => super.noSuchMethod(
-        Invocation.setter(
-          #lastUnlocked,
-          lastUnlocked,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get currentNotificationId => (super.noSuchMethod(
-        Invocation.getter(#currentNotificationId),
-        returnValue: 0,
-      ) as int);
-  @override
-  List<String> get walletIdsSyncOnStartup => (super.noSuchMethod(
-        Invocation.getter(#walletIdsSyncOnStartup),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  set walletIdsSyncOnStartup(List<String>? walletIdsSyncOnStartup) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #walletIdsSyncOnStartup,
-          walletIdsSyncOnStartup,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i25.SyncingType get syncType => (super.noSuchMethod(
-        Invocation.getter(#syncType),
-        returnValue: _i25.SyncingType.currentWalletOnly,
-      ) as _i25.SyncingType);
-  @override
-  set syncType(_i25.SyncingType? syncType) => super.noSuchMethod(
-        Invocation.setter(
-          #syncType,
-          syncType,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get wifiOnly => (super.noSuchMethod(
-        Invocation.getter(#wifiOnly),
-        returnValue: false,
-      ) as bool);
-  @override
-  set wifiOnly(bool? wifiOnly) => super.noSuchMethod(
-        Invocation.setter(
-          #wifiOnly,
-          wifiOnly,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get showFavoriteWallets => (super.noSuchMethod(
-        Invocation.getter(#showFavoriteWallets),
-        returnValue: false,
-      ) as bool);
-  @override
-  set showFavoriteWallets(bool? showFavoriteWallets) => super.noSuchMethod(
-        Invocation.setter(
-          #showFavoriteWallets,
-          showFavoriteWallets,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get language => (super.noSuchMethod(
-        Invocation.getter(#language),
-        returnValue: '',
-      ) as String);
-  @override
-  set language(String? newLanguage) => super.noSuchMethod(
-        Invocation.setter(
-          #language,
-          newLanguage,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get currency => (super.noSuchMethod(
-        Invocation.getter(#currency),
-        returnValue: '',
-      ) as String);
-  @override
-  set currency(String? newCurrency) => super.noSuchMethod(
-        Invocation.setter(
-          #currency,
-          newCurrency,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get randomizePIN => (super.noSuchMethod(
-        Invocation.getter(#randomizePIN),
-        returnValue: false,
-      ) as bool);
-  @override
-  set randomizePIN(bool? randomizePIN) => super.noSuchMethod(
-        Invocation.setter(
-          #randomizePIN,
-          randomizePIN,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get useBiometrics => (super.noSuchMethod(
-        Invocation.getter(#useBiometrics),
-        returnValue: false,
-      ) as bool);
-  @override
-  set useBiometrics(bool? useBiometrics) => super.noSuchMethod(
-        Invocation.setter(
-          #useBiometrics,
-          useBiometrics,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasPin => (super.noSuchMethod(
-        Invocation.getter(#hasPin),
-        returnValue: false,
-      ) as bool);
-  @override
-  set hasPin(bool? hasPin) => super.noSuchMethod(
-        Invocation.setter(
-          #hasPin,
-          hasPin,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  int get familiarity => (super.noSuchMethod(
-        Invocation.getter(#familiarity),
-        returnValue: 0,
-      ) as int);
-  @override
-  set familiarity(int? familiarity) => super.noSuchMethod(
-        Invocation.setter(
-          #familiarity,
-          familiarity,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get showTestNetCoins => (super.noSuchMethod(
-        Invocation.getter(#showTestNetCoins),
-        returnValue: false,
-      ) as bool);
-  @override
-  set showTestNetCoins(bool? showTestNetCoins) => super.noSuchMethod(
-        Invocation.setter(
-          #showTestNetCoins,
-          showTestNetCoins,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get isAutoBackupEnabled => (super.noSuchMethod(
-        Invocation.getter(#isAutoBackupEnabled),
-        returnValue: false,
-      ) as bool);
-  @override
-  set isAutoBackupEnabled(bool? isAutoBackupEnabled) => super.noSuchMethod(
-        Invocation.setter(
-          #isAutoBackupEnabled,
-          isAutoBackupEnabled,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set autoBackupLocation(String? autoBackupLocation) => super.noSuchMethod(
-        Invocation.setter(
-          #autoBackupLocation,
-          autoBackupLocation,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i26.BackupFrequencyType get backupFrequencyType => (super.noSuchMethod(
-        Invocation.getter(#backupFrequencyType),
-        returnValue: _i26.BackupFrequencyType.everyTenMinutes,
-      ) as _i26.BackupFrequencyType);
-  @override
-  set backupFrequencyType(_i26.BackupFrequencyType? backupFrequencyType) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #backupFrequencyType,
-          backupFrequencyType,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set lastAutoBackup(DateTime? lastAutoBackup) => super.noSuchMethod(
-        Invocation.setter(
-          #lastAutoBackup,
-          lastAutoBackup,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hideBlockExplorerWarning => (super.noSuchMethod(
-        Invocation.getter(#hideBlockExplorerWarning),
-        returnValue: false,
-      ) as bool);
-  @override
-  set hideBlockExplorerWarning(bool? hideBlockExplorerWarning) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #hideBlockExplorerWarning,
-          hideBlockExplorerWarning,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get gotoWalletOnStartup => (super.noSuchMethod(
-        Invocation.getter(#gotoWalletOnStartup),
-        returnValue: false,
-      ) as bool);
-  @override
-  set gotoWalletOnStartup(bool? gotoWalletOnStartup) => super.noSuchMethod(
-        Invocation.setter(
-          #gotoWalletOnStartup,
-          gotoWalletOnStartup,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  set startupWalletId(String? startupWalletId) => super.noSuchMethod(
-        Invocation.setter(
-          #startupWalletId,
-          startupWalletId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get externalCalls => (super.noSuchMethod(
-        Invocation.getter(#externalCalls),
-        returnValue: false,
-      ) as bool);
-  @override
-  set externalCalls(bool? externalCalls) => super.noSuchMethod(
-        Invocation.setter(
-          #externalCalls,
-          externalCalls,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get enableCoinControl => (super.noSuchMethod(
-        Invocation.getter(#enableCoinControl),
-        returnValue: false,
-      ) as bool);
-  @override
-  set enableCoinControl(bool? enableCoinControl) => super.noSuchMethod(
-        Invocation.setter(
-          #enableCoinControl,
-          enableCoinControl,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get enableSystemBrightness => (super.noSuchMethod(
-        Invocation.getter(#enableSystemBrightness),
-        returnValue: false,
-      ) as bool);
-  @override
-  set enableSystemBrightness(bool? enableSystemBrightness) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #enableSystemBrightness,
-          enableSystemBrightness,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get themeId => (super.noSuchMethod(
-        Invocation.getter(#themeId),
-        returnValue: '',
-      ) as String);
-  @override
-  set themeId(String? themeId) => super.noSuchMethod(
-        Invocation.setter(
-          #themeId,
-          themeId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get systemBrightnessLightThemeId => (super.noSuchMethod(
-        Invocation.getter(#systemBrightnessLightThemeId),
-        returnValue: '',
-      ) as String);
-  @override
-  set systemBrightnessLightThemeId(String? systemBrightnessLightThemeId) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #systemBrightnessLightThemeId,
-          systemBrightnessLightThemeId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  String get systemBrightnessDarkThemeId => (super.noSuchMethod(
-        Invocation.getter(#systemBrightnessDarkThemeId),
-        returnValue: '',
-      ) as String);
-  @override
-  set systemBrightnessDarkThemeId(String? systemBrightnessDarkThemeId) =>
-      super.noSuchMethod(
-        Invocation.setter(
-          #systemBrightnessDarkThemeId,
-          systemBrightnessDarkThemeId,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<void> init() => (super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> incrementCurrentNotificationIndex() => (super.noSuchMethod(
-        Invocation.method(
-          #incrementCurrentNotificationIndex,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<bool> isExternalCallsSet() => (super.noSuchMethod(
-        Invocation.method(
-          #isExternalCallsSet,
-          [],
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
-  @override
-  _i18.Future<void> saveUserID(String? userId) => (super.noSuchMethod(
-        Invocation.method(
-          #saveUserID,
-          [userId],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> saveSignupEpoch(int? signupEpoch) => (super.noSuchMethod(
-        Invocation.method(
-          #saveSignupEpoch,
-          [signupEpoch],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [PriceService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockPriceService extends _i1.Mock implements _i27.PriceService {
-  MockPriceService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  String get baseTicker => (super.noSuchMethod(
-        Invocation.getter(#baseTicker),
-        returnValue: '',
-      ) as String);
-  @override
-  set baseTicker(String? _baseTicker) => super.noSuchMethod(
-        Invocation.setter(
-          #baseTicker,
-          _baseTicker,
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  Set<String> get tokenContractAddressesToCheck => (super.noSuchMethod(
-        Invocation.getter(#tokenContractAddressesToCheck),
-        returnValue: <String>{},
-      ) as Set<String>);
-  @override
-  Duration get updateInterval => (super.noSuchMethod(
-        Invocation.getter(#updateInterval),
-        returnValue: _FakeDuration_12(
-          this,
-          Invocation.getter(#updateInterval),
-        ),
-      ) as Duration);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i15.Tuple2<_i28.Decimal, double> getPrice(_i17.Coin? coin) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getPrice,
-          [coin],
-        ),
-        returnValue: _FakeTuple2_13<_i28.Decimal, double>(
-          this,
-          Invocation.method(
-            #getPrice,
-            [coin],
-          ),
-        ),
-      ) as _i15.Tuple2<_i28.Decimal, double>);
-  @override
-  _i15.Tuple2<_i28.Decimal, double> getTokenPrice(String? contractAddress) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getTokenPrice,
-          [contractAddress],
-        ),
-        returnValue: _FakeTuple2_13<_i28.Decimal, double>(
-          this,
-          Invocation.method(
-            #getTokenPrice,
-            [contractAddress],
-          ),
-        ),
-      ) as _i15.Tuple2<_i28.Decimal, double>);
-  @override
-  _i18.Future<void> updatePrice() => (super.noSuchMethod(
-        Invocation.method(
-          #updatePrice,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  void cancel() => super.noSuchMethod(
-        Invocation.method(
-          #cancel,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void start(bool? rightAway) => super.noSuchMethod(
-        Invocation.method(
-          #start,
-          [rightAway],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [NotesService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockNotesService extends _i1.Mock implements _i29.NotesService {
-  MockNotesService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  String get walletId => (super.noSuchMethod(
-        Invocation.getter(#walletId),
-        returnValue: '',
-      ) as String);
-  @override
-  Map<String, String> get notesSync => (super.noSuchMethod(
-        Invocation.getter(#notesSync),
-        returnValue: <String, String>{},
-      ) as Map<String, String>);
-  @override
-  _i18.Future<Map<String, String>> get notes => (super.noSuchMethod(
-        Invocation.getter(#notes),
-        returnValue: _i18.Future<Map<String, String>>.value(<String, String>{}),
-      ) as _i18.Future<Map<String, String>>);
-  @override
-  bool get hasListeners => (super.noSuchMethod(
-        Invocation.getter(#hasListeners),
-        returnValue: false,
-      ) as bool);
-  @override
-  _i18.Future<Map<String, String>> search(String? text) => (super.noSuchMethod(
-        Invocation.method(
-          #search,
-          [text],
-        ),
-        returnValue: _i18.Future<Map<String, String>>.value(<String, String>{}),
-      ) as _i18.Future<Map<String, String>>);
-  @override
-  _i18.Future<String> getNoteFor({required String? txid}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getNoteFor,
-          [],
-          {#txid: txid},
-        ),
-        returnValue: _i18.Future<String>.value(''),
-      ) as _i18.Future<String>);
-  @override
-  _i18.Future<void> editOrAddNote({
-    required String? txid,
-    required String? note,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #editOrAddNote,
-          [],
-          {
-            #txid: txid,
-            #note: note,
-          },
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> deleteNote({required String? txid}) => (super.noSuchMethod(
-        Invocation.method(
-          #deleteNote,
-          [],
-          {#txid: txid},
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  void addListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #addListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void removeListener(_i20.VoidCallback? listener) => super.noSuchMethod(
-        Invocation.method(
-          #removeListener,
-          [listener],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void dispose() => super.noSuchMethod(
-        Invocation.method(
-          #dispose,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  void notifyListeners() => super.noSuchMethod(
-        Invocation.method(
-          #notifyListeners,
-          [],
-        ),
-        returnValueForMissingStub: null,
-      );
-}
-
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i30.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i14.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_11(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i14.MainDB);
-  @override
-  List<_i31.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i31.StackTheme>[],
-      ) as List<_i31.StackTheme>);
-  @override
-  void init(_i14.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i18.Future<void> install({required _i32.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i18.Future<void>.value(),
-        returnValueForMissingStub: _i18.Future<void>.value(),
-      ) as _i18.Future<void>);
-  @override
-  _i18.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i18.Future<bool>.value(false),
-      ) as _i18.Future<bool>);
-  @override
-  _i18.Future<List<_i30.StackThemeMetaData>> fetchThemes() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i18.Future<List<_i30.StackThemeMetaData>>.value(
-            <_i30.StackThemeMetaData>[]),
-      ) as _i18.Future<List<_i30.StackThemeMetaData>>);
-  @override
-  _i18.Future<_i32.Uint8List> fetchTheme(
-          {required _i30.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i18.Future<_i32.Uint8List>.value(_i32.Uint8List(0)),
-      ) as _i18.Future<_i32.Uint8List>);
-  @override
-  _i31.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i31.StackTheme?);
-}
diff --git a/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart b/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart
index 3278f946f..79a4cbf64 100644
--- a/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart
+++ b/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart
@@ -1,11 +1,10 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.2 from annotations
 // in stackduo/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i23;
-import 'dart:typed_data' as _i29;
-import 'dart:ui' as _i25;
+import 'dart:typed_data' as _i28;
 
 import 'package:bip32/bip32.dart' as _i16;
 import 'package:bip47/bip47.dart' as _i18;
@@ -13,15 +12,15 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackduo/db/main_db.dart' as _i12;
+import 'package:stackduo/db/isar/main_db.dart' as _i12;
 import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
 import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
 import 'package:stackduo/models/balance.dart' as _i11;
 import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackduo/models/node_model.dart' as _i30;
+import 'package:stackduo/models/node_model.dart' as _i29;
 import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
-import 'package:stackduo/models/signing_data.dart' as _i28;
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i26;
+import 'package:stackduo/models/signing_data.dart' as _i27;
+import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i25;
 import 'package:stackduo/services/coins/coin_service.dart' as _i20;
 import 'package:stackduo/services/coins/manager.dart' as _i6;
 import 'package:stackduo/services/node_service.dart' as _i3;
@@ -30,7 +29,7 @@ import 'package:stackduo/services/wallets.dart' as _i21;
 import 'package:stackduo/services/wallets_service.dart' as _i2;
 import 'package:stackduo/utilities/amount/amount.dart' as _i14;
 import 'package:stackduo/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i27;
+import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i26;
 import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
     as _i19;
 import 'package:stackduo/utilities/prefs.dart' as _i24;
@@ -427,7 +426,7 @@ class MockWallets extends _i1.Mock implements _i21.Wallets {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -435,7 +434,7 @@ class MockWallets extends _i1.Mock implements _i21.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -653,7 +652,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -661,7 +660,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -689,7 +688,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
 /// A class which mocks [BitcoinWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
+class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
   MockBitcoinWallet() {
     _i1.throwOnMissingStub(this);
   }
@@ -950,15 +949,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i27.DerivePathType addressType({required String? address}) =>
+  _i26.DerivePathType addressType({required String? address}) =>
       (super.noSuchMethod(
         Invocation.method(
           #addressType,
           [],
           {#address: address},
         ),
-        returnValue: _i27.DerivePathType.bip44,
-      ) as _i27.DerivePathType);
+        returnValue: _i26.DerivePathType.bip44,
+      ) as _i26.DerivePathType);
   @override
   _i23.Future<void> recoverFromMnemonic({
     required String? mnemonic,
@@ -1194,6 +1193,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     required String? recipientAddress,
     required bool? coinControl,
     required bool? isSendAll,
+    int? satsPerVByte,
     int? additionalOutputs = 0,
     List<_i17.UTXO>? utxos,
   }) =>
@@ -1206,12 +1206,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
           #recipientAddress: recipientAddress,
           #coinControl: coinControl,
           #isSendAll: isSendAll,
+          #satsPerVByte: satsPerVByte,
           #additionalOutputs: additionalOutputs,
           #utxos: utxos,
         },
       ));
   @override
-  _i23.Future<List<_i28.SigningData>> fetchBuildTxData(
+  _i23.Future<List<_i27.SigningData>> fetchBuildTxData(
           List<_i17.UTXO>? utxosToUse) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1219,11 +1220,11 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
           [utxosToUse],
         ),
         returnValue:
-            _i23.Future<List<_i28.SigningData>>.value(<_i28.SigningData>[]),
-      ) as _i23.Future<List<_i28.SigningData>>);
+            _i23.Future<List<_i27.SigningData>>.value(<_i27.SigningData>[]),
+      ) as _i23.Future<List<_i27.SigningData>>);
   @override
   _i23.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i28.SigningData>? utxoSigningData,
+    required List<_i27.SigningData>? utxoSigningData,
     required List<String>? recipients,
     required List<int>? satoshiAmounts,
   }) =>
@@ -1512,7 +1513,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
     })?
         prepareSend,
     required _i23.Future<int> Function({required String address})? getTxCount,
-    required _i23.Future<List<_i28.SigningData>> Function(List<_i17.UTXO>)?
+    required _i23.Future<List<_i27.SigningData>> Function(List<_i17.UTXO>)?
         fetchBuildTxData,
     required _i23.Future<void> Function()? refresh,
     required _i23.Future<void> Function()? checkChangeAddressForTransactions,
@@ -1562,7 +1563,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         )),
       ) as _i23.Future<_i16.BIP32>);
   @override
-  _i23.Future<_i29.Uint8List> getPrivateKeyForPaynymReceivingAddress({
+  _i23.Future<_i28.Uint8List> getPrivateKeyForPaynymReceivingAddress({
     required String? paymentCodeString,
     required int? index,
   }) =>
@@ -1575,8 +1576,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
             #index: index,
           },
         ),
-        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i23.Future<_i29.Uint8List>);
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
   @override
   _i23.Future<_i17.Address> currentReceivingPaynymAddress({
     required _i18.PaymentCode? sender,
@@ -1662,14 +1663,14 @@ class MockBitcoinWallet extends _i1.Mock implements _i26.BitcoinWallet {
         )),
       ) as _i23.Future<_i18.PaymentCode>);
   @override
-  _i23.Future<_i29.Uint8List> signWithNotificationKey(_i29.Uint8List? data) =>
+  _i23.Future<_i28.Uint8List> signWithNotificationKey(_i28.Uint8List? data) =>
       (super.noSuchMethod(
         Invocation.method(
           #signWithNotificationKey,
           [data],
         ),
-        returnValue: _i23.Future<_i29.Uint8List>.value(_i29.Uint8List(0)),
-      ) as _i23.Future<_i29.Uint8List>);
+        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
+      ) as _i23.Future<_i28.Uint8List>);
   @override
   _i23.Future<String> signStringWithNotificationKey(String? data) =>
       (super.noSuchMethod(
@@ -1947,15 +1948,15 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         ),
       ) as _i19.SecureStorageInterface);
   @override
-  List<_i30.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i29.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i29.NodeModel>[],
+      ) as List<_i29.NodeModel>);
   @override
-  List<_i30.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i29.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i29.NodeModel>[],
+      ) as List<_i29.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -1973,7 +1974,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
   @override
   _i23.Future<void> setPrimaryNodeFor({
     required _i22.Coin? coin,
-    required _i30.NodeModel? node,
+    required _i29.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -1990,40 +1991,40 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i30.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
+  _i29.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i30.NodeModel?);
+      )) as _i29.NodeModel?);
   @override
-  List<_i30.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
+  List<_i29.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i29.NodeModel>[],
+      ) as List<_i29.NodeModel>);
   @override
-  _i30.NodeModel? getNodeById({required String? id}) =>
+  _i29.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i30.NodeModel?);
+      )) as _i29.NodeModel?);
   @override
-  List<_i30.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
+  List<_i29.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i30.NodeModel>[],
-      ) as List<_i30.NodeModel>);
+        returnValue: <_i29.NodeModel>[],
+      ) as List<_i29.NodeModel>);
   @override
   _i23.Future<void> add(
-    _i30.NodeModel? node,
+    _i29.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2075,7 +2076,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
       ) as _i23.Future<void>);
   @override
   _i23.Future<void> edit(
-    _i30.NodeModel? editedNode,
+    _i29.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2101,7 +2102,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -2109,7 +2110,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -2286,6 +2287,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasTokenSupport => (super.noSuchMethod(
+        Invocation.getter(#hasTokenSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasWhirlpoolSupport => (super.noSuchMethod(
         Invocation.getter(#hasWhirlpoolSupport),
         returnValue: false,
@@ -2489,7 +2495,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -2497,7 +2503,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart b/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
index f76a04c74..cdc37b791 100644
--- a/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
+++ b/test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
@@ -1,11 +1,10 @@
-// Mocks generated by Mockito 5.3.2 from annotations
-// in stackwallet/test/widget_tests/wallet_info_row/wallet_info_row_test.dart.
+// Mocks generated by Mockito 5.4.2 from annotations
+// in stackduo/test/widget_tests/wallet_info_row/wallet_info_row_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i23;
 import 'dart:typed_data' as _i28;
-import 'dart:ui' as _i25;
 
 import 'package:bip32/bip32.dart' as _i16;
 import 'package:bip47/bip47.dart' as _i18;
@@ -13,30 +12,27 @@ import 'package:bitcoindart/bitcoindart.dart' as _i13;
 import 'package:flutter/foundation.dart' as _i4;
 import 'package:flutter_riverpod/flutter_riverpod.dart' as _i5;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:stackwallet/db/isar/main_db.dart' as _i7;
-import 'package:stackwallet/electrumx_rpc/cached_electrumx.dart' as _i11;
-import 'package:stackwallet/electrumx_rpc/electrumx.dart' as _i10;
-import 'package:stackwallet/models/balance.dart' as _i12;
-import 'package:stackwallet/models/isar/models/isar_models.dart' as _i17;
-import 'package:stackwallet/models/isar/stack_theme.dart' as _i27;
-import 'package:stackwallet/models/node_model.dart' as _i32;
-import 'package:stackwallet/models/paymint/fee_object_model.dart' as _i9;
-import 'package:stackwallet/models/signing_data.dart' as _i31;
-import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart' as _i29;
-import 'package:stackwallet/services/coins/coin_service.dart' as _i20;
-import 'package:stackwallet/services/coins/manager.dart' as _i6;
-import 'package:stackwallet/services/node_service.dart' as _i3;
-import 'package:stackwallet/services/transaction_notification_tracker.dart'
-    as _i8;
-import 'package:stackwallet/services/wallets.dart' as _i21;
-import 'package:stackwallet/services/wallets_service.dart' as _i2;
-import 'package:stackwallet/themes/theme_service.dart' as _i26;
-import 'package:stackwallet/utilities/amount/amount.dart' as _i14;
-import 'package:stackwallet/utilities/enums/coin_enum.dart' as _i22;
-import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart' as _i30;
-import 'package:stackwallet/utilities/flutter_secure_storage_interface.dart'
+import 'package:stackduo/db/isar/main_db.dart' as _i12;
+import 'package:stackduo/electrumx_rpc/cached_electrumx.dart' as _i10;
+import 'package:stackduo/electrumx_rpc/electrumx.dart' as _i9;
+import 'package:stackduo/models/balance.dart' as _i11;
+import 'package:stackduo/models/isar/models/isar_models.dart' as _i17;
+import 'package:stackduo/models/node_model.dart' as _i29;
+import 'package:stackduo/models/paymint/fee_object_model.dart' as _i8;
+import 'package:stackduo/models/signing_data.dart' as _i27;
+import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart' as _i25;
+import 'package:stackduo/services/coins/coin_service.dart' as _i20;
+import 'package:stackduo/services/coins/manager.dart' as _i6;
+import 'package:stackduo/services/node_service.dart' as _i3;
+import 'package:stackduo/services/transaction_notification_tracker.dart' as _i7;
+import 'package:stackduo/services/wallets.dart' as _i21;
+import 'package:stackduo/services/wallets_service.dart' as _i2;
+import 'package:stackduo/utilities/amount/amount.dart' as _i14;
+import 'package:stackduo/utilities/enums/coin_enum.dart' as _i22;
+import 'package:stackduo/utilities/enums/derive_path_type_enum.dart' as _i26;
+import 'package:stackduo/utilities/flutter_secure_storage_interface.dart'
     as _i19;
-import 'package:stackwallet/utilities/prefs.dart' as _i24;
+import 'package:stackduo/utilities/prefs.dart' as _i24;
 import 'package:tuple/tuple.dart' as _i15;
 
 // ignore_for_file: type=lint
@@ -92,8 +88,9 @@ class _FakeManager_3 extends _i1.SmartFake implements _i6.Manager {
         );
 }
 
-class _FakeMainDB_4 extends _i1.SmartFake implements _i7.MainDB {
-  _FakeMainDB_4(
+class _FakeTransactionNotificationTracker_4 extends _i1.SmartFake
+    implements _i7.TransactionNotificationTracker {
+  _FakeTransactionNotificationTracker_4(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -102,9 +99,8 @@ class _FakeMainDB_4 extends _i1.SmartFake implements _i7.MainDB {
         );
 }
 
-class _FakeTransactionNotificationTracker_5 extends _i1.SmartFake
-    implements _i8.TransactionNotificationTracker {
-  _FakeTransactionNotificationTracker_5(
+class _FakeFeeObject_5 extends _i1.SmartFake implements _i8.FeeObject {
+  _FakeFeeObject_5(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -113,8 +109,8 @@ class _FakeTransactionNotificationTracker_5 extends _i1.SmartFake
         );
 }
 
-class _FakeFeeObject_6 extends _i1.SmartFake implements _i9.FeeObject {
-  _FakeFeeObject_6(
+class _FakeElectrumX_6 extends _i1.SmartFake implements _i9.ElectrumX {
+  _FakeElectrumX_6(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -123,8 +119,9 @@ class _FakeFeeObject_6 extends _i1.SmartFake implements _i9.FeeObject {
         );
 }
 
-class _FakeElectrumX_7 extends _i1.SmartFake implements _i10.ElectrumX {
-  _FakeElectrumX_7(
+class _FakeCachedElectrumX_7 extends _i1.SmartFake
+    implements _i10.CachedElectrumX {
+  _FakeCachedElectrumX_7(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -133,9 +130,8 @@ class _FakeElectrumX_7 extends _i1.SmartFake implements _i10.ElectrumX {
         );
 }
 
-class _FakeCachedElectrumX_8 extends _i1.SmartFake
-    implements _i11.CachedElectrumX {
-  _FakeCachedElectrumX_8(
+class _FakeBalance_8 extends _i1.SmartFake implements _i11.Balance {
+  _FakeBalance_8(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -144,8 +140,8 @@ class _FakeCachedElectrumX_8 extends _i1.SmartFake
         );
 }
 
-class _FakeBalance_9 extends _i1.SmartFake implements _i12.Balance {
-  _FakeBalance_9(
+class _FakeMainDB_9 extends _i1.SmartFake implements _i12.MainDB {
+  _FakeMainDB_9(
     Object parent,
     Invocation parentInvocation,
   ) : super(
@@ -164,8 +160,7 @@ class _FakeNetworkType_10 extends _i1.SmartFake implements _i13.NetworkType {
         );
 }
 
-class _FakeElectrumXNode_11 extends _i1.SmartFake
-    implements _i10.ElectrumXNode {
+class _FakeElectrumXNode_11 extends _i1.SmartFake implements _i9.ElectrumXNode {
   _FakeElectrumXNode_11(
     Object parent,
     Invocation parentInvocation,
@@ -431,7 +426,7 @@ class MockWallets extends _i1.Mock implements _i21.Wallets {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -439,7 +434,7 @@ class MockWallets extends _i1.Mock implements _i21.Wallets {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -657,7 +652,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -665,7 +660,7 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -690,109 +685,10 @@ class MockWalletsService extends _i1.Mock implements _i2.WalletsService {
       );
 }
 
-/// A class which mocks [ThemeService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockThemeService extends _i1.Mock implements _i26.ThemeService {
-  MockThemeService() {
-    _i1.throwOnMissingStub(this);
-  }
-
-  @override
-  _i7.MainDB get db => (super.noSuchMethod(
-        Invocation.getter(#db),
-        returnValue: _FakeMainDB_4(
-          this,
-          Invocation.getter(#db),
-        ),
-      ) as _i7.MainDB);
-  @override
-  List<_i27.StackTheme> get installedThemes => (super.noSuchMethod(
-        Invocation.getter(#installedThemes),
-        returnValue: <_i27.StackTheme>[],
-      ) as List<_i27.StackTheme>);
-  @override
-  void init(_i7.MainDB? db) => super.noSuchMethod(
-        Invocation.method(
-          #init,
-          [db],
-        ),
-        returnValueForMissingStub: null,
-      );
-  @override
-  _i23.Future<void> install({required _i28.Uint8List? themeArchiveData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #install,
-          [],
-          {#themeArchiveData: themeArchiveData},
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> remove({required String? themeId}) => (super.noSuchMethod(
-        Invocation.method(
-          #remove,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<void> checkDefaultThemesOnStartup() => (super.noSuchMethod(
-        Invocation.method(
-          #checkDefaultThemesOnStartup,
-          [],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  _i23.Future<bool> verifyInstalled({required String? themeId}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #verifyInstalled,
-          [],
-          {#themeId: themeId},
-        ),
-        returnValue: _i23.Future<bool>.value(false),
-      ) as _i23.Future<bool>);
-  @override
-  _i23.Future<List<_i26.StackThemeMetaData>> fetchThemes() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchThemes,
-          [],
-        ),
-        returnValue: _i23.Future<List<_i26.StackThemeMetaData>>.value(
-            <_i26.StackThemeMetaData>[]),
-      ) as _i23.Future<List<_i26.StackThemeMetaData>>);
-  @override
-  _i23.Future<_i28.Uint8List> fetchTheme(
-          {required _i26.StackThemeMetaData? themeMetaData}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #fetchTheme,
-          [],
-          {#themeMetaData: themeMetaData},
-        ),
-        returnValue: _i23.Future<_i28.Uint8List>.value(_i28.Uint8List(0)),
-      ) as _i23.Future<_i28.Uint8List>);
-  @override
-  _i27.StackTheme? getTheme({required String? themeId}) =>
-      (super.noSuchMethod(Invocation.method(
-        #getTheme,
-        [],
-        {#themeId: themeId},
-      )) as _i27.StackTheme?);
-}
-
 /// A class which mocks [BitcoinWallet].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
+class MockBitcoinWallet extends _i1.Mock implements _i25.BitcoinWallet {
   MockBitcoinWallet() {
     _i1.throwOnMissingStub(this);
   }
@@ -806,15 +702,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i8.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
+  _i7.TransactionNotificationTracker get txTracker => (super.noSuchMethod(
         Invocation.getter(#txTracker),
-        returnValue: _FakeTransactionNotificationTracker_5(
+        returnValue: _FakeTransactionNotificationTracker_4(
           this,
           Invocation.getter(#txTracker),
         ),
-      ) as _i8.TransactionNotificationTracker);
+      ) as _i7.TransactionNotificationTracker);
   @override
-  set txTracker(_i8.TransactionNotificationTracker? _txTracker) =>
+  set txTracker(_i7.TransactionNotificationTracker? _txTracker) =>
       super.noSuchMethod(
         Invocation.setter(
           #txTracker,
@@ -911,13 +807,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
         returnValue: false,
       ) as bool);
   @override
-  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
+  _i23.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
+        returnValue: _i23.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i23.Future<_i9.FeeObject>);
+      ) as _i23.Future<_i8.FeeObject>);
   @override
   _i23.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -990,29 +886,29 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i10.ElectrumX get electrumXClient => (super.noSuchMethod(
+  _i9.ElectrumX get electrumXClient => (super.noSuchMethod(
         Invocation.getter(#electrumXClient),
-        returnValue: _FakeElectrumX_7(
+        returnValue: _FakeElectrumX_6(
           this,
           Invocation.getter(#electrumXClient),
         ),
-      ) as _i10.ElectrumX);
+      ) as _i9.ElectrumX);
   @override
-  _i11.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
+  _i10.CachedElectrumX get cachedElectrumXClient => (super.noSuchMethod(
         Invocation.getter(#cachedElectrumXClient),
-        returnValue: _FakeCachedElectrumX_8(
+        returnValue: _FakeCachedElectrumX_7(
           this,
           Invocation.getter(#cachedElectrumXClient),
         ),
-      ) as _i11.CachedElectrumX);
+      ) as _i10.CachedElectrumX);
   @override
-  _i12.Balance get balance => (super.noSuchMethod(
+  _i11.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
   _i23.Future<String> get xpub => (super.noSuchMethod(
         Invocation.getter(#xpub),
@@ -1028,13 +924,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
         returnValueForMissingStub: null,
       );
   @override
-  _i7.MainDB get db => (super.noSuchMethod(
+  _i12.MainDB get db => (super.noSuchMethod(
         Invocation.getter(#db),
-        returnValue: _FakeMainDB_4(
+        returnValue: _FakeMainDB_9(
           this,
           Invocation.getter(#db),
         ),
-      ) as _i7.MainDB);
+      ) as _i12.MainDB);
   @override
   _i13.NetworkType get networkType => (super.noSuchMethod(
         Invocation.getter(#networkType),
@@ -1053,15 +949,15 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i30.DerivePathType addressType({required String? address}) =>
+  _i26.DerivePathType addressType({required String? address}) =>
       (super.noSuchMethod(
         Invocation.method(
           #addressType,
           [],
           {#address: address},
         ),
-        returnValue: _i30.DerivePathType.bip44,
-      ) as _i30.DerivePathType);
+        returnValue: _i26.DerivePathType.bip44,
+      ) as _i26.DerivePathType);
   @override
   _i23.Future<void> recoverFromMnemonic({
     required String? mnemonic,
@@ -1220,20 +1116,19 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i23.Future<_i10.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
+  _i23.Future<_i9.ElectrumXNode> getCurrentNode() => (super.noSuchMethod(
         Invocation.method(
           #getCurrentNode,
           [],
         ),
-        returnValue:
-            _i23.Future<_i10.ElectrumXNode>.value(_FakeElectrumXNode_11(
+        returnValue: _i23.Future<_i9.ElectrumXNode>.value(_FakeElectrumXNode_11(
           this,
           Invocation.method(
             #getCurrentNode,
             [],
           ),
         )),
-      ) as _i23.Future<_i10.ElectrumXNode>);
+      ) as _i23.Future<_i9.ElectrumXNode>);
   @override
   _i23.Future<List<Map<String, dynamic>>> fastFetch(
           List<String>? allTxHashes) =>
@@ -1298,6 +1193,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
     required String? recipientAddress,
     required bool? coinControl,
     required bool? isSendAll,
+    int? satsPerVByte,
     int? additionalOutputs = 0,
     List<_i17.UTXO>? utxos,
   }) =>
@@ -1310,12 +1206,13 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
           #recipientAddress: recipientAddress,
           #coinControl: coinControl,
           #isSendAll: isSendAll,
+          #satsPerVByte: satsPerVByte,
           #additionalOutputs: additionalOutputs,
           #utxos: utxos,
         },
       ));
   @override
-  _i23.Future<List<_i31.SigningData>> fetchBuildTxData(
+  _i23.Future<List<_i27.SigningData>> fetchBuildTxData(
           List<_i17.UTXO>? utxosToUse) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1323,11 +1220,11 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
           [utxosToUse],
         ),
         returnValue:
-            _i23.Future<List<_i31.SigningData>>.value(<_i31.SigningData>[]),
-      ) as _i23.Future<List<_i31.SigningData>>);
+            _i23.Future<List<_i27.SigningData>>.value(<_i27.SigningData>[]),
+      ) as _i23.Future<List<_i27.SigningData>>);
   @override
   _i23.Future<Map<String, dynamic>> buildTransaction({
-    required List<_i31.SigningData>? utxoSigningData,
+    required List<_i27.SigningData>? utxoSigningData,
     required List<String>? recipients,
     required List<int>? satoshiAmounts,
   }) =>
@@ -1494,21 +1391,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i12.Balance getCachedBalance() => (super.noSuchMethod(
+  _i11.Balance getCachedBalance() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalance,
           [],
         ),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.method(
             #getCachedBalance,
             [],
           ),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
-  _i23.Future<void> updateCachedBalance(_i12.Balance? balance) =>
+  _i23.Future<void> updateCachedBalance(_i11.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalance,
@@ -1518,21 +1415,21 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i12.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
+  _i11.Balance getCachedBalanceSecondary() => (super.noSuchMethod(
         Invocation.method(
           #getCachedBalanceSecondary,
           [],
         ),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.method(
             #getCachedBalanceSecondary,
             [],
           ),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
-  _i23.Future<void> updateCachedBalanceSecondary(_i12.Balance? balance) =>
+  _i23.Future<void> updateCachedBalanceSecondary(_i11.Balance? balance) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateCachedBalanceSecondary,
@@ -1542,26 +1439,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  List<String> getWalletTokenContractAddresses() => (super.noSuchMethod(
-        Invocation.method(
-          #getWalletTokenContractAddresses,
-          [],
-        ),
-        returnValue: <String>[],
-      ) as List<String>);
-  @override
-  _i23.Future<void> updateWalletTokenContractAddresses(
-          List<String>? contractAddresses) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #updateWalletTokenContractAddresses,
-          [contractAddresses],
-        ),
-        returnValue: _i23.Future<void>.value(),
-        returnValueForMissingStub: _i23.Future<void>.value(),
-      ) as _i23.Future<void>);
-  @override
-  void initWalletDB({_i7.MainDB? mockableOverride}) => super.noSuchMethod(
+  void initWalletDB({_i12.MainDB? mockableOverride}) => super.noSuchMethod(
         Invocation.method(
           #initWalletDB,
           [],
@@ -1613,8 +1491,8 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
     required String? walletName,
     required _i13.NetworkType? network,
     required _i22.Coin? coin,
-    required _i7.MainDB? db,
-    required _i10.ElectrumX? electrumXClient,
+    required _i12.MainDB? db,
+    required _i9.ElectrumX? electrumXClient,
     required _i19.SecureStorageInterface? secureStorage,
     required int? dustLimit,
     required int? dustLimitP2PKH,
@@ -1635,7 +1513,7 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
     })?
         prepareSend,
     required _i23.Future<int> Function({required String address})? getTxCount,
-    required _i23.Future<List<_i31.SigningData>> Function(List<_i17.UTXO>)?
+    required _i23.Future<List<_i27.SigningData>> Function(List<_i17.UTXO>)?
         fetchBuildTxData,
     required _i23.Future<void> Function()? refresh,
     required _i23.Future<void> Function()? checkChangeAddressForTransactions,
@@ -2025,9 +1903,9 @@ class MockBitcoinWallet extends _i1.Mock implements _i29.BitcoinWallet {
     required String? walletId,
     required String? walletName,
     required _i22.Coin? coin,
-    required _i7.MainDB? db,
+    required _i12.MainDB? db,
     required _i23.Future<int> Function()? getChainHeight,
-    required _i23.Future<void> Function(_i12.Balance)? refreshedBalanceCallback,
+    required _i23.Future<void> Function(_i11.Balance)? refreshedBalanceCallback,
   }) =>
       super.noSuchMethod(
         Invocation.method(
@@ -2070,15 +1948,15 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         ),
       ) as _i19.SecureStorageInterface);
   @override
-  List<_i32.NodeModel> get primaryNodes => (super.noSuchMethod(
+  List<_i29.NodeModel> get primaryNodes => (super.noSuchMethod(
         Invocation.getter(#primaryNodes),
-        returnValue: <_i32.NodeModel>[],
-      ) as List<_i32.NodeModel>);
+        returnValue: <_i29.NodeModel>[],
+      ) as List<_i29.NodeModel>);
   @override
-  List<_i32.NodeModel> get nodes => (super.noSuchMethod(
+  List<_i29.NodeModel> get nodes => (super.noSuchMethod(
         Invocation.getter(#nodes),
-        returnValue: <_i32.NodeModel>[],
-      ) as List<_i32.NodeModel>);
+        returnValue: <_i29.NodeModel>[],
+      ) as List<_i29.NodeModel>);
   @override
   bool get hasListeners => (super.noSuchMethod(
         Invocation.getter(#hasListeners),
@@ -2096,7 +1974,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
   @override
   _i23.Future<void> setPrimaryNodeFor({
     required _i22.Coin? coin,
-    required _i32.NodeModel? node,
+    required _i29.NodeModel? node,
     bool? shouldNotifyListeners = false,
   }) =>
       (super.noSuchMethod(
@@ -2113,40 +1991,40 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  _i32.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
+  _i29.NodeModel? getPrimaryNodeFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(Invocation.method(
         #getPrimaryNodeFor,
         [],
         {#coin: coin},
-      )) as _i32.NodeModel?);
+      )) as _i29.NodeModel?);
   @override
-  List<_i32.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
+  List<_i29.NodeModel> getNodesFor(_i22.Coin? coin) => (super.noSuchMethod(
         Invocation.method(
           #getNodesFor,
           [coin],
         ),
-        returnValue: <_i32.NodeModel>[],
-      ) as List<_i32.NodeModel>);
+        returnValue: <_i29.NodeModel>[],
+      ) as List<_i29.NodeModel>);
   @override
-  _i32.NodeModel? getNodeById({required String? id}) =>
+  _i29.NodeModel? getNodeById({required String? id}) =>
       (super.noSuchMethod(Invocation.method(
         #getNodeById,
         [],
         {#id: id},
-      )) as _i32.NodeModel?);
+      )) as _i29.NodeModel?);
   @override
-  List<_i32.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
+  List<_i29.NodeModel> failoverNodesFor({required _i22.Coin? coin}) =>
       (super.noSuchMethod(
         Invocation.method(
           #failoverNodesFor,
           [],
           {#coin: coin},
         ),
-        returnValue: <_i32.NodeModel>[],
-      ) as List<_i32.NodeModel>);
+        returnValue: <_i29.NodeModel>[],
+      ) as List<_i29.NodeModel>);
   @override
   _i23.Future<void> add(
-    _i32.NodeModel? node,
+    _i29.NodeModel? node,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2198,7 +2076,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
       ) as _i23.Future<void>);
   @override
   _i23.Future<void> edit(
-    _i32.NodeModel? editedNode,
+    _i29.NodeModel? editedNode,
     String? password,
     bool? shouldNotifyListeners,
   ) =>
@@ -2224,7 +2102,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -2232,7 +2110,7 @@ class MockNodeService extends _i1.Mock implements _i3.NodeService {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -2324,13 +2202,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
+  _i23.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
+        returnValue: _i23.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i23.Future<_i9.FeeObject>);
+      ) as _i23.Future<_i8.FeeObject>);
   @override
   _i23.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2342,13 +2220,13 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: _i23.Future<String>.value(''),
       ) as _i23.Future<String>);
   @override
-  _i12.Balance get balance => (super.noSuchMethod(
+  _i11.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
   _i23.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
@@ -2617,7 +2495,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: _i23.Future<void>.value(),
       ) as _i23.Future<void>);
   @override
-  void addListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -2625,7 +2503,7 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValueForMissingStub: null,
       );
   @override
-  void removeListener(_i25.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(dynamic listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -2692,13 +2570,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i20.CoinServiceAPI {
         returnValueForMissingStub: null,
       );
   @override
-  _i23.Future<_i9.FeeObject> get fees => (super.noSuchMethod(
+  _i23.Future<_i8.FeeObject> get fees => (super.noSuchMethod(
         Invocation.getter(#fees),
-        returnValue: _i23.Future<_i9.FeeObject>.value(_FakeFeeObject_6(
+        returnValue: _i23.Future<_i8.FeeObject>.value(_FakeFeeObject_5(
           this,
           Invocation.getter(#fees),
         )),
-      ) as _i23.Future<_i9.FeeObject>);
+      ) as _i23.Future<_i8.FeeObject>);
   @override
   _i23.Future<int> get maxFee => (super.noSuchMethod(
         Invocation.getter(#maxFee),
@@ -2710,13 +2588,13 @@ class MockCoinServiceAPI extends _i1.Mock implements _i20.CoinServiceAPI {
         returnValue: _i23.Future<String>.value(''),
       ) as _i23.Future<String>);
   @override
-  _i12.Balance get balance => (super.noSuchMethod(
+  _i11.Balance get balance => (super.noSuchMethod(
         Invocation.getter(#balance),
-        returnValue: _FakeBalance_9(
+        returnValue: _FakeBalance_8(
           this,
           Invocation.getter(#balance),
         ),
-      ) as _i12.Balance);
+      ) as _i11.Balance);
   @override
   _i23.Future<List<_i17.Transaction>> get transactions => (super.noSuchMethod(
         Invocation.getter(#transactions),
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 7c293146f..d81eabadc 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,7 +6,7 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <connectivity_plus_windows/connectivity_plus_windows_plugin.h>
+#include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <desktop_drop/desktop_drop_plugin.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <isar_flutter_libs/isar_flutter_libs_plugin.h>
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 200adfcda..80b508c45 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,7 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  connectivity_plus_windows
+  connectivity_plus
   desktop_drop
   flutter_secure_storage_windows
   isar_flutter_libs

From 3b41a58ec2082652160261fd76654388d890fe52 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Wed, 21 Jun 2023 12:08:18 -0600
Subject: [PATCH 67/87] fix: desktop address book card coin icon

(cherry picked from commit aba9aeaef2865b9206e85713abbda9dcdb85e625)
---
 .../address_book_view/subwidgets/desktop_address_card.dart      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_address_card.dart b/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_address_card.dart
index 6d6023520..e0773a58c 100644
--- a/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_address_card.dart
+++ b/lib/pages_desktop_specific/address_book_view/subwidgets/desktop_address_card.dart
@@ -1,5 +1,7 @@
 import 'dart:io';
 
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

From da2e882322426602ff9ce87c67c3b6b4194e91f5 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Wed, 21 Jun 2023 12:08:39 -0600
Subject: [PATCH 68/87] fix: dependency version

(cherry picked from commit baec88a4f81d5c2c4bfd8427224c8ccf746c25fc)
---
 pubspec.yaml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 245e4a6d5..7ceb7a0be 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,18 +23,15 @@ dependencies:
   ffi: ^2.0.1
   mutex: ^3.0.0
   websocket_universal: ^0.5.1
-
   flutter_libmonero:
     path: ./crypto_plugins/flutter_libmonero
 
   cw_monero:
     path: ./crypto_plugins/flutter_libmonero/cw_monero
 
-
   cw_core:
     path: ./crypto_plugins/flutter_libmonero/cw_core
 
-
   bitcoindart:
     git:
       url: https://github.com/cypherstack/bitcoindart.git
@@ -69,6 +66,10 @@ dependencies:
     git:
       url: https://github.com/cypherstack/stack-bip39.git
       ref: 0cd6d54e2860bea68fc50c801cb9db2a760192fb
+  bitbox:
+    git:
+      url: https://github.com/PiRK/bitbox-flutter.git
+      ref: 50bf29957514a5712466ba37590a851212a244bf
   bip32: ^2.0.0
   bech32:
     git:
@@ -76,6 +77,10 @@ dependencies:
       ref: b6d2a5b4cd17311d917787c0f9505f04932659b1
   bs58check: ^1.0.2
 
+  # Eth Plugins
+  web3dart: 2.6.1
+  ethereum_addresses: 1.0.2
+
   # Storage plugins
   flutter_secure_storage: ^8.0.0
   hive: ^2.0.5
@@ -321,6 +326,8 @@ flutter:
     # exchange icons
     - assets/svg/exchange_icons/
 
+    # buy
+    - assets/svg/buy/
 
     # lottie animations
     # basic

From 7556aa582d31dd56d32d594d20467e74076c4c9c Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Wed, 21 Jun 2023 12:12:39 -0600
Subject: [PATCH 69/87] move debug logs option to bottom of advanced settings
 on desktop

(cherry picked from commit 2870ec49ec856bd401fe9fcad99769bb0f8f396b)
---
 .../advanced_settings/advanced_settings.dart  | 51 +++++++++++++++++--
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart
index e2424eec0..6304855aa 100644
--- a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart
@@ -214,7 +214,7 @@ class _AdvancedSettings extends ConsumerState<AdvancedSettings> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Text(
-                        "Debug info",
+                        "Block explorers",
                         style: STextStyles.desktopTextExtraSmall(context)
                             .copyWith(
                                 color: Theme.of(context)
@@ -224,7 +224,7 @@ class _AdvancedSettings extends ConsumerState<AdvancedSettings> {
                       ),
                       PrimaryButton(
                         buttonHeight: ButtonHeight.xs,
-                        label: "Show logs",
+                        label: "Edit",
                         width: 101,
                         onPressed: () async {
                           await showDialog<dynamic>(
@@ -232,7 +232,7 @@ class _AdvancedSettings extends ConsumerState<AdvancedSettings> {
                             useSafeArea: false,
                             barrierDismissible: true,
                             builder: (context) {
-                              return const DebugInfoDialog();
+                              return const DesktopManageBlockExplorersDialog();
                             },
                           );
                         },
@@ -252,7 +252,7 @@ class _AdvancedSettings extends ConsumerState<AdvancedSettings> {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Text(
-                        "Block explorers",
+                        "Units",
                         style: STextStyles.desktopTextExtraSmall(context)
                             .copyWith(
                                 color: Theme.of(context)
@@ -270,7 +270,7 @@ class _AdvancedSettings extends ConsumerState<AdvancedSettings> {
                             useSafeArea: false,
                             barrierDismissible: true,
                             builder: (context) {
-                              return const DesktopManageBlockExplorersDialog();
+                              return const ManageCoinUnitsView();
                             },
                           );
                         },
@@ -278,6 +278,47 @@ class _AdvancedSettings extends ConsumerState<AdvancedSettings> {
                     ],
                   ),
                 ),
+                const Padding(
+                  padding: EdgeInsets.all(10.0),
+                  child: Divider(
+                    thickness: 0.5,
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.all(10),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text(
+                        "Debug info",
+                        style: STextStyles.desktopTextExtraSmall(context)
+                            .copyWith(
+                                color: Theme.of(context)
+                                    .extension<StackColors>()!
+                                    .textDark),
+                        textAlign: TextAlign.left,
+                      ),
+                      PrimaryButton(
+                        buttonHeight: ButtonHeight.xs,
+                        label: "Show logs",
+                        width: 101,
+                        onPressed: () async {
+                          await showDialog<dynamic>(
+                            context: context,
+                            useSafeArea: false,
+                            barrierDismissible: true,
+                            builder: (context) {
+                              return const DebugInfoDialog();
+                            },
+                          );
+                        },
+                      ),
+                    ],
+                  ),
+                ),
+                const SizedBox(
+                  height: 10,
+                ),
               ],
             ),
           ),

From 74b8e63e58ff8df2e5a2b7efc303bf9b343174da Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Wed, 21 Jun 2023 12:47:47 -0600
Subject: [PATCH 70/87] fix: equal width desktop settings option clickable area

(cherry picked from commit 14bf1ab3e328109487e61f97b05b566c6dc67796)
---
 .../settings/desktop_settings_view.dart       |   9 +-
 .../settings/settings_menu.dart               | 158 +-----------------
 2 files changed, 10 insertions(+), 157 deletions(-)

diff --git a/lib/pages_desktop_specific/settings/desktop_settings_view.dart b/lib/pages_desktop_specific/settings/desktop_settings_view.dart
index d83dbb98c..aff625a52 100644
--- a/lib/pages_desktop_specific/settings/desktop_settings_view.dart
+++ b/lib/pages_desktop_specific/settings/desktop_settings_view.dart
@@ -73,10 +73,10 @@ class _DesktopSettingsViewState extends ConsumerState<DesktopSettingsView> {
   Widget build(BuildContext context) {
     return DesktopScaffold(
       background: Theme.of(context).extension<StackColors>()!.background,
-      appBar: DesktopAppBar(
+      appBar: const DesktopAppBar(
         isCompactHeight: true,
         leading: Row(
-          children: const [
+          children: [
             SizedBox(
               width: 24,
               height: 24,
@@ -87,7 +87,10 @@ class _DesktopSettingsViewState extends ConsumerState<DesktopSettingsView> {
       ),
       body: Row(
         children: [
-          const SettingsMenu(),
+          const Padding(
+            padding: EdgeInsets.all(15.0),
+            child: SettingsMenu(),
+          ),
           Expanded(
             child: contentViews[
                 ref.watch(selectedSettingsMenuItemStateProvider.state).state],
diff --git a/lib/pages_desktop_specific/settings/settings_menu.dart b/lib/pages_desktop_specific/settings/settings_menu.dart
index 4f5562c5a..2cc746d32 100644
--- a/lib/pages_desktop_specific/settings/settings_menu.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu.dart
@@ -35,10 +35,10 @@ class _SettingsMenuState extends ConsumerState<SettingsMenu> {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Padding(
-          padding: const EdgeInsets.only(left: 15),
+        SizedBox(
+          width: 250,
           child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               for (int i = 0; i < labels.length; i++)
                 Column(
@@ -73,157 +73,7 @@ class _SettingsMenuState extends ConsumerState<SettingsMenu> {
                           .state = newValue,
                     ),
                   ],
-                )
-
-              // SettingsMenuItem(
-              //   icon: SvgPicture.asset(
-              //     Assets.svg.polygon,
-              //     width: 11,
-              //     height: 11,
-              //     color: selectedMenuItem == 0
-              //         ? Theme.of(context)
-              //             .extension<StackColors>()!
-              //             .accentColorBlue
-              //         : Colors.transparent,
-              //   ),
-              //   label: "Backup and restore",
-              //   value: 0,
-              //   group: selectedMenuItem,
-              //   onChanged: updateSelectedMenuItem,
-              // ),
-              // const SizedBox(
-              //   height: 2,
-              // ),
-              // SettingsMenuItem(
-              //   icon: SvgPicture.asset(
-              //     Assets.svg.polygon,
-              //     width: 11,
-              //     height: 11,
-              //     color: selectedMenuItem == 1
-              //         ? Theme.of(context)
-              //             .extension<StackColors>()!
-              //             .accentColorBlue
-              //         : Colors.transparent,
-              //   ),
-              //   label: "Security",
-              //   value: 1,
-              //   group: selectedMenuItem,
-              //   onChanged: updateSelectedMenuItem,
-              // ),
-              // const SizedBox(
-              //   height: 2,
-              // ),
-              // SettingsMenuItem(
-              //   icon: SvgPicture.asset(
-              //     Assets.svg.polygon,
-              //     width: 11,
-              //     height: 11,
-              //     color: selectedMenuItem == 2
-              //         ? Theme.of(context)
-              //             .extension<StackColors>()!
-              //             .accentColorBlue
-              //         : Colors.transparent,
-              //   ),
-              //   label: "Currency",
-              //   value: 2,
-              //   group: selectedMenuItem,
-              //   onChanged: updateSelectedMenuItem,
-              // ),
-              // const SizedBox(
-              //   height: 2,
-              // ),
-              // SettingsMenuItem(
-              //   icon: SvgPicture.asset(
-              //     Assets.svg.polygon,
-              //     width: 11,
-              //     height: 11,
-              //     color: selectedMenuItem == 3
-              //         ? Theme.of(context)
-              //             .extension<StackColors>()!
-              //             .accentColorBlue
-              //         : Colors.transparent,
-              //   ),
-              //   label: "Language",
-              //   value: 3,
-              //   group: selectedMenuItem,
-              //   onChanged: updateSelectedMenuItem,
-              // ),
-              // const SizedBox(
-              //   height: 2,
-              // ),
-              // SettingsMenuItem(
-              //   icon: SvgPicture.asset(
-              //     Assets.svg.polygon,
-              //     width: 11,
-              //     height: 11,
-              //     color: selectedMenuItem == 4
-              //         ? Theme.of(context)
-              //             .extension<StackColors>()!
-              //             .accentColorBlue
-              //         : Colors.transparent,
-              //   ),
-              //   label: "Nodes",
-              //   value: 4,
-              //   group: selectedMenuItem,
-              //   onChanged: updateSelectedMenuItem,
-              // ),
-              // const SizedBox(
-              //   height: 2,
-              // ),
-              // SettingsMenuItem(
-              //   icon: SvgPicture.asset(
-              //     Assets.svg.polygon,
-              //     width: 11,
-              //     height: 11,
-              //     color: selectedMenuItem == 5
-              //         ? Theme.of(context)
-              //             .extension<StackColors>()!
-              //             .accentColorBlue
-              //         : Colors.transparent,
-              //   ),
-              //   label: "Syncing preferences",
-              //   value: 5,
-              //   group: selectedMenuItem,
-              //   onChanged: updateSelectedMenuItem,
-              // ),
-              // const SizedBox(
-              //   height: 2,
-              // ),
-              // SettingsMenuItem(
-              //   icon: SvgPicture.asset(
-              //     Assets.svg.polygon,
-              //     width: 11,
-              //     height: 11,
-              //     color: selectedMenuItem == 6
-              //         ? Theme.of(context)
-              //             .extension<StackColors>()!
-              //             .accentColorBlue
-              //         : Colors.transparent,
-              //   ),
-              //   label: "Appearance",
-              //   value: 6,
-              //   group: selectedMenuItem,
-              //   onChanged: updateSelectedMenuItem,
-              // ),
-              // const SizedBox(
-              //   height: 2,
-              // ),
-              // SettingsMenuItem(
-              //   icon: SvgPicture.asset(
-              //     Assets.svg.polygon,
-              //     width: 11,
-              //     height: 11,
-              //     color: selectedMenuItem == 7
-              //         ? Theme.of(context)
-              //             .extension<StackColors>()!
-              //             .accentColorBlue
-              //         : Colors.transparent,
-              //   ),
-              //   label: "Advanced",
-              //   value: 7,
-              //   group: selectedMenuItem,
-              //   onChanged: updateSelectedMenuItem,
-              // ),
+                ),
             ],
           ),
         ),

From 9324b0989fe20bfcde62c94904509f771ab5ed5a Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 23 Jun 2023 12:57:14 -0600
Subject: [PATCH 71/87] fix: amount string parse bug on desktop send view

---
 .../wallet_view/sub_widgets/desktop_send.dart | 42 +++++--------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart
index 64ef3d428..6fdbe6512 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:math';
 
 import 'package:bip47/bip47.dart';
 import 'package:cw_core/monero_transaction_priority.dart';
@@ -419,27 +418,11 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
 
   void _cryptoAmountChanged() async {
     if (!_cryptoAmountChangeLock) {
-      String cryptoAmount = cryptoAmountController.text;
-      if (cryptoAmount.isNotEmpty &&
-          cryptoAmount != "." &&
-          cryptoAmount != ",") {
-        if (cryptoAmount.startsWith("~")) {
-          cryptoAmount = cryptoAmount.substring(1);
-        }
-        if (cryptoAmount.contains(" ")) {
-          cryptoAmount = cryptoAmount.split(" ").first;
-        }
-
-        // ensure we don't shift past minimum atomic value
-        final shift = min(ref.read(pAmountUnit(coin)).shift, coin.decimals);
-
-        _amountToSend = cryptoAmount.contains(",")
-            ? Decimal.parse(cryptoAmount.replaceFirst(",", "."))
-                .shift(0 - shift)
-                .toAmount(fractionDigits: coin.decimals)
-            : Decimal.parse(cryptoAmount)
-                .shift(0 - shift)
-                .toAmount(fractionDigits: coin.decimals);
+      final cryptoAmount = ref.read(pAmountFormatter(coin)).tryParse(
+            cryptoAmountController.text,
+          );
+      if (cryptoAmount != null) {
+        _amountToSend = cryptoAmount;
         if (_cachedAmountToSend != null &&
             _cachedAmountToSend == _amountToSend) {
           return;
@@ -609,15 +592,12 @@ class _DesktopSendState extends ConsumerState<DesktopSend> {
   }
 
   void fiatTextFieldOnChanged(String baseAmountString) {
-    if (baseAmountString.isNotEmpty &&
-        baseAmountString != "." &&
-        baseAmountString != ",") {
-      final baseAmount = baseAmountString.contains(",")
-          ? Decimal.parse(baseAmountString.replaceFirst(",", "."))
-              .toAmount(fractionDigits: 2)
-          : Decimal.parse(baseAmountString).toAmount(fractionDigits: 2);
-
-      var _price =
+    final baseAmount = Amount.tryParseFiatString(
+      baseAmountString,
+      locale: ref.read(localeServiceChangeNotifierProvider).locale,
+    );
+    if (baseAmount != null) {
+      final _price =
           ref.read(priceAnd24hChangeNotifierProvider).getPrice(coin).item1;
 
       if (_price == Decimal.zero) {

From e551a751c56d1b615b0494101f28b9b677d3f095 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 23 Jun 2023 12:59:43 -0600
Subject: [PATCH 72/87] fix: amount input formatter case when trying to input
 an amount less than one starting with a zero instead of the decimal
 separator, edge case allowing more decimal places than the coin has, and
 pasting certain amounts

---
 .../amount/amount_input_formatter.dart        | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/lib/utilities/amount/amount_input_formatter.dart b/lib/utilities/amount/amount_input_formatter.dart
index 99c55e387..54ad57940 100644
--- a/lib/utilities/amount/amount_input_formatter.dart
+++ b/lib/utilities/amount/amount_input_formatter.dart
@@ -38,7 +38,15 @@ class AmountInputFormatter extends TextInputFormatter {
       if (parts.length > 2) {
         return oldValue;
       }
+
+      final fractionDigits =
+          unit == null ? decimals : max(decimals - unit!.shift, 0);
+
       if (newText.startsWith(decimalSeparator)) {
+        if (newText.length - 1 > fractionDigits) {
+          newText = newText.substring(0, fractionDigits + 1);
+        }
+
         return TextEditingValue(
           text: newText,
           selection: TextSelection.collapsed(
@@ -54,28 +62,24 @@ class AmountInputFormatter extends TextInputFormatter {
         fraction = "";
       }
 
-      final fractionDigits =
-          unit == null ? decimals : max(decimals - unit!.shift, 0);
-
       if (fraction.length > fractionDigits) {
-        return oldValue;
+        fraction = fraction.substring(0, fractionDigits);
       }
     }
 
-    if (newText.trim() == '' || newText.trim() == '0') {
-      return newValue.copyWith(text: '');
-    } else if (BigInt.parse(newText) < BigInt.one) {
-      return newValue.copyWith(text: '');
+    String newString;
+    final val = BigInt.tryParse(newText);
+    if (val == null || val < BigInt.one) {
+      newString = newText;
+    } else {
+      // insert group separator
+      final regex = RegExp(r'\B(?=(\d{3})+(?!\d))');
+      newString = newText.replaceAllMapped(
+        regex,
+        (m) => "${m.group(0)}${numberSymbols?.GROUP_SEP ?? ","}",
+      );
     }
 
-    // insert group separator
-    final regex = RegExp(r'\B(?=(\d{3})+(?!\d))');
-
-    String newString = newText.replaceAllMapped(
-      regex,
-      (m) => "${m.group(0)}${numberSymbols?.GROUP_SEP ?? ","}",
-    );
-
     if (fraction != null) {
       newString += decimalSeparator;
       if (fraction.isNotEmpty) {

From ed684cae294d5d9a590f5ee73342c26c3fa1bd6c Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 23 Jun 2023 14:52:19 -0600
Subject: [PATCH 73/87] merge fixes

---
 .../advanced_settings/advanced_settings.dart          |  1 +
 pubspec.yaml                                          | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart
index 6304855aa..8684e0073 100644
--- a/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart
+++ b/lib/pages_desktop_specific/settings/settings_menu/advanced_settings/advanced_settings.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:stackduo/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart';
 import 'package:stackduo/pages_desktop_specific/settings/settings_menu/advanced_settings/debug_info_dialog.dart';
 import 'package:stackduo/pages_desktop_specific/settings/settings_menu/advanced_settings/desktop_manage_block_explorers_dialog.dart';
 import 'package:stackduo/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 7ceb7a0be..07e8181be 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -66,10 +66,6 @@ dependencies:
     git:
       url: https://github.com/cypherstack/stack-bip39.git
       ref: 0cd6d54e2860bea68fc50c801cb9db2a760192fb
-  bitbox:
-    git:
-      url: https://github.com/PiRK/bitbox-flutter.git
-      ref: 50bf29957514a5712466ba37590a851212a244bf
   bip32: ^2.0.0
   bech32:
     git:
@@ -77,10 +73,6 @@ dependencies:
       ref: b6d2a5b4cd17311d917787c0f9505f04932659b1
   bs58check: ^1.0.2
 
-  # Eth Plugins
-  web3dart: 2.6.1
-  ethereum_addresses: 1.0.2
-
   # Storage plugins
   flutter_secure_storage: ^8.0.0
   hive: ^2.0.5
@@ -326,9 +318,6 @@ flutter:
     # exchange icons
     - assets/svg/exchange_icons/
 
-    # buy
-    - assets/svg/buy/
-
     # lottie animations
     # basic
     - assets/lottie/test2.json

From 0a4c64ad4227368bf43dbe19bcf2b1588135094d Mon Sep 17 00:00:00 2001
From: Diego Salazar <diego@cypherstack.com>
Date: Mon, 26 Jun 2023 09:50:30 -0600
Subject: [PATCH 74/87] Bump version (v1.0.9, build 14)

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 07e8181be..2fe27c3cc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Stack Duo
 # 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.0.8+13
+version: 1.0.9+14
 
 environment:
   sdk: ">=3.0.2 <4.0.0"

From c7a06284dd0f4e14cbbb1b944db8eb84f07e2814 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 23 Jun 2023 15:27:09 -0600
Subject: [PATCH 75/87] fix: use proper uri builder function

(cherry picked from commit b64b5cdb9b7b54a2ed461cecab64b48f7f7e8524)
---
 lib/pages/receive_view/receive_view.dart                   | 7 ++++++-
 .../wallet_view/sub_widgets/desktop_receive.dart           | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/pages/receive_view/receive_view.dart b/lib/pages/receive_view/receive_view.dart
index 7362b376c..fce263570 100644
--- a/lib/pages/receive_view/receive_view.dart
+++ b/lib/pages/receive_view/receive_view.dart
@@ -11,6 +11,7 @@ import 'package:stackduo/pages/receive_view/generate_receiving_uri_qr_code_view.
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/route_generator.dart';
 import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackwallet/utilities/address_utils.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/clipboard_interface.dart';
 import 'package:stackduo/utilities/constants.dart';
@@ -318,7 +319,11 @@ class _ReceiveViewState extends ConsumerState<ReceiveView> {
                         child: Column(
                           children: [
                             QrImageView(
-                                data: "${coin.uriScheme}:$receivingAddress",
+                                data: AddressUtils.buildUriString(
+                                  coin,
+                                  receivingAddress,
+                                  {},
+                                ),
                                 size: MediaQuery.of(context).size.width / 2,
                                 foregroundColor: Theme.of(context)
                                     .extension<StackColors>()!
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
index 521b50f6e..41e6aaaca 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
@@ -10,6 +10,7 @@ import 'package:stackduo/pages/receive_view/generate_receiving_uri_qr_code_view.
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/route_generator.dart';
 import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackwallet/utilities/address_utils.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/clipboard_interface.dart';
 import 'package:stackduo/utilities/constants.dart';
@@ -221,7 +222,11 @@ class _DesktopReceiveState extends ConsumerState<DesktopReceive> {
         ),
         Center(
           child: QrImageView(
-            data: "${coin.uriScheme}:$receivingAddress",
+            data: AddressUtils.buildUriString(
+              coin,
+              receivingAddress,
+              {},
+            ),
             size: 200,
             foregroundColor:
                 Theme.of(context).extension<StackColors>()!.accentColorDark,

From 2c641d16f79ee87fbe31e0258e74a7006098ef70 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Fri, 30 Jun 2023 15:30:33 -0600
Subject: [PATCH 76/87] actually use price interval

(cherry picked from commit bd5a0c163138b47085498162dd505b14d27aef0f)
---
 lib/services/price.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/services/price.dart b/lib/services/price.dart
index ce4c475de..1fa1c9f1a 100644
--- a/lib/services/price.dart
+++ b/lib/services/price.dart
@@ -70,7 +70,7 @@ class PriceAPI {
       {required String baseCurrency}) async {
     final now = DateTime.now();
     if (_lastUsedBaseCurrency != baseCurrency ||
-        now.difference(_lastCalled).inSeconds > 0) {
+        now.difference(_lastCalled) > refreshIntervalDuration) {
       _lastCalled = now;
       _lastUsedBaseCurrency = baseCurrency;
     } else {

From 722af6d452c866f0d488896cd6e42d748b03c5bf Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 3 Jul 2023 13:58:11 -0600
Subject: [PATCH 77/87] refactor delete hive boxes in prep for hive->isar
 migration

(cherry picked from commit 9513b203a9d0544f3e55f668a1c3d1fb355a0243)
---
 lib/db/hive/db.dart                           | 30 +++++++++++++++++++
 .../delete_account_view.dart                  | 20 +++++++------
 lib/utilities/delete_everything.dart          | 30 -------------------
 3 files changed, 41 insertions(+), 39 deletions(-)
 delete mode 100644 lib/utilities/delete_everything.dart

diff --git a/lib/db/hive/db.dart b/lib/db/hive/db.dart
index bec6bb8bb..d3f33411e 100644
--- a/lib/db/hive/db.dart
+++ b/lib/db/hive/db.dart
@@ -243,6 +243,36 @@ class DB {
 
   Future<void> deleteBoxFromDisk({required String boxName}) async =>
       await mutex.protect(() async => await Hive.deleteBoxFromDisk(boxName));
+
+  ///////////////////////////////////////////////////////////////////////////
+  Future<bool> deleteEverything() async {
+    try {
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameAddressBook);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameDebugInfo);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameNodeModels);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNamePrimaryNodes);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameAllWalletsData);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameNotifications);
+      await DB.instance
+          .deleteBoxFromDisk(boxName: DB.boxNameWatchedTransactions);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameWatchedTrades);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameTrades);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameTradesV2);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameTradeNotes);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameTradeLookup);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameFavoriteWallets);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNamePrefs);
+      await DB.instance
+          .deleteBoxFromDisk(boxName: DB.boxNameWalletsToDeleteOnStart);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNamePriceCache);
+      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameDBInfo);
+      await DB.instance.deleteBoxFromDisk(boxName: "theme");
+      return true;
+    } catch (e, s) {
+      Logging.instance.log("$e $s", level: LogLevel.Error);
+      return false;
+    }
+  }
 }
 
 abstract class DBKeys {
diff --git a/lib/pages/settings_views/global_settings_view/delete_account_view.dart b/lib/pages/settings_views/global_settings_view/delete_account_view.dart
index 668d85b96..83e1a9e3a 100644
--- a/lib/pages/settings_views/global_settings_view/delete_account_view.dart
+++ b/lib/pages/settings_views/global_settings_view/delete_account_view.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/pages/intro_view.dart';
-import 'package:stackduo/utilities/delete_everything.dart';
-import 'package:stackduo/utilities/text_styles.dart';
 import 'package:stackduo/themes/stack_colors.dart';
+import 'package:stackduo/utilities/text_styles.dart';
 import 'package:stackduo/utilities/util.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackduo/widgets/desktop/desktop_app_bar.dart';
@@ -26,7 +26,7 @@ class _DeleteAccountViewState extends State<DeleteAccountView> {
   Future<void> onConfirmDeleteAccount() async {
     // TODO delete everything then pop to intro view
 
-    await showDialog(
+    await showDialog<void>(
       barrierDismissible: true,
       context: context,
       builder: (_) => StackDialog(
@@ -51,12 +51,14 @@ class _DeleteAccountViewState extends State<DeleteAccountView> {
               .extension<StackColors>()!
               .getPrimaryEnabledButtonStyle(context),
           onPressed: () async {
-            await deleteEverything();
+            await DB.instance.deleteEverything();
 
-            await Navigator.of(context).pushNamedAndRemoveUntil(
-              IntroView.routeName,
-              (route) => false,
-            );
+            if (mounted) {
+              await Navigator.of(context).pushNamedAndRemoveUntil(
+                IntroView.routeName,
+                (route) => false,
+              );
+            }
           },
           child: Text(
             "Delete",
@@ -72,7 +74,7 @@ class _DeleteAccountViewState extends State<DeleteAccountView> {
     return MasterScaffold(
       isDesktop: isDesktop,
       appBar: isDesktop
-          ? DesktopAppBar(isCompactHeight: true)
+          ? const DesktopAppBar(isCompactHeight: true)
           : AppBar(
               leading: AppBarBackButton(
                 onPressed: () async {
diff --git a/lib/utilities/delete_everything.dart b/lib/utilities/delete_everything.dart
deleted file mode 100644
index a5f14415d..000000000
--- a/lib/utilities/delete_everything.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-import 'package:stackduo/db/hive/db.dart';
-import 'package:stackduo/utilities/logger.dart';
-
-Future<bool> deleteEverything() async {
-  try {
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameAddressBook);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameDebugInfo);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameNodeModels);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNamePrimaryNodes);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameAllWalletsData);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameNotifications);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameWatchedTransactions);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameWatchedTrades);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameTrades);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameTradesV2);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameTradeNotes);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameTradeLookup);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameFavoriteWallets);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNamePrefs);
-    await DB.instance
-        .deleteBoxFromDisk(boxName: DB.boxNameWalletsToDeleteOnStart);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNamePriceCache);
-    await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameDBInfo);
-    await DB.instance.deleteBoxFromDisk(boxName: "theme");
-    return true;
-  } catch (e, s) {
-    Logging.instance.log("$e $s", level: LogLevel.Error);
-    return false;
-  }
-}

From 61ca071d1b7b9643614d3382ed38413376bcf17b Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 3 Jul 2023 15:06:28 -0600
Subject: [PATCH 78/87] self contained desktop password service refactor that
 does not keep its db open when not in use

(cherry picked from commit 6fb526efe5a1cc95e637d2f09e8461f2e5bd3910)
---
 lib/utilities/desktop_password_service.dart | 136 +++++++++-----------
 1 file changed, 61 insertions(+), 75 deletions(-)

diff --git a/lib/utilities/desktop_password_service.dart b/lib/utilities/desktop_password_service.dart
index d1c9a1f8c..8c0dab194 100644
--- a/lib/utilities/desktop_password_service.dart
+++ b/lib/utilities/desktop_password_service.dart
@@ -1,8 +1,8 @@
 import 'package:hive/hive.dart';
 import 'package:stack_wallet_backup/secure_storage.dart';
-import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/utilities/logger.dart';
 
+const String kBoxNameDesktopData = "desktopData";
 const String _kKeyBlobKey = "swbKeyBlobKeyStringID";
 const String _kKeyBlobVersionKey = "swbKeyBlobVersionKeyStringID";
 
@@ -52,14 +52,8 @@ class DPS {
         kLatestBlobVersion,
       );
 
-      final box = await Hive.openBox<String>(DB.boxNameDesktopData);
-      await DB.instance.put<String>(
-        boxName: DB.boxNameDesktopData,
-        key: _kKeyBlobKey,
-        value: await _handler!.getKeyBlob(),
-      );
+      await _put(key: _kKeyBlobKey, value: await _handler!.getKeyBlob());
       await _updateStoredKeyBlobVersion(kLatestBlobVersion);
-      await box.close();
     } catch (e, s) {
       Logging.instance.log(
         "${_getMessageFromException(e)}\n$s",
@@ -75,19 +69,13 @@ class DPS {
           "DPS: attempted to re initialize with existing passphrase");
     }
 
-    final box = await Hive.openBox<String>(DB.boxNameDesktopData);
-    final keyBlob = DB.instance.get<String>(
-      boxName: DB.boxNameDesktopData,
-      key: _kKeyBlobKey,
-    );
-    await box.close();
-
-    if (keyBlob == null) {
-      throw Exception(
-          "DPS: failed to find keyBlob while attempting to initialize with existing passphrase");
-    }
-
     try {
+      final keyBlob = await _get(key: _kKeyBlobKey);
+
+      if (keyBlob == null) {
+        throw Exception(
+            "DPS: failed to find keyBlob while attempting to initialize with existing passphrase");
+      }
       final blobVersion = await _getStoredKeyBlobVersion();
       _handler = await StorageCryptoHandler.fromExisting(
         passphrase,
@@ -97,14 +85,8 @@ class DPS {
       if (blobVersion < kLatestBlobVersion) {
         // update blob
         await _handler!.resetPassphrase(passphrase, kLatestBlobVersion);
-        final box = await Hive.openBox<String>(DB.boxNameDesktopData);
-        await DB.instance.put<String>(
-          boxName: DB.boxNameDesktopData,
-          key: _kKeyBlobKey,
-          value: await _handler!.getKeyBlob(),
-        );
+        await _put(key: _kKeyBlobKey, value: await _handler!.getKeyBlob());
         await _updateStoredKeyBlobVersion(kLatestBlobVersion);
-        await box.close();
       }
     } catch (e, s) {
       Logging.instance.log(
@@ -116,19 +98,13 @@ class DPS {
   }
 
   Future<bool> verifyPassphrase(String passphrase) async {
-    final box = await Hive.openBox<String>(DB.boxNameDesktopData);
-    final keyBlob = DB.instance.get<String>(
-      boxName: DB.boxNameDesktopData,
-      key: _kKeyBlobKey,
-    );
-    await box.close();
-
-    if (keyBlob == null) {
-      // no passphrase key blob found so any passphrase is technically bad
-      return false;
-    }
-
     try {
+      final keyBlob = await _get(key: _kKeyBlobKey);
+
+      if (keyBlob == null) {
+        // no passphrase key blob found so any passphrase is technically bad
+        return false;
+      }
       final blobVersion = await _getStoredKeyBlobVersion();
       await StorageCryptoHandler.fromExisting(passphrase, keyBlob, blobVersion);
       // existing passphrase matches key blob
@@ -147,35 +123,25 @@ class DPS {
     String passphraseOld,
     String passphraseNew,
   ) async {
-    final box = await Hive.openBox<String>(DB.boxNameDesktopData);
-    final keyBlob = DB.instance.get<String>(
-      boxName: DB.boxNameDesktopData,
-      key: _kKeyBlobKey,
-    );
-    await box.close();
-
-    if (keyBlob == null) {
-      // no passphrase key blob found so any passphrase is technically bad
-      return false;
-    }
+    try {
+      final keyBlob = await _get(key: _kKeyBlobKey);
 
-    if (!(await verifyPassphrase(passphraseOld))) {
-      return false;
-    }
+      if (keyBlob == null) {
+        // no passphrase key blob found so any passphrase is technically bad
+        return false;
+      }
 
-    final blobVersion = await _getStoredKeyBlobVersion();
+      if (!(await verifyPassphrase(passphraseOld))) {
+        return false;
+      }
 
-    try {
+      final blobVersion = await _getStoredKeyBlobVersion();
       await _handler!.resetPassphrase(passphraseNew, blobVersion);
-
-      final box = await Hive.openBox<String>(DB.boxNameDesktopData);
-      await DB.instance.put<String>(
-        boxName: DB.boxNameDesktopData,
+      await _put(
         key: _kKeyBlobKey,
         value: await _handler!.getKeyBlob(),
       );
       await _updateStoredKeyBlobVersion(blobVersion);
-      await box.close();
 
       // successfully updated passphrase
       return true;
@@ -189,28 +155,48 @@ class DPS {
   }
 
   Future<bool> hasPassword() async {
-    final keyBlob = DB.instance.get<String>(
-      boxName: DB.boxNameDesktopData,
-      key: _kKeyBlobKey,
-    );
+    final keyBlob = await _get(key: _kKeyBlobKey);
     return keyBlob != null;
   }
 
   Future<int> _getStoredKeyBlobVersion() async {
-    final box = await Hive.openBox<String>(DB.boxNameDesktopData);
-    final keyBlobVersionString = DB.instance.get<String>(
-      boxName: DB.boxNameDesktopData,
-      key: _kKeyBlobVersionKey,
-    );
-    await box.close();
+    final keyBlobVersionString = await _get(key: _kKeyBlobVersionKey);
     return int.tryParse(keyBlobVersionString ?? "1") ?? 1;
   }
 
   Future<void> _updateStoredKeyBlobVersion(int version) async {
-    await DB.instance.put<String>(
-      boxName: DB.boxNameDesktopData,
-      key: _kKeyBlobVersionKey,
-      value: version.toString(),
-    );
+    await _put(key: _kKeyBlobVersionKey, value: version.toString());
+  }
+
+  Future<void> _put({required String key, required String value}) async {
+    Box<String>? box;
+    try {
+      box = await Hive.openBox<String>(kBoxNameDesktopData);
+      await box.put(key, value);
+    } catch (e, s) {
+      Logging.instance.log(
+        "DPS failed put($key): $e\n$s",
+        level: LogLevel.Fatal,
+      );
+    } finally {
+      await box?.close();
+    }
+  }
+
+  Future<String?> _get({required String key}) async {
+    String? value;
+    Box<String>? box;
+    try {
+      box = await Hive.openBox<String>(kBoxNameDesktopData);
+      value = box.get(key);
+    } catch (e, s) {
+      Logging.instance.log(
+        "DPS failed get($key): $e\n$s",
+        level: LogLevel.Fatal,
+      );
+    } finally {
+      await box?.close();
+    }
+    return value;
   }
 }

From cb102336e03ce9ee366696239e19d78c8d88a48d Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 3 Jul 2023 15:16:56 -0600
Subject: [PATCH 79/87] WIP: hive -> isar migration and hive clean up

(cherry picked from commit 42abebe1d248b7be037f23c1620b07008fb2a05c)
---
 lib/db/hive/db.dart | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/db/hive/db.dart b/lib/db/hive/db.dart
index d3f33411e..12be53745 100644
--- a/lib/db/hive/db.dart
+++ b/lib/db/hive/db.dart
@@ -13,8 +13,12 @@ import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/logger.dart';
 
 class DB {
+  // legacy (required for migrations)
+  @Deprecated("Left over for migration from old versions of Stack Wallet")
   static const String boxNameAddressBook = "addressBook";
-  static const String boxNameDebugInfo = "debugInfoBox";
+
+  // in use
+  // TODO: migrate
   static const String boxNameNodeModels = "nodeModels";
   static const String boxNamePrimaryNodes = "primaryNodes";
   static const String boxNameAllWalletsData = "wallets";
@@ -27,13 +31,12 @@ class DB {
   static const String boxNameTradeNotes = "tradeNotesBox";
   static const String boxNameTradeLookup = "tradeToTxidLookUpBox";
   static const String boxNameFavoriteWallets = "favoriteWallets";
-  static const String boxNamePrefs = "prefs";
   static const String boxNameWalletsToDeleteOnStart = "walletsToDeleteOnStart";
   static const String boxNamePriceCache = "priceAPIPrice24hCache";
+
+  // in use (keep for now)
   static const String boxNameDBInfo = "dbInfo";
-  // static const String boxNameTheme = "theme";
-  static const String boxNameDesktopData = "desktopData";
-  static const String boxNameBuys = "buysBox";
+  static const String boxNamePrefs = "prefs";
 
   String boxNameTxCache({required Coin coin}) => "${coin.name}_txCache";
   String boxNameSetCache({required Coin coin}) =>
@@ -41,7 +44,6 @@ class DB {
   String boxNameUsedSerialsCache({required Coin coin}) =>
       "${coin.name}_usedSerialsCache";
 
-  Box<String>? _boxDebugInfo;
   Box<NodeModel>? _boxNodeModels;
   Box<NodeModel>? _boxPrimaryNodes;
   Box<dynamic>? _boxAllWalletsData;
@@ -56,7 +58,7 @@ class DB {
   Box<dynamic>? _boxPrefs;
   Box<TradeWalletLookup>? _boxTradeLookup;
   Box<dynamic>? _boxDBInfo;
-  Box<String>? _boxDesktopData;
+  // Box<String>? _boxDesktopData;
 
   final Map<String, Box<dynamic>> _walletBoxes = {};
 
@@ -99,8 +101,6 @@ class DB {
       _boxPrefs = await Hive.openBox<dynamic>(boxNamePrefs);
     }
 
-    _boxDebugInfo = await Hive.openBox<String>(boxNameDebugInfo);
-
     if (Hive.isBoxOpen(boxNameNodeModels)) {
       _boxNodeModels = Hive.box<NodeModel>(boxNameNodeModels);
     } else {
@@ -119,12 +119,6 @@ class DB {
       _boxAllWalletsData = await Hive.openBox<dynamic>(boxNameAllWalletsData);
     }
 
-    if (Hive.isBoxOpen(boxNameDesktopData)) {
-      _boxDesktopData = Hive.box<String>(boxNameDesktopData);
-    } else {
-      _boxDesktopData = await Hive.openBox<String>(boxNameDesktopData);
-    }
-
     _boxNotifications =
         await Hive.openBox<NotificationModel>(boxNameNotifications);
     _boxWatchedTransactions =
@@ -248,7 +242,7 @@ class DB {
   Future<bool> deleteEverything() async {
     try {
       await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameAddressBook);
-      await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameDebugInfo);
+      await DB.instance.deleteBoxFromDisk(boxName: "debugInfoBox");
       await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameNodeModels);
       await DB.instance.deleteBoxFromDisk(boxName: DB.boxNamePrimaryNodes);
       await DB.instance.deleteBoxFromDisk(boxName: DB.boxNameAllWalletsData);

From bcf5d9a22c697a0c88cf74e4e0486928492e9cab Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 3 Jul 2023 16:27:36 -0600
Subject: [PATCH 80/87] close coin cache hive boxes when not in use

(cherry picked from commit b7b43e3380e8737db425e34ba377afdd73ad0e32)
---
 lib/db/hive/db.dart                     | 52 ++++++++++++++++++-------
 lib/electrumx_rpc/cached_electrumx.dart | 48 ++++++++++-------------
 lib/utilities/db_version_migration.dart |  2 +-
 test/cached_electrumx_test.dart         |  4 ++
 test/hive/db_test.dart                  | 22 -----------
 5 files changed, 65 insertions(+), 63 deletions(-)

diff --git a/lib/db/hive/db.dart b/lib/db/hive/db.dart
index 12be53745..369a45520 100644
--- a/lib/db/hive/db.dart
+++ b/lib/db/hive/db.dart
@@ -16,6 +16,7 @@ class DB {
   // legacy (required for migrations)
   @Deprecated("Left over for migration from old versions of Stack Wallet")
   static const String boxNameAddressBook = "addressBook";
+  static const String boxNameTrades = "exchangeTransactionsBox";
 
   // in use
   // TODO: migrate
@@ -26,7 +27,6 @@ class DB {
   static const String boxNameWatchedTransactions =
       "watchedTxNotificationModels";
   static const String boxNameWatchedTrades = "watchedTradesNotificationModels";
-  static const String boxNameTrades = "exchangeTransactionsBox";
   static const String boxNameTradesV2 = "exchangeTradesBox";
   static const String boxNameTradeNotes = "tradeNotesBox";
   static const String boxNameTradeLookup = "tradeToTxidLookUpBox";
@@ -38,10 +38,12 @@ class DB {
   static const String boxNameDBInfo = "dbInfo";
   static const String boxNamePrefs = "prefs";
 
-  String boxNameTxCache({required Coin coin}) => "${coin.name}_txCache";
-  String boxNameSetCache({required Coin coin}) =>
+  String _boxNameTxCache({required Coin coin}) => "${coin.name}_txCache";
+
+  // firo only
+  String _boxNameSetCache({required Coin coin}) =>
       "${coin.name}_anonymitySetCache";
-  String boxNameUsedSerialsCache({required Coin coin}) =>
+  String _boxNameUsedSerialsCache({required Coin coin}) =>
       "${coin.name}_usedSerialsCache";
 
   Box<NodeModel>? _boxNodeModels;
@@ -136,7 +138,6 @@ class DB {
     await Future.wait([
       Hive.openBox<dynamic>(boxNamePriceCache),
       _loadWalletBoxes(),
-      _loadSharedCoinCacheBoxes(),
     ]);
   }
 
@@ -168,14 +169,39 @@ class DB {
     }
   }
 
-  Future<void> _loadSharedCoinCacheBoxes() async {
-    for (final coin in Coin.values) {
-      _txCacheBoxes[coin] =
-          await Hive.openBox<dynamic>(boxNameTxCache(coin: coin));
-      _setCacheBoxes[coin] =
-          await Hive.openBox<dynamic>(boxNameSetCache(coin: coin));
-      _usedSerialsCacheBoxes[coin] =
-          await Hive.openBox<dynamic>(boxNameUsedSerialsCache(coin: coin));
+  Future<Box<dynamic>> getTxCacheBox({required Coin coin}) async {
+    return _txCacheBoxes[coin] ??=
+        await Hive.openBox<dynamic>(_boxNameTxCache(coin: coin));
+  }
+
+  Future<void> closeTxCacheBox({required Coin coin}) async {
+    await _txCacheBoxes[coin]?.close();
+  }
+
+  Future<Box<dynamic>> getAnonymitySetCacheBox({required Coin coin}) async {
+    return _setCacheBoxes[coin] ??=
+        await Hive.openBox<dynamic>(_boxNameSetCache(coin: coin));
+  }
+
+  Future<void> closeAnonymitySetCacheBox({required Coin coin}) async {
+    await _setCacheBoxes[coin]?.close();
+  }
+
+  Future<Box<dynamic>> getUsedSerialsCacheBox({required Coin coin}) async {
+    return _usedSerialsCacheBoxes[coin] ??=
+        await Hive.openBox<dynamic>(_boxNameUsedSerialsCache(coin: coin));
+  }
+
+  Future<void> closeUsedSerialsCacheBox({required Coin coin}) async {
+    await _usedSerialsCacheBoxes[coin]?.close();
+  }
+
+  /// Clear all cached transactions for the specified coin
+  Future<void> clearSharedTransactionCache({required Coin coin}) async {
+    await deleteAll<dynamic>(boxName: _boxNameTxCache(coin: coin));
+    if (coin == Coin.firo) {
+      await deleteAll<dynamic>(boxName: _boxNameSetCache(coin: coin));
+      await deleteAll<dynamic>(boxName: _boxNameUsedSerialsCache(coin: coin));
     }
   }
 
diff --git a/lib/electrumx_rpc/cached_electrumx.dart b/lib/electrumx_rpc/cached_electrumx.dart
index 7b1c8f76c..951ddf943 100644
--- a/lib/electrumx_rpc/cached_electrumx.dart
+++ b/lib/electrumx_rpc/cached_electrumx.dart
@@ -28,9 +28,8 @@ class CachedElectrumX {
     required Coin coin,
   }) async {
     try {
-      final cachedSet = DB.instance.get<dynamic>(
-          boxName: DB.instance.boxNameSetCache(coin: coin),
-          key: groupId) as Map?;
+      final box = await DB.instance.getAnonymitySetCacheBox(coin: coin);
+      final cachedSet = box.get(groupId) as Map?;
 
       Map<String, dynamic> set;
 
@@ -61,7 +60,7 @@ class CachedElectrumX {
             : newSet["blockHash"];
         for (int i = (newSet["coins"] as List).length - 1; i >= 0; i--) {
           dynamic newCoin = newSet["coins"][i];
-          List translatedCoin = [];
+          List<dynamic> translatedCoin = [];
           translatedCoin.add(!isHexadecimal(newCoin[0] as String)
               ? base64ToHex(newCoin[0] as String)
               : newCoin[0]);
@@ -81,10 +80,7 @@ class CachedElectrumX {
           set["coins"].insert(0, translatedCoin);
         }
         // save set to db
-        await DB.instance.put<dynamic>(
-            boxName: DB.instance.boxNameSetCache(coin: coin),
-            key: groupId,
-            value: set);
+        await box.put(groupId, set);
         Logging.instance.log(
           "Updated current anonymity set for ${coin.name} with group ID $groupId",
           level: LogLevel.Info,
@@ -97,6 +93,8 @@ class CachedElectrumX {
           "Failed to process CachedElectrumX.getAnonymitySet(): $e\n$s",
           level: LogLevel.Error);
       rethrow;
+    } finally {
+      await DB.instance.closeAnonymitySetCacheBox(coin: coin);
     }
   }
 
@@ -120,8 +118,9 @@ class CachedElectrumX {
     bool verbose = true,
   }) async {
     try {
-      final cachedTx = DB.instance.get<dynamic>(
-          boxName: DB.instance.boxNameTxCache(coin: coin), key: txHash) as Map?;
+      final box = await DB.instance.getTxCacheBox(coin: coin);
+
+      final cachedTx = box.get(txHash) as Map?;
       if (cachedTx == null) {
         final Map<String, dynamic> result = await electrumXClient
             .getTransaction(txHash: txHash, verbose: verbose);
@@ -131,10 +130,7 @@ class CachedElectrumX {
 
         if (result["confirmations"] != null &&
             result["confirmations"] as int > minCacheConfirms) {
-          await DB.instance.put<dynamic>(
-              boxName: DB.instance.boxNameTxCache(coin: coin),
-              key: txHash,
-              value: result);
+          await box.put(txHash, result);
         }
 
         Logging.instance.log("using fetched result", level: LogLevel.Info);
@@ -148,6 +144,8 @@ class CachedElectrumX {
           "Failed to process CachedElectrumX.getTransaction(): $e\n$s",
           level: LogLevel.Error);
       rethrow;
+    } finally {
+      await DB.instance.closeTxCacheBox(coin: coin);
     }
   }
 
@@ -156,9 +154,9 @@ class CachedElectrumX {
     int startNumber = 0,
   }) async {
     try {
-      final _list = DB.instance.get<dynamic>(
-          boxName: DB.instance.boxNameUsedSerialsCache(coin: coin),
-          key: "serials") as List?;
+      final box = await DB.instance.getUsedSerialsCacheBox(coin: coin);
+
+      final _list = box.get("serials") as List?;
 
       List<String> cachedSerials =
           _list == null ? [] : List<String>.from(_list);
@@ -178,10 +176,9 @@ class CachedElectrumX {
       }
       cachedSerials.addAll(newSerials);
 
-      await DB.instance.put<dynamic>(
-        boxName: DB.instance.boxNameUsedSerialsCache(coin: coin),
-        key: "serials",
-        value: cachedSerials,
+      await box.put(
+        "serials",
+        cachedSerials,
       );
 
       return cachedSerials;
@@ -190,16 +187,13 @@ class CachedElectrumX {
           "Failed to process CachedElectrumX.getTransaction(): $e\n$s",
           level: LogLevel.Error);
       rethrow;
+    } finally {
+      await DB.instance.closeUsedSerialsCacheBox(coin: coin);
     }
   }
 
   /// Clear all cached transactions for the specified coin
   Future<void> clearSharedTransactionCache({required Coin coin}) async {
-    await DB.instance
-        .deleteAll<dynamic>(boxName: DB.instance.boxNameTxCache(coin: coin));
-    await DB.instance
-        .deleteAll<dynamic>(boxName: DB.instance.boxNameSetCache(coin: coin));
-    await DB.instance.deleteAll<dynamic>(
-        boxName: DB.instance.boxNameUsedSerialsCache(coin: coin));
+    await DB.instance.closeAnonymitySetCacheBox(coin: coin);
   }
 }
diff --git a/lib/utilities/db_version_migration.dart b/lib/utilities/db_version_migration.dart
index 0945e811d..5fbabcf91 100644
--- a/lib/utilities/db_version_migration.dart
+++ b/lib/utilities/db_version_migration.dart
@@ -1,7 +1,7 @@
 import 'package:hive/hive.dart';
 import 'package:isar/isar.dart';
-import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/db/hive/db.dart';
+import 'package:stackduo/db/isar/main_db.dart';
 import 'package:stackduo/models/contact.dart';
 import 'package:stackduo/models/exchange/change_now/exchange_transaction.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
diff --git a/test/cached_electrumx_test.dart b/test/cached_electrumx_test.dart
index 052bf87b2..439013868 100644
--- a/test/cached_electrumx_test.dart
+++ b/test/cached_electrumx_test.dart
@@ -13,6 +13,10 @@ void main() {
   group("tests using mock hive", () {
     setUp(() async {
       await setUpTestHive();
+      // await Hive.openBox<dynamic>(
+      //     DB.instance.boxNameUsedSerialsCache(coin: Coin.firo));
+      // await Hive.openBox<dynamic>(DB.instance.boxNameSetCache(coin: Coin.firo));
+      // await Hive.openBox<dynamic>(DB.instance.boxNameTxCache(coin: Coin.firo));
     });
     group("getAnonymitySet", () {
       // test("empty set cache call", () async {
diff --git a/test/hive/db_test.dart b/test/hive/db_test.dart
index bba2bc666..d9c9bf405 100644
--- a/test/hive/db_test.dart
+++ b/test/hive/db_test.dart
@@ -1,12 +1,10 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hive_test/hive_test.dart';
 import 'package:stackduo/db/hive/db.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
 
 void main() {
   group("DB box names", () {
     test("address book", () => expect(DB.boxNameAddressBook, "addressBook"));
-    test("debug info", () => expect(DB.boxNameDebugInfo, "debugInfoBox"));
     test("nodes", () => expect(DB.boxNameNodeModels, "nodeModels"));
     test("primary nodes", () => expect(DB.boxNamePrimaryNodes, "primaryNodes"));
     test("wallets info", () => expect(DB.boxNameAllWalletsData, "wallets"));
@@ -33,26 +31,6 @@ void main() {
             expect(DB.boxNameWalletsToDeleteOnStart, "walletsToDeleteOnStart"));
     test("price cache",
         () => expect(DB.boxNamePriceCache, "priceAPIPrice24hCache"));
-
-    test("boxNameTxCache", () {
-      for (final coin in Coin.values) {
-        expect(DB.instance.boxNameTxCache(coin: coin), "${coin.name}_txCache");
-      }
-    });
-
-    test("boxNameSetCache", () {
-      for (final coin in Coin.values) {
-        expect(DB.instance.boxNameSetCache(coin: coin),
-            "${coin.name}_anonymitySetCache");
-      }
-    });
-
-    test("boxNameUsedSerialsCache", () {
-      for (final coin in Coin.values) {
-        expect(DB.instance.boxNameUsedSerialsCache(coin: coin),
-            "${coin.name}_usedSerialsCache");
-      }
-    });
   });
 
   group("tests requiring test hive environment", () {

From 9b50000a36d758cee66c87d9b2a1da41e762168e Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 3 Jul 2023 16:38:43 -0600
Subject: [PATCH 81/87] simply closing cache boxes won't play nice with
 concurrency so we'll need to settle on just opening them as needed

(cherry picked from commit a509dc40ea6101db9e230ce7c3ada84d84585160)
---
 lib/electrumx_rpc/cached_electrumx.dart | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/electrumx_rpc/cached_electrumx.dart b/lib/electrumx_rpc/cached_electrumx.dart
index 951ddf943..6941db12f 100644
--- a/lib/electrumx_rpc/cached_electrumx.dart
+++ b/lib/electrumx_rpc/cached_electrumx.dart
@@ -93,8 +93,6 @@ class CachedElectrumX {
           "Failed to process CachedElectrumX.getAnonymitySet(): $e\n$s",
           level: LogLevel.Error);
       rethrow;
-    } finally {
-      await DB.instance.closeAnonymitySetCacheBox(coin: coin);
     }
   }
 
@@ -144,8 +142,6 @@ class CachedElectrumX {
           "Failed to process CachedElectrumX.getTransaction(): $e\n$s",
           level: LogLevel.Error);
       rethrow;
-    } finally {
-      await DB.instance.closeTxCacheBox(coin: coin);
     }
   }
 
@@ -187,8 +183,6 @@ class CachedElectrumX {
           "Failed to process CachedElectrumX.getTransaction(): $e\n$s",
           level: LogLevel.Error);
       rethrow;
-    } finally {
-      await DB.instance.closeUsedSerialsCacheBox(coin: coin);
     }
   }
 

From 3307bc2a947f91e56aaaa5e94b7c1ac96240f501 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 3 Jul 2023 16:42:45 -0600
Subject: [PATCH 82/87] don't open legacy trades box unless during migration

(cherry picked from commit fe8ad00b9b32c9e6195a9b490afa379ead0501bc)
---
 lib/db/hive/db.dart | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/db/hive/db.dart b/lib/db/hive/db.dart
index 369a45520..3a8f241bb 100644
--- a/lib/db/hive/db.dart
+++ b/lib/db/hive/db.dart
@@ -3,7 +3,6 @@ import 'dart:isolate';
 import 'package:cw_core/wallet_info.dart' as xmr;
 import 'package:hive/hive.dart';
 import 'package:mutex/mutex.dart';
-import 'package:stackduo/models/exchange/change_now/exchange_transaction.dart';
 import 'package:stackduo/models/exchange/response_objects/trade.dart';
 import 'package:stackduo/models/node_model.dart';
 import 'package:stackduo/models/notification_model.dart';
@@ -52,7 +51,6 @@ class DB {
   Box<NotificationModel>? _boxNotifications;
   Box<NotificationModel>? _boxWatchedTransactions;
   Box<NotificationModel>? _boxWatchedTrades;
-  Box<ExchangeTransaction>? _boxTrades;
   Box<Trade>? _boxTradesV2;
   Box<String>? _boxTradeNotes;
   Box<String>? _boxFavoriteWallets;
@@ -127,7 +125,6 @@ class DB {
         await Hive.openBox<NotificationModel>(boxNameWatchedTransactions);
     _boxWatchedTrades =
         await Hive.openBox<NotificationModel>(boxNameWatchedTrades);
-    _boxTrades = await Hive.openBox<ExchangeTransaction>(boxNameTrades);
     _boxTradesV2 = await Hive.openBox<Trade>(boxNameTradesV2);
     _boxTradeNotes = await Hive.openBox<String>(boxNameTradeNotes);
     _boxTradeLookup = await Hive.openBox<TradeWalletLookup>(boxNameTradeLookup);

From c5a3cf973f7e64111efe952247766c0184eac8c9 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 3 Jul 2023 18:25:18 -0600
Subject: [PATCH 83/87] use relative path for theme assets

(cherry picked from commit 87ed25bd5b6df6ab88650d7f7ecd37ba0c3337c2)
---
 lib/main.dart                                 |    6 +-
 lib/models/isar/stack_theme.dart              |  431 +++----
 lib/models/isar/stack_theme.g.dart            |  583 ++++-----
 .../sub_widgets/stack_theme_card.dart         |    2 +-
 lib/themes/theme_service.dart                 |    7 +-
 lib/utilities/stack_file_system.dart          |   11 +-
 .../notifications/notification_card_test.dart |  117 +-
 test/pages/send_view/send_view_test.dart      |  356 +++---
 test/widget_tests/address_book_card_test.dart |    2 -
 test/widget_tests/animated_text_test.dart     |   14 +-
 .../app_bar_icon_button_test.dart             |   14 +-
 .../draggable_switch_button_test.dart         |   26 +-
 .../custom_buttons/favorite_toggle_test.dart  |   29 +-
 .../custom_loading_overlay_test.dart          |   52 +-
 test/widget_tests/custom_pin_put_test.dart    |   13 +-
 .../desktop/custom_text_button_test.dart      |   15 +-
 .../desktop/desktop_app_bar_test.dart         |   18 +-
 .../desktop_dialog_close_button_test.dart     |   16 +-
 .../desktop/desktop_dialog_test.dart          |   16 +-
 .../desktop/desktop_scaffold_test.dart        |  130 +-
 .../widget_tests/emoji_select_sheet_test.dart |   20 +-
 .../icon_widgets/addressbook_icon_test.dart   |   14 +-
 test/widget_tests/managed_favorite_test.dart  |  130 +-
 test/widget_tests/node_card_test.dart         |   33 +-
 .../widget_tests/node_options_sheet_test.dart |   33 +-
 test/widget_tests/progress_bar_test.dart      |   20 +-
 test/widget_tests/shake/shake_test.dart       |   35 +-
 test/widget_tests/stack_dialog_test.dart      |   26 +-
 .../table_view/table_view_cell_test.dart      |   14 +-
 .../table_view/table_view_row_test.dart       |   71 +-
 .../table_view/table_view_test.dart           |   18 +-
 .../textfield_icon_button_test.dart           |   16 +-
 test/widget_tests/trade_card_test.dart        |   31 +-
 test/widget_tests/transaction_card_test.dart  | 1060 +++++++++--------
 .../wallet_info_row_balance_future_test.dart  |   39 +-
 .../wallet_info_row/wallet_info_row_test.dart |   50 +-
 36 files changed, 1973 insertions(+), 1495 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index f41e3d9da..1333fa222 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -156,6 +156,8 @@ void main() async {
   await Hive.openBox<dynamic>(DB.boxNamePrefs);
   await Prefs.instance.init();
 
+  await StackFileSystem.initThemesDir();
+
   // Desktop migrate handled elsewhere (currently desktop_login_view.dart)
   if (!Util.isDesktop) {
     int dbVersion = DB.instance.get<dynamic>(
@@ -291,7 +293,7 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
       }
 
       ref.read(applicationThemesDirectoryPathProvider.notifier).state =
-          (await StackFileSystem.applicationThemesDirectory()).path;
+          StackFileSystem.themesDir!.path;
 
       _notificationsService = ref.read(notificationsProvider);
       _nodeService = ref.read(nodeServiceChangeNotifierProvider);
@@ -386,7 +388,7 @@ class _MaterialAppWithThemeState extends ConsumerState<MaterialAppWithTheme>
     WidgetsBinding.instance.addPostFrameCallback((_) async {
       //Add themes path to provider
       ref.read(applicationThemesDirectoryPathProvider.notifier).state =
-          (await StackFileSystem.applicationThemesDirectory()).path;
+          StackFileSystem.themesDir!.path;
 
       ref.read(themeProvider.state).state = ref.read(pThemeService).getTheme(
             themeId: themeId,
diff --git a/lib/models/isar/stack_theme.dart b/lib/models/isar/stack_theme.dart
index 7c4a2c930..27a0c4601 100644
--- a/lib/models/isar/stack_theme.dart
+++ b/lib/models/isar/stack_theme.dart
@@ -1498,7 +1498,6 @@ class StackTheme {
 
   factory StackTheme.fromJson({
     required Map<String, dynamic> json,
-    required String applicationThemesDirectoryPath,
   }) {
     final version = json["version"] as int? ?? 1;
 
@@ -1507,21 +1506,18 @@ class StackTheme {
       ..assetsV1 = version == 1
           ? ThemeAssets.fromJson(
               json: Map<String, dynamic>.from(json["assets"] as Map),
-              applicationThemesDirectoryPath: applicationThemesDirectoryPath,
               themeId: json["id"] as String,
             )
           : null
       ..assetsV2 = version == 2
           ? ThemeAssetsV2.fromJson(
               json: Map<String, dynamic>.from(json["assets"] as Map),
-              applicationThemesDirectoryPath: applicationThemesDirectoryPath,
               themeId: json["id"] as String,
             )
           : null
       ..assetsV3 = version >= 3
           ? ThemeAssetsV3.fromJson(
               json: Map<String, dynamic>.from(json["assets"] as Map),
-              applicationThemesDirectoryPath: applicationThemesDirectoryPath,
               themeId: json["id"] as String,
             )
           : null
@@ -1944,117 +1940,81 @@ class ThemeAssets implements IThemeAssets {
 
   factory ThemeAssets.fromJson({
     required Map<String, dynamic> json,
-    required String applicationThemesDirectoryPath,
     required String themeId,
   }) {
     return ThemeAssets()
-      ..bellNew =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["bell_new"] as String}"
-      ..buy =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["buy"] as String}"
-      ..exchange =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["exchange"] as String}"
+      ..bellNew = "$themeId/assets/${json["bell_new"] as String}"
+      ..buy = "$themeId/assets/${json["buy"] as String}"
+      ..exchange = "$themeId/assets/${json["exchange"] as String}"
       ..personaIncognito =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_incognito"] as String}"
-      ..personaEasy =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_easy"] as String}"
-      ..stack =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack"] as String}"
-      ..stackIcon =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack_icon"] as String}"
-      ..receive =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive"] as String}"
-      ..receivePending =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_pending"] as String}"
+          "$themeId/assets/${json["persona_incognito"] as String}"
+      ..personaEasy = "$themeId/assets/${json["persona_easy"] as String}"
+      ..stack = "$themeId/assets/${json["stack"] as String}"
+      ..stackIcon = "$themeId/assets/${json["stack_icon"] as String}"
+      ..receive = "$themeId/assets/${json["receive"] as String}"
+      ..receivePending = "$themeId/assets/${json["receive_pending"] as String}"
       ..receiveCancelled =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_cancelled"] as String}"
-      ..send =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["send"] as String}"
-      ..sendPending =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_pending"] as String}"
-      ..sendCancelled =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_cancelled"] as String}"
-      ..themeSelector =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_selector"] as String}"
-      ..themePreview =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_preview"] as String}"
-      ..txExchange =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange"] as String}"
+          "$themeId/assets/${json["receive_cancelled"] as String}"
+      ..send = "$themeId/assets/${json["send"] as String}"
+      ..sendPending = "$themeId/assets/${json["send_pending"] as String}"
+      ..sendCancelled = "$themeId/assets/${json["send_cancelled"] as String}"
+      ..themeSelector = "$themeId/assets/${json["theme_selector"] as String}"
+      ..themePreview = "$themeId/assets/${json["theme_preview"] as String}"
+      ..txExchange = "$themeId/assets/${json["tx_exchange"] as String}"
       ..txExchangePending =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_pending"] as String}"
+          "$themeId/assets/${json["tx_exchange_pending"] as String}"
       ..txExchangeFailed =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_failed"] as String}"
-      ..bitcoin =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoin"] as String}"
-      ..litecoin =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["litecoin"] as String}"
-      ..bitcoincash =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoincash"] as String}"
-      ..dogecoin =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["dogecoin"] as String}"
-      ..epicCash =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["epicCash"] as String}"
-      ..ethereum =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["ethereum"] as String}"
-      ..firo =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["firo"] as String}"
-      ..monero =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["monero"] as String}"
-      ..wownero =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["wownero"] as String}"
-      ..namecoin =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["namecoin"] as String}"
-      ..particl =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["particl"] as String}"
-      ..bitcoinImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoin_image"] as String}"
+          "$themeId/assets/${json["tx_exchange_failed"] as String}"
+      ..bitcoin = "$themeId/assets/${json["bitcoin"] as String}"
+      ..litecoin = "$themeId/assets/${json["litecoin"] as String}"
+      ..bitcoincash = "$themeId/assets/${json["bitcoincash"] as String}"
+      ..dogecoin = "$themeId/assets/${json["dogecoin"] as String}"
+      ..epicCash = "$themeId/assets/${json["epicCash"] as String}"
+      ..ethereum = "$themeId/assets/${json["ethereum"] as String}"
+      ..firo = "$themeId/assets/${json["firo"] as String}"
+      ..monero = "$themeId/assets/${json["monero"] as String}"
+      ..wownero = "$themeId/assets/${json["wownero"] as String}"
+      ..namecoin = "$themeId/assets/${json["namecoin"] as String}"
+      ..particl = "$themeId/assets/${json["particl"] as String}"
+      ..bitcoinImage = "$themeId/assets/${json["bitcoin_image"] as String}"
       ..bitcoincashImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoincash_image"] as String}"
-      ..dogecoinImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["dogecoin_image"] as String}"
-      ..epicCashImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["epicCash_image"] as String}"
-      ..ethereumImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["ethereum_image"] as String}"
-      ..firoImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["firo_image"] as String}"
-      ..litecoinImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["litecoin_image"] as String}"
-      ..moneroImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["monero_image"] as String}"
-      ..wowneroImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["wownero_image"] as String}"
-      ..namecoinImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["namecoin_image"] as String}"
-      ..particlImage =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["particl_image"] as String}"
+          "$themeId/assets/${json["bitcoincash_image"] as String}"
+      ..dogecoinImage = "$themeId/assets/${json["dogecoin_image"] as String}"
+      ..epicCashImage = "$themeId/assets/${json["epicCash_image"] as String}"
+      ..ethereumImage = "$themeId/assets/${json["ethereum_image"] as String}"
+      ..firoImage = "$themeId/assets/${json["firo_image"] as String}"
+      ..litecoinImage = "$themeId/assets/${json["litecoin_image"] as String}"
+      ..moneroImage = "$themeId/assets/${json["monero_image"] as String}"
+      ..wowneroImage = "$themeId/assets/${json["wownero_image"] as String}"
+      ..namecoinImage = "$themeId/assets/${json["namecoin_image"] as String}"
+      ..particlImage = "$themeId/assets/${json["particl_image"] as String}"
       ..bitcoinImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoin_image_secondary"] as String}"
+          "$themeId/assets/${json["bitcoin_image_secondary"] as String}"
       ..bitcoincashImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["bitcoincash_image_secondary"] as String}"
+          "$themeId/assets/${json["bitcoincash_image_secondary"] as String}"
       ..dogecoinImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["dogecoin_image_secondary"] as String}"
+          "$themeId/assets/${json["dogecoin_image_secondary"] as String}"
       ..epicCashImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["epicCash_image_secondary"] as String}"
+          "$themeId/assets/${json["epicCash_image_secondary"] as String}"
       ..ethereumImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["ethereum_image_secondary"] as String}"
+          "$themeId/assets/${json["ethereum_image_secondary"] as String}"
       ..firoImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["firo_image_secondary"] as String}"
+          "$themeId/assets/${json["firo_image_secondary"] as String}"
       ..litecoinImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["litecoin_image_secondary"] as String}"
+          "$themeId/assets/${json["litecoin_image_secondary"] as String}"
       ..moneroImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["monero_image_secondary"] as String}"
+          "$themeId/assets/${json["monero_image_secondary"] as String}"
       ..wowneroImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["wownero_image_secondary"] as String}"
+          "$themeId/assets/${json["wownero_image_secondary"] as String}"
       ..namecoinImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["namecoin_image_secondary"] as String}"
+          "$themeId/assets/${json["namecoin_image_secondary"] as String}"
       ..particlImageSecondary =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["particl_image_secondary"] as String}"
+          "$themeId/assets/${json["particl_image_secondary"] as String}"
       ..loadingGif = json["loading_gif"] is String
-          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["loading_gif"] as String}"
+          ? "$themeId/assets/${json["loading_gif"] as String}"
           : null
       ..background = json["background"] is String
-          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["background"] as String}"
+          ? "$themeId/assets/${json["background"] as String}"
           : null;
   }
 }
@@ -2136,65 +2096,50 @@ class ThemeAssetsV2 implements IThemeAssets {
 
   factory ThemeAssetsV2.fromJson({
     required Map<String, dynamic> json,
-    required String applicationThemesDirectoryPath,
     required String themeId,
   }) {
     return ThemeAssetsV2()
-      ..bellNew =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["bell_new"] as String}"
-      ..buy =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["buy"] as String}"
-      ..exchange =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["exchange"] as String}"
+      ..bellNew = "$themeId/assets/${json["bell_new"] as String}"
+      ..buy = "$themeId/assets/${json["buy"] as String}"
+      ..exchange = "$themeId/assets/${json["exchange"] as String}"
       ..personaIncognito =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_incognito"] as String}"
-      ..personaEasy =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_easy"] as String}"
-      ..stack =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack"] as String}"
-      ..stackIcon =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack_icon"] as String}"
-      ..receive =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive"] as String}"
-      ..receivePending =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_pending"] as String}"
+          "$themeId/assets/${json["persona_incognito"] as String}"
+      ..personaEasy = "$themeId/assets/${json["persona_easy"] as String}"
+      ..stack = "$themeId/assets/${json["stack"] as String}"
+      ..stackIcon = "$themeId/assets/${json["stack_icon"] as String}"
+      ..receive = "$themeId/assets/${json["receive"] as String}"
+      ..receivePending = "$themeId/assets/${json["receive_pending"] as String}"
       ..receiveCancelled =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_cancelled"] as String}"
-      ..send =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["send"] as String}"
-      ..sendPending =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_pending"] as String}"
-      ..sendCancelled =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_cancelled"] as String}"
-      ..themeSelector =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_selector"] as String}"
-      ..themePreview =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_preview"] as String}"
-      ..txExchange =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange"] as String}"
+          "$themeId/assets/${json["receive_cancelled"] as String}"
+      ..send = "$themeId/assets/${json["send"] as String}"
+      ..sendPending = "$themeId/assets/${json["send_pending"] as String}"
+      ..sendCancelled = "$themeId/assets/${json["send_cancelled"] as String}"
+      ..themeSelector = "$themeId/assets/${json["theme_selector"] as String}"
+      ..themePreview = "$themeId/assets/${json["theme_preview"] as String}"
+      ..txExchange = "$themeId/assets/${json["tx_exchange"] as String}"
       ..txExchangePending =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_pending"] as String}"
+          "$themeId/assets/${json["tx_exchange_pending"] as String}"
       ..txExchangeFailed =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_failed"] as String}"
+          "$themeId/assets/${json["tx_exchange_failed"] as String}"
       ..coinPlaceholder =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["coin_placeholder"] as String}"
+          "$themeId/assets/${json["coin_placeholder"] as String}"
       ..coinIconsString = createCoinAssetsString(
-        "$applicationThemesDirectoryPath/$themeId/assets",
+        "$themeId/assets",
         Map<String, dynamic>.from(json["coins"]["icons"] as Map),
       )
       ..coinImagesString = createCoinAssetsString(
-        "$applicationThemesDirectoryPath/$themeId/assets",
+        "$themeId/assets",
         Map<String, dynamic>.from(json["coins"]["images"] as Map),
       )
       ..coinSecondaryImagesString = createCoinAssetsString(
-        "$applicationThemesDirectoryPath/$themeId/assets",
+        "$themeId/assets",
         Map<String, dynamic>.from(json["coins"]["secondaries"] as Map),
       )
       ..loadingGif = json["loading_gif"] is String
-          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["loading_gif"] as String}"
+          ? "$themeId/assets/${json["loading_gif"] as String}"
           : null
       ..background = json["background"] is String
-          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["background"] as String}"
+          ? "$themeId/assets/${json["background"] as String}"
           : null;
   }
 
@@ -2255,48 +2200,132 @@ class ThemeAssetsV2 implements IThemeAssets {
 
 @Embedded(inheritance: false)
 class ThemeAssetsV3 implements IThemeAssets {
+  @Name("bellNew")
+  late final String bellNewRelative;
   @override
-  late final String bellNew;
+  @ignore
+  String get bellNew => prependIfNeeded(bellNewRelative);
+
+  @Name("buy")
+  late final String buyRelative;
   @override
-  late final String buy;
+  @ignore
+  String get buy => prependIfNeeded(buyRelative);
+
+  @Name("exchange")
+  late final String exchangeRelative;
   @override
-  late final String exchange;
+  @ignore
+  String get exchange => prependIfNeeded(exchangeRelative);
+
+  @Name("personaIncognito")
+  late final String personaIncognitoRelative;
   @override
-  late final String personaIncognito;
+  @ignore
+  String get personaIncognito => prependIfNeeded(personaIncognitoRelative);
+
+  @Name("personaEasy")
+  late final String personaEasyRelative;
   @override
-  late final String personaEasy;
+  @ignore
+  String get personaEasy => prependIfNeeded(personaEasyRelative);
+
+  @Name("stack")
+  late final String stackRelative;
   @override
-  late final String stack;
+  @ignore
+  String get stack => prependIfNeeded(stackRelative);
+
+  @Name("stackIcon")
+  late final String stackIconRelative;
   @override
-  late final String stackIcon;
+  @ignore
+  String get stackIcon => prependIfNeeded(stackIconRelative);
+
+  @Name("receive")
+  late final String receiveRelative;
   @override
-  late final String receive;
+  @ignore
+  String get receive => prependIfNeeded(receiveRelative);
+
+  @Name("receivePending")
+  late final String receivePendingRelative;
   @override
-  late final String receivePending;
+  @ignore
+  String get receivePending => prependIfNeeded(receivePendingRelative);
+
+  @Name("receiveCancelled")
+  late final String receiveCancelledRelative;
   @override
-  late final String receiveCancelled;
+  @ignore
+  String get receiveCancelled => prependIfNeeded(receiveCancelledRelative);
+
+  @Name("send")
+  late final String sendRelative;
   @override
-  late final String send;
+  @ignore
+  String get send => prependIfNeeded(sendRelative);
+
+  @Name("sendPending")
+  late final String sendPendingRelative;
   @override
-  late final String sendPending;
+  @ignore
+  String get sendPending => prependIfNeeded(sendPendingRelative);
+
+  @Name("sendCancelled")
+  late final String sendCancelledRelative;
   @override
-  late final String sendCancelled;
+  @ignore
+  String get sendCancelled => prependIfNeeded(sendCancelledRelative);
+
+  @Name("themeSelector")
+  late final String themeSelectorRelative;
   @override
-  late final String themeSelector;
+  @ignore
+  String get themeSelector => prependIfNeeded(themeSelectorRelative);
+
+  @Name("themePreview")
+  late final String themePreviewRelative;
   @override
-  late final String themePreview;
+  @ignore
+  String get themePreview => prependIfNeeded(themePreviewRelative);
+
+  @Name("txExchange")
+  late final String txExchangeRelative;
   @override
-  late final String txExchange;
+  @ignore
+  String get txExchange => prependIfNeeded(txExchangeRelative);
+
+  @Name("txExchangePending")
+  late final String txExchangePendingRelative;
   @override
-  late final String txExchangePending;
+  @ignore
+  String get txExchangePending => prependIfNeeded(txExchangePendingRelative);
+
+  @Name("txExchangeFailed")
+  late final String txExchangeFailedRelative;
   @override
-  late final String txExchangeFailed;
+  @ignore
+  String get txExchangeFailed => prependIfNeeded(txExchangeFailedRelative);
+
+  @Name("loadingGif")
+  late final String? loadingGifRelative;
   @override
-  late final String? loadingGif;
+  @ignore
+  String? get loadingGif =>
+      loadingGifRelative != null ? prependIfNeeded(loadingGifRelative!) : null;
+
+  @Name("background")
+  late final String? backgroundRelative;
   @override
-  late final String? background;
+  @ignore
+  String? get background =>
+      backgroundRelative != null ? prependIfNeeded(backgroundRelative!) : null;
 
-  late final String coinPlaceholder;
+  @Name("coinPlaceholder")
+  late final String coinPlaceholderRelative;
+  @ignore
+  String get coinPlaceholder => prependIfNeeded(coinPlaceholderRelative);
 
   // Added some future proof params in case we want to add anything else
   // This should provide some buffer in stead of creating assetsV4 etc
@@ -2351,77 +2380,77 @@ class ThemeAssetsV3 implements IThemeAssets {
 
   factory ThemeAssetsV3.fromJson({
     required Map<String, dynamic> json,
-    required String applicationThemesDirectoryPath,
     required String themeId,
   }) {
     return ThemeAssetsV3()
-      ..bellNew =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["bell_new"] as String}"
-      ..buy =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["buy"] as String}"
-      ..exchange =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["exchange"] as String}"
-      ..personaIncognito =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_incognito"] as String}"
-      ..personaEasy =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["persona_easy"] as String}"
-      ..stack =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack"] as String}"
-      ..stackIcon =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["stack_icon"] as String}"
-      ..receive =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive"] as String}"
-      ..receivePending =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_pending"] as String}"
-      ..receiveCancelled =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["receive_cancelled"] as String}"
-      ..send =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["send"] as String}"
-      ..sendPending =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_pending"] as String}"
-      ..sendCancelled =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["send_cancelled"] as String}"
-      ..themeSelector =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_selector"] as String}"
-      ..themePreview =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["theme_preview"] as String}"
-      ..txExchange =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange"] as String}"
-      ..txExchangePending =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_pending"] as String}"
-      ..txExchangeFailed =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["tx_exchange_failed"] as String}"
-      ..coinPlaceholder =
-          "$applicationThemesDirectoryPath/$themeId/assets/${json["coin_placeholder"] as String}"
+      ..bellNewRelative = "$themeId/assets/${json["bell_new"] as String}"
+      ..buyRelative = "$themeId/assets/${json["buy"] as String}"
+      ..exchangeRelative = "$themeId/assets/${json["exchange"] as String}"
+      ..personaIncognitoRelative =
+          "$themeId/assets/${json["persona_incognito"] as String}"
+      ..personaEasyRelative =
+          "$themeId/assets/${json["persona_easy"] as String}"
+      ..stackRelative = "$themeId/assets/${json["stack"] as String}"
+      ..stackIconRelative = "$themeId/assets/${json["stack_icon"] as String}"
+      ..receiveRelative = "$themeId/assets/${json["receive"] as String}"
+      ..receivePendingRelative =
+          "$themeId/assets/${json["receive_pending"] as String}"
+      ..receiveCancelledRelative =
+          "$themeId/assets/${json["receive_cancelled"] as String}"
+      ..sendRelative = "$themeId/assets/${json["send"] as String}"
+      ..sendPendingRelative =
+          "$themeId/assets/${json["send_pending"] as String}"
+      ..sendCancelledRelative =
+          "$themeId/assets/${json["send_cancelled"] as String}"
+      ..themeSelectorRelative =
+          "$themeId/assets/${json["theme_selector"] as String}"
+      ..themePreviewRelative =
+          "$themeId/assets/${json["theme_preview"] as String}"
+      ..txExchangeRelative = "$themeId/assets/${json["tx_exchange"] as String}"
+      ..txExchangePendingRelative =
+          "$themeId/assets/${json["tx_exchange_pending"] as String}"
+      ..txExchangeFailedRelative =
+          "$themeId/assets/${json["tx_exchange_failed"] as String}"
+      ..coinPlaceholderRelative =
+          "$themeId/assets/${json["coin_placeholder"] as String}"
       ..coinIconsString = createCoinAssetsString(
-        "$applicationThemesDirectoryPath/$themeId/assets",
+        "$themeId/assets",
         Map<String, dynamic>.from(json["coins"]["icons"] as Map),
       )
       ..coinImagesString = createCoinAssetsString(
-        "$applicationThemesDirectoryPath/$themeId/assets",
+        "$themeId/assets",
         Map<String, dynamic>.from(json["coins"]["images"] as Map),
       )
       ..coinSecondaryImagesString = createCoinAssetsString(
-        "$applicationThemesDirectoryPath/$themeId/assets",
+        "$themeId/assets",
         Map<String, dynamic>.from(json["coins"]["secondaries"] as Map),
       )
       ..coinCardImagesString = json["coins"]["cards"] is Map
           ? createCoinAssetsString(
-              "$applicationThemesDirectoryPath/$themeId/assets",
+              "$themeId/assets",
               Map<String, dynamic>.from(json["coins"]["cards"] as Map),
             )
           : null
-      ..loadingGif = json["loading_gif"] is String
-          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["loading_gif"] as String}"
+      ..loadingGifRelative = json["loading_gif"] is String
+          ? "$themeId/assets/${json["loading_gif"] as String}"
           : null
-      ..background = json["background"] is String
-          ? "$applicationThemesDirectoryPath/$themeId/assets/${json["background"] as String}"
+      ..backgroundRelative = json["background"] is String
+          ? "$themeId/assets/${json["background"] as String}"
           : null
       ..dummy1 = null
       ..dummy2 = null
       ..dummy3 = null;
   }
 
+  static String prependIfNeeded(String relativePath) {
+    final path = StackFileSystem.themesDir!.path;
+    if (relativePath.startsWith(path)) {
+      return relativePath;
+    } else {
+      return "$path/$relativePath";
+    }
+  }
+
   static String createCoinAssetsString(String path, Map<String, dynamic> json) {
     final Map<String, dynamic> map = {};
     for (final entry in json.entries) {
@@ -2441,6 +2470,8 @@ class ThemeAssetsV3 implements IThemeAssets {
 
     for (final coin in Coin.values) {
       result[coin] = map[coin.name] as String? ?? placeHolder;
+
+      result[coin] = prependIfNeeded(result[coin]!);
     }
 
     return result;
diff --git a/lib/models/isar/stack_theme.g.dart b/lib/models/isar/stack_theme.g.dart
index e1bb0a549..bf38c461d 100644
--- a/lib/models/isar/stack_theme.g.dart
+++ b/lib/models/isar/stack_theme.g.dart
@@ -29601,13 +29601,13 @@ int _themeAssetsV3EstimateSize(
 ) {
   var bytesCount = offsets.last;
   {
-    final value = object.background;
+    final value = object.backgroundRelative;
     if (value != null) {
       bytesCount += 3 + value.length * 3;
     }
   }
-  bytesCount += 3 + object.bellNew.length * 3;
-  bytesCount += 3 + object.buy.length * 3;
+  bytesCount += 3 + object.bellNewRelative.length * 3;
+  bytesCount += 3 + object.buyRelative.length * 3;
   {
     final value = object.coinCardImagesString;
     if (value != null) {
@@ -29616,11 +29616,11 @@ int _themeAssetsV3EstimateSize(
   }
   bytesCount += 3 + object.coinIconsString.length * 3;
   bytesCount += 3 + object.coinImagesString.length * 3;
-  bytesCount += 3 + object.coinPlaceholder.length * 3;
+  bytesCount += 3 + object.coinPlaceholderRelative.length * 3;
   bytesCount += 3 + object.coinSecondaryImagesString.length * 3;
-  bytesCount += 3 + object.exchange.length * 3;
+  bytesCount += 3 + object.exchangeRelative.length * 3;
   {
-    final value = object.loadingGif;
+    final value = object.loadingGifRelative;
     if (value != null) {
       bytesCount += 3 + value.length * 3;
     }
@@ -29643,21 +29643,21 @@ int _themeAssetsV3EstimateSize(
       bytesCount += 3 + value.length * 3;
     }
   }
-  bytesCount += 3 + object.personaEasy.length * 3;
-  bytesCount += 3 + object.personaIncognito.length * 3;
-  bytesCount += 3 + object.receive.length * 3;
-  bytesCount += 3 + object.receiveCancelled.length * 3;
-  bytesCount += 3 + object.receivePending.length * 3;
-  bytesCount += 3 + object.send.length * 3;
-  bytesCount += 3 + object.sendCancelled.length * 3;
-  bytesCount += 3 + object.sendPending.length * 3;
-  bytesCount += 3 + object.stack.length * 3;
-  bytesCount += 3 + object.stackIcon.length * 3;
-  bytesCount += 3 + object.themePreview.length * 3;
-  bytesCount += 3 + object.themeSelector.length * 3;
-  bytesCount += 3 + object.txExchange.length * 3;
-  bytesCount += 3 + object.txExchangeFailed.length * 3;
-  bytesCount += 3 + object.txExchangePending.length * 3;
+  bytesCount += 3 + object.personaEasyRelative.length * 3;
+  bytesCount += 3 + object.personaIncognitoRelative.length * 3;
+  bytesCount += 3 + object.receiveRelative.length * 3;
+  bytesCount += 3 + object.receiveCancelledRelative.length * 3;
+  bytesCount += 3 + object.receivePendingRelative.length * 3;
+  bytesCount += 3 + object.sendRelative.length * 3;
+  bytesCount += 3 + object.sendCancelledRelative.length * 3;
+  bytesCount += 3 + object.sendPendingRelative.length * 3;
+  bytesCount += 3 + object.stackRelative.length * 3;
+  bytesCount += 3 + object.stackIconRelative.length * 3;
+  bytesCount += 3 + object.themePreviewRelative.length * 3;
+  bytesCount += 3 + object.themeSelectorRelative.length * 3;
+  bytesCount += 3 + object.txExchangeRelative.length * 3;
+  bytesCount += 3 + object.txExchangeFailedRelative.length * 3;
+  bytesCount += 3 + object.txExchangePendingRelative.length * 3;
   return bytesCount;
 }
 
@@ -29667,34 +29667,34 @@ void _themeAssetsV3Serialize(
   List<int> offsets,
   Map<Type, List<int>> allOffsets,
 ) {
-  writer.writeString(offsets[0], object.background);
-  writer.writeString(offsets[1], object.bellNew);
-  writer.writeString(offsets[2], object.buy);
+  writer.writeString(offsets[0], object.backgroundRelative);
+  writer.writeString(offsets[1], object.bellNewRelative);
+  writer.writeString(offsets[2], object.buyRelative);
   writer.writeString(offsets[3], object.coinCardImagesString);
   writer.writeString(offsets[4], object.coinIconsString);
   writer.writeString(offsets[5], object.coinImagesString);
-  writer.writeString(offsets[6], object.coinPlaceholder);
+  writer.writeString(offsets[6], object.coinPlaceholderRelative);
   writer.writeString(offsets[7], object.coinSecondaryImagesString);
-  writer.writeString(offsets[8], object.exchange);
-  writer.writeString(offsets[9], object.loadingGif);
+  writer.writeString(offsets[8], object.exchangeRelative);
+  writer.writeString(offsets[9], object.loadingGifRelative);
   writer.writeString(offsets[10], object.dummy1);
   writer.writeString(offsets[11], object.dummy2);
   writer.writeString(offsets[12], object.dummy3);
-  writer.writeString(offsets[13], object.personaEasy);
-  writer.writeString(offsets[14], object.personaIncognito);
-  writer.writeString(offsets[15], object.receive);
-  writer.writeString(offsets[16], object.receiveCancelled);
-  writer.writeString(offsets[17], object.receivePending);
-  writer.writeString(offsets[18], object.send);
-  writer.writeString(offsets[19], object.sendCancelled);
-  writer.writeString(offsets[20], object.sendPending);
-  writer.writeString(offsets[21], object.stack);
-  writer.writeString(offsets[22], object.stackIcon);
-  writer.writeString(offsets[23], object.themePreview);
-  writer.writeString(offsets[24], object.themeSelector);
-  writer.writeString(offsets[25], object.txExchange);
-  writer.writeString(offsets[26], object.txExchangeFailed);
-  writer.writeString(offsets[27], object.txExchangePending);
+  writer.writeString(offsets[13], object.personaEasyRelative);
+  writer.writeString(offsets[14], object.personaIncognitoRelative);
+  writer.writeString(offsets[15], object.receiveRelative);
+  writer.writeString(offsets[16], object.receiveCancelledRelative);
+  writer.writeString(offsets[17], object.receivePendingRelative);
+  writer.writeString(offsets[18], object.sendRelative);
+  writer.writeString(offsets[19], object.sendCancelledRelative);
+  writer.writeString(offsets[20], object.sendPendingRelative);
+  writer.writeString(offsets[21], object.stackRelative);
+  writer.writeString(offsets[22], object.stackIconRelative);
+  writer.writeString(offsets[23], object.themePreviewRelative);
+  writer.writeString(offsets[24], object.themeSelectorRelative);
+  writer.writeString(offsets[25], object.txExchangeRelative);
+  writer.writeString(offsets[26], object.txExchangeFailedRelative);
+  writer.writeString(offsets[27], object.txExchangePendingRelative);
 }
 
 ThemeAssetsV3 _themeAssetsV3Deserialize(
@@ -29704,34 +29704,34 @@ ThemeAssetsV3 _themeAssetsV3Deserialize(
   Map<Type, List<int>> allOffsets,
 ) {
   final object = ThemeAssetsV3();
-  object.background = reader.readStringOrNull(offsets[0]);
-  object.bellNew = reader.readString(offsets[1]);
-  object.buy = reader.readString(offsets[2]);
+  object.backgroundRelative = reader.readStringOrNull(offsets[0]);
+  object.bellNewRelative = reader.readString(offsets[1]);
+  object.buyRelative = reader.readString(offsets[2]);
   object.coinCardImagesString = reader.readStringOrNull(offsets[3]);
   object.coinIconsString = reader.readString(offsets[4]);
   object.coinImagesString = reader.readString(offsets[5]);
-  object.coinPlaceholder = reader.readString(offsets[6]);
+  object.coinPlaceholderRelative = reader.readString(offsets[6]);
   object.coinSecondaryImagesString = reader.readString(offsets[7]);
-  object.exchange = reader.readString(offsets[8]);
-  object.loadingGif = reader.readStringOrNull(offsets[9]);
+  object.exchangeRelative = reader.readString(offsets[8]);
+  object.loadingGifRelative = reader.readStringOrNull(offsets[9]);
   object.dummy1 = reader.readStringOrNull(offsets[10]);
   object.dummy2 = reader.readStringOrNull(offsets[11]);
   object.dummy3 = reader.readStringOrNull(offsets[12]);
-  object.personaEasy = reader.readString(offsets[13]);
-  object.personaIncognito = reader.readString(offsets[14]);
-  object.receive = reader.readString(offsets[15]);
-  object.receiveCancelled = reader.readString(offsets[16]);
-  object.receivePending = reader.readString(offsets[17]);
-  object.send = reader.readString(offsets[18]);
-  object.sendCancelled = reader.readString(offsets[19]);
-  object.sendPending = reader.readString(offsets[20]);
-  object.stack = reader.readString(offsets[21]);
-  object.stackIcon = reader.readString(offsets[22]);
-  object.themePreview = reader.readString(offsets[23]);
-  object.themeSelector = reader.readString(offsets[24]);
-  object.txExchange = reader.readString(offsets[25]);
-  object.txExchangeFailed = reader.readString(offsets[26]);
-  object.txExchangePending = reader.readString(offsets[27]);
+  object.personaEasyRelative = reader.readString(offsets[13]);
+  object.personaIncognitoRelative = reader.readString(offsets[14]);
+  object.receiveRelative = reader.readString(offsets[15]);
+  object.receiveCancelledRelative = reader.readString(offsets[16]);
+  object.receivePendingRelative = reader.readString(offsets[17]);
+  object.sendRelative = reader.readString(offsets[18]);
+  object.sendCancelledRelative = reader.readString(offsets[19]);
+  object.sendPendingRelative = reader.readString(offsets[20]);
+  object.stackRelative = reader.readString(offsets[21]);
+  object.stackIconRelative = reader.readString(offsets[22]);
+  object.themePreviewRelative = reader.readString(offsets[23]);
+  object.themeSelectorRelative = reader.readString(offsets[24]);
+  object.txExchangeRelative = reader.readString(offsets[25]);
+  object.txExchangeFailedRelative = reader.readString(offsets[26]);
+  object.txExchangePendingRelative = reader.readString(offsets[27]);
   return object;
 }
 
@@ -29806,7 +29806,7 @@ P _themeAssetsV3DeserializeProp<P>(
 extension ThemeAssetsV3QueryFilter
     on QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QFilterCondition> {
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundIsNull() {
+      backgroundRelativeIsNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(const FilterCondition.isNull(
         property: r'background',
@@ -29815,7 +29815,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundIsNotNull() {
+      backgroundRelativeIsNotNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(const FilterCondition.isNotNull(
         property: r'background',
@@ -29824,7 +29824,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundEqualTo(
+      backgroundRelativeEqualTo(
     String? value, {
     bool caseSensitive = true,
   }) {
@@ -29838,7 +29838,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundGreaterThan(
+      backgroundRelativeGreaterThan(
     String? value, {
     bool include = false,
     bool caseSensitive = true,
@@ -29854,7 +29854,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundLessThan(
+      backgroundRelativeLessThan(
     String? value, {
     bool include = false,
     bool caseSensitive = true,
@@ -29870,7 +29870,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundBetween(
+      backgroundRelativeBetween(
     String? lower,
     String? upper, {
     bool includeLower = true,
@@ -29890,7 +29890,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundStartsWith(
+      backgroundRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -29904,7 +29904,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundEndsWith(
+      backgroundRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -29918,7 +29918,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundContains(String value, {bool caseSensitive = true}) {
+      backgroundRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'background',
@@ -29929,7 +29929,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundMatches(String pattern, {bool caseSensitive = true}) {
+      backgroundRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'background',
@@ -29940,7 +29940,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundIsEmpty() {
+      backgroundRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'background',
@@ -29950,7 +29950,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      backgroundIsNotEmpty() {
+      backgroundRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'background',
@@ -29960,7 +29960,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewEqualTo(
+      bellNewRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -29974,7 +29974,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewGreaterThan(
+      bellNewRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -29990,7 +29990,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewLessThan(
+      bellNewRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -30006,7 +30006,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewBetween(
+      bellNewRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -30026,7 +30026,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewStartsWith(
+      bellNewRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -30040,7 +30040,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewEndsWith(
+      bellNewRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -30054,7 +30054,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewContains(String value, {bool caseSensitive = true}) {
+      bellNewRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'bellNew',
@@ -30065,7 +30065,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewMatches(String pattern, {bool caseSensitive = true}) {
+      bellNewRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'bellNew',
@@ -30076,7 +30076,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewIsEmpty() {
+      bellNewRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'bellNew',
@@ -30086,7 +30086,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      bellNewIsNotEmpty() {
+      bellNewRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'bellNew',
@@ -30095,7 +30095,8 @@ extension ThemeAssetsV3QueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyEqualTo(
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -30109,7 +30110,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      buyGreaterThan(
+      buyRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -30124,7 +30125,8 @@ extension ThemeAssetsV3QueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyLessThan(
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -30139,7 +30141,8 @@ extension ThemeAssetsV3QueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyBetween(
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -30159,7 +30162,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      buyStartsWith(
+      buyRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -30172,7 +30175,8 @@ extension ThemeAssetsV3QueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyEndsWith(
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -30185,9 +30189,8 @@ extension ThemeAssetsV3QueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyContains(
-      String value,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'buy',
@@ -30197,9 +30200,8 @@ extension ThemeAssetsV3QueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> buyMatches(
-      String pattern,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      buyRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'buy',
@@ -30210,7 +30212,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      buyIsEmpty() {
+      buyRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'buy',
@@ -30220,7 +30222,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      buyIsNotEmpty() {
+      buyRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'buy',
@@ -30656,7 +30658,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderEqualTo(
+      coinPlaceholderRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -30670,7 +30672,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderGreaterThan(
+      coinPlaceholderRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -30686,7 +30688,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderLessThan(
+      coinPlaceholderRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -30702,7 +30704,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderBetween(
+      coinPlaceholderRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -30722,7 +30724,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderStartsWith(
+      coinPlaceholderRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -30736,7 +30738,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderEndsWith(
+      coinPlaceholderRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -30750,7 +30752,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderContains(String value, {bool caseSensitive = true}) {
+      coinPlaceholderRelativeContains(String value,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'coinPlaceholder',
@@ -30761,7 +30764,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderMatches(String pattern, {bool caseSensitive = true}) {
+      coinPlaceholderRelativeMatches(String pattern,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'coinPlaceholder',
@@ -30772,7 +30776,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderIsEmpty() {
+      coinPlaceholderRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'coinPlaceholder',
@@ -30782,7 +30786,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      coinPlaceholderIsNotEmpty() {
+      coinPlaceholderRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'coinPlaceholder',
@@ -30930,7 +30934,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeEqualTo(
+      exchangeRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -30944,7 +30948,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeGreaterThan(
+      exchangeRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -30960,7 +30964,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeLessThan(
+      exchangeRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -30976,7 +30980,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeBetween(
+      exchangeRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -30996,7 +31000,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeStartsWith(
+      exchangeRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31010,7 +31014,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeEndsWith(
+      exchangeRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31024,7 +31028,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeContains(String value, {bool caseSensitive = true}) {
+      exchangeRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'exchange',
@@ -31035,7 +31039,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeMatches(String pattern, {bool caseSensitive = true}) {
+      exchangeRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'exchange',
@@ -31046,7 +31050,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeIsEmpty() {
+      exchangeRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'exchange',
@@ -31056,7 +31060,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      exchangeIsNotEmpty() {
+      exchangeRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'exchange',
@@ -31066,7 +31070,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifIsNull() {
+      loadingGifRelativeIsNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(const FilterCondition.isNull(
         property: r'loadingGif',
@@ -31075,7 +31079,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifIsNotNull() {
+      loadingGifRelativeIsNotNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(const FilterCondition.isNotNull(
         property: r'loadingGif',
@@ -31084,7 +31088,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifEqualTo(
+      loadingGifRelativeEqualTo(
     String? value, {
     bool caseSensitive = true,
   }) {
@@ -31098,7 +31102,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifGreaterThan(
+      loadingGifRelativeGreaterThan(
     String? value, {
     bool include = false,
     bool caseSensitive = true,
@@ -31114,7 +31118,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifLessThan(
+      loadingGifRelativeLessThan(
     String? value, {
     bool include = false,
     bool caseSensitive = true,
@@ -31130,7 +31134,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifBetween(
+      loadingGifRelativeBetween(
     String? lower,
     String? upper, {
     bool includeLower = true,
@@ -31150,7 +31154,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifStartsWith(
+      loadingGifRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31164,7 +31168,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifEndsWith(
+      loadingGifRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31178,7 +31182,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifContains(String value, {bool caseSensitive = true}) {
+      loadingGifRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'loadingGif',
@@ -31189,7 +31193,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifMatches(String pattern, {bool caseSensitive = true}) {
+      loadingGifRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'loadingGif',
@@ -31200,7 +31204,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifIsEmpty() {
+      loadingGifRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'loadingGif',
@@ -31210,7 +31214,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      loadingGifIsNotEmpty() {
+      loadingGifRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'loadingGif',
@@ -31682,7 +31686,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyEqualTo(
+      personaEasyRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31696,7 +31700,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyGreaterThan(
+      personaEasyRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -31712,7 +31716,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyLessThan(
+      personaEasyRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -31728,7 +31732,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyBetween(
+      personaEasyRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -31748,7 +31752,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyStartsWith(
+      personaEasyRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31762,7 +31766,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyEndsWith(
+      personaEasyRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31776,7 +31780,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyContains(String value, {bool caseSensitive = true}) {
+      personaEasyRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'personaEasy',
@@ -31787,7 +31791,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyMatches(String pattern, {bool caseSensitive = true}) {
+      personaEasyRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'personaEasy',
@@ -31798,7 +31802,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyIsEmpty() {
+      personaEasyRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'personaEasy',
@@ -31808,7 +31812,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaEasyIsNotEmpty() {
+      personaEasyRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'personaEasy',
@@ -31818,7 +31822,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoEqualTo(
+      personaIncognitoRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31832,7 +31836,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoGreaterThan(
+      personaIncognitoRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -31848,7 +31852,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoLessThan(
+      personaIncognitoRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -31864,7 +31868,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoBetween(
+      personaIncognitoRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -31884,7 +31888,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoStartsWith(
+      personaIncognitoRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31898,7 +31902,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoEndsWith(
+      personaIncognitoRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31912,7 +31916,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoContains(String value, {bool caseSensitive = true}) {
+      personaIncognitoRelativeContains(String value,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'personaIncognito',
@@ -31923,7 +31928,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoMatches(String pattern, {bool caseSensitive = true}) {
+      personaIncognitoRelativeMatches(String pattern,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'personaIncognito',
@@ -31934,7 +31940,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoIsEmpty() {
+      personaIncognitoRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'personaIncognito',
@@ -31944,7 +31950,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      personaIncognitoIsNotEmpty() {
+      personaIncognitoRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'personaIncognito',
@@ -31954,7 +31960,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveEqualTo(
+      receiveRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -31968,7 +31974,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveGreaterThan(
+      receiveRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -31984,7 +31990,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveLessThan(
+      receiveRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32000,7 +32006,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveBetween(
+      receiveRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -32020,7 +32026,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveStartsWith(
+      receiveRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32034,7 +32040,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveEndsWith(
+      receiveRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32048,7 +32054,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveContains(String value, {bool caseSensitive = true}) {
+      receiveRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'receive',
@@ -32059,7 +32065,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveMatches(String pattern, {bool caseSensitive = true}) {
+      receiveRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'receive',
@@ -32070,7 +32076,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveIsEmpty() {
+      receiveRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'receive',
@@ -32080,7 +32086,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveIsNotEmpty() {
+      receiveRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'receive',
@@ -32090,7 +32096,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledEqualTo(
+      receiveCancelledRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32104,7 +32110,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledGreaterThan(
+      receiveCancelledRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32120,7 +32126,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledLessThan(
+      receiveCancelledRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32136,7 +32142,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledBetween(
+      receiveCancelledRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -32156,7 +32162,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledStartsWith(
+      receiveCancelledRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32170,7 +32176,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledEndsWith(
+      receiveCancelledRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32184,7 +32190,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledContains(String value, {bool caseSensitive = true}) {
+      receiveCancelledRelativeContains(String value,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'receiveCancelled',
@@ -32195,7 +32202,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledMatches(String pattern, {bool caseSensitive = true}) {
+      receiveCancelledRelativeMatches(String pattern,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'receiveCancelled',
@@ -32206,7 +32214,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledIsEmpty() {
+      receiveCancelledRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'receiveCancelled',
@@ -32216,7 +32224,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receiveCancelledIsNotEmpty() {
+      receiveCancelledRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'receiveCancelled',
@@ -32226,7 +32234,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingEqualTo(
+      receivePendingRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32240,7 +32248,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingGreaterThan(
+      receivePendingRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32256,7 +32264,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingLessThan(
+      receivePendingRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32272,7 +32280,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingBetween(
+      receivePendingRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -32292,7 +32300,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingStartsWith(
+      receivePendingRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32306,7 +32314,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingEndsWith(
+      receivePendingRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32320,7 +32328,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingContains(String value, {bool caseSensitive = true}) {
+      receivePendingRelativeContains(String value,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'receivePending',
@@ -32331,7 +32340,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingMatches(String pattern, {bool caseSensitive = true}) {
+      receivePendingRelativeMatches(String pattern,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'receivePending',
@@ -32342,7 +32352,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingIsEmpty() {
+      receivePendingRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'receivePending',
@@ -32352,7 +32362,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      receivePendingIsNotEmpty() {
+      receivePendingRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'receivePending',
@@ -32361,7 +32371,8 @@ extension ThemeAssetsV3QueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> sendEqualTo(
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32375,7 +32386,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendGreaterThan(
+      sendRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32391,7 +32402,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendLessThan(
+      sendRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32406,7 +32417,8 @@ extension ThemeAssetsV3QueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> sendBetween(
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -32426,7 +32438,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendStartsWith(
+      sendRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32440,7 +32452,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendEndsWith(
+      sendRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32454,7 +32466,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendContains(String value, {bool caseSensitive = true}) {
+      sendRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'send',
@@ -32464,9 +32476,8 @@ extension ThemeAssetsV3QueryFilter
     });
   }
 
-  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition> sendMatches(
-      String pattern,
-      {bool caseSensitive = true}) {
+  QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
+      sendRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'send',
@@ -32477,7 +32488,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendIsEmpty() {
+      sendRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'send',
@@ -32487,7 +32498,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendIsNotEmpty() {
+      sendRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'send',
@@ -32497,7 +32508,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledEqualTo(
+      sendCancelledRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32511,7 +32522,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledGreaterThan(
+      sendCancelledRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32527,7 +32538,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledLessThan(
+      sendCancelledRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32543,7 +32554,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledBetween(
+      sendCancelledRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -32563,7 +32574,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledStartsWith(
+      sendCancelledRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32577,7 +32588,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledEndsWith(
+      sendCancelledRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32591,7 +32602,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledContains(String value, {bool caseSensitive = true}) {
+      sendCancelledRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'sendCancelled',
@@ -32602,7 +32613,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledMatches(String pattern, {bool caseSensitive = true}) {
+      sendCancelledRelativeMatches(String pattern,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'sendCancelled',
@@ -32613,7 +32625,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledIsEmpty() {
+      sendCancelledRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'sendCancelled',
@@ -32623,7 +32635,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendCancelledIsNotEmpty() {
+      sendCancelledRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'sendCancelled',
@@ -32633,7 +32645,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingEqualTo(
+      sendPendingRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32647,7 +32659,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingGreaterThan(
+      sendPendingRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32663,7 +32675,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingLessThan(
+      sendPendingRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32679,7 +32691,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingBetween(
+      sendPendingRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -32699,7 +32711,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingStartsWith(
+      sendPendingRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32713,7 +32725,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingEndsWith(
+      sendPendingRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32727,7 +32739,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingContains(String value, {bool caseSensitive = true}) {
+      sendPendingRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'sendPending',
@@ -32738,7 +32750,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingMatches(String pattern, {bool caseSensitive = true}) {
+      sendPendingRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'sendPending',
@@ -32749,7 +32761,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingIsEmpty() {
+      sendPendingRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'sendPending',
@@ -32759,7 +32771,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      sendPendingIsNotEmpty() {
+      sendPendingRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'sendPending',
@@ -32769,7 +32781,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackEqualTo(
+      stackRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32783,7 +32795,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackGreaterThan(
+      stackRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32799,7 +32811,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackLessThan(
+      stackRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32815,7 +32827,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackBetween(
+      stackRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -32835,7 +32847,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackStartsWith(
+      stackRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32849,7 +32861,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackEndsWith(
+      stackRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32863,7 +32875,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackContains(String value, {bool caseSensitive = true}) {
+      stackRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'stack',
@@ -32874,7 +32886,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackMatches(String pattern, {bool caseSensitive = true}) {
+      stackRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'stack',
@@ -32885,7 +32897,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIsEmpty() {
+      stackRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'stack',
@@ -32895,7 +32907,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIsNotEmpty() {
+      stackRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'stack',
@@ -32905,7 +32917,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconEqualTo(
+      stackIconRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32919,7 +32931,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconGreaterThan(
+      stackIconRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32935,7 +32947,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconLessThan(
+      stackIconRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -32951,7 +32963,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconBetween(
+      stackIconRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -32971,7 +32983,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconStartsWith(
+      stackIconRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32985,7 +32997,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconEndsWith(
+      stackIconRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -32999,7 +33011,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconContains(String value, {bool caseSensitive = true}) {
+      stackIconRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'stackIcon',
@@ -33010,7 +33022,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconMatches(String pattern, {bool caseSensitive = true}) {
+      stackIconRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'stackIcon',
@@ -33021,7 +33033,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconIsEmpty() {
+      stackIconRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'stackIcon',
@@ -33031,7 +33043,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      stackIconIsNotEmpty() {
+      stackIconRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'stackIcon',
@@ -33041,7 +33053,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewEqualTo(
+      themePreviewRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33055,7 +33067,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewGreaterThan(
+      themePreviewRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33071,7 +33083,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewLessThan(
+      themePreviewRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33087,7 +33099,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewBetween(
+      themePreviewRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -33107,7 +33119,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewStartsWith(
+      themePreviewRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33121,7 +33133,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewEndsWith(
+      themePreviewRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33135,7 +33147,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewContains(String value, {bool caseSensitive = true}) {
+      themePreviewRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'themePreview',
@@ -33146,7 +33158,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewMatches(String pattern, {bool caseSensitive = true}) {
+      themePreviewRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'themePreview',
@@ -33157,7 +33169,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewIsEmpty() {
+      themePreviewRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'themePreview',
@@ -33167,7 +33179,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themePreviewIsNotEmpty() {
+      themePreviewRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'themePreview',
@@ -33177,7 +33189,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorEqualTo(
+      themeSelectorRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33191,7 +33203,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorGreaterThan(
+      themeSelectorRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33207,7 +33219,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorLessThan(
+      themeSelectorRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33223,7 +33235,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorBetween(
+      themeSelectorRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -33243,7 +33255,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorStartsWith(
+      themeSelectorRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33257,7 +33269,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorEndsWith(
+      themeSelectorRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33271,7 +33283,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorContains(String value, {bool caseSensitive = true}) {
+      themeSelectorRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'themeSelector',
@@ -33282,7 +33294,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorMatches(String pattern, {bool caseSensitive = true}) {
+      themeSelectorRelativeMatches(String pattern,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'themeSelector',
@@ -33293,7 +33306,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorIsEmpty() {
+      themeSelectorRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'themeSelector',
@@ -33303,7 +33316,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      themeSelectorIsNotEmpty() {
+      themeSelectorRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'themeSelector',
@@ -33313,7 +33326,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeEqualTo(
+      txExchangeRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33327,7 +33340,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeGreaterThan(
+      txExchangeRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33343,7 +33356,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeLessThan(
+      txExchangeRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33359,7 +33372,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeBetween(
+      txExchangeRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -33379,7 +33392,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeStartsWith(
+      txExchangeRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33393,7 +33406,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeEndsWith(
+      txExchangeRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33407,7 +33420,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeContains(String value, {bool caseSensitive = true}) {
+      txExchangeRelativeContains(String value, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'txExchange',
@@ -33418,7 +33431,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeMatches(String pattern, {bool caseSensitive = true}) {
+      txExchangeRelativeMatches(String pattern, {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'txExchange',
@@ -33429,7 +33442,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeIsEmpty() {
+      txExchangeRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'txExchange',
@@ -33439,7 +33452,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeIsNotEmpty() {
+      txExchangeRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'txExchange',
@@ -33449,7 +33462,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedEqualTo(
+      txExchangeFailedRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33463,7 +33476,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedGreaterThan(
+      txExchangeFailedRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33479,7 +33492,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedLessThan(
+      txExchangeFailedRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33495,7 +33508,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedBetween(
+      txExchangeFailedRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -33515,7 +33528,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedStartsWith(
+      txExchangeFailedRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33529,7 +33542,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedEndsWith(
+      txExchangeFailedRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33543,7 +33556,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedContains(String value, {bool caseSensitive = true}) {
+      txExchangeFailedRelativeContains(String value,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'txExchangeFailed',
@@ -33554,7 +33568,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedMatches(String pattern, {bool caseSensitive = true}) {
+      txExchangeFailedRelativeMatches(String pattern,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'txExchangeFailed',
@@ -33565,7 +33580,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedIsEmpty() {
+      txExchangeFailedRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'txExchangeFailed',
@@ -33575,7 +33590,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangeFailedIsNotEmpty() {
+      txExchangeFailedRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'txExchangeFailed',
@@ -33585,7 +33600,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingEqualTo(
+      txExchangePendingRelativeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33599,7 +33614,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingGreaterThan(
+      txExchangePendingRelativeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33615,7 +33630,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingLessThan(
+      txExchangePendingRelativeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -33631,7 +33646,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingBetween(
+      txExchangePendingRelativeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -33651,7 +33666,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingStartsWith(
+      txExchangePendingRelativeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33665,7 +33680,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingEndsWith(
+      txExchangePendingRelativeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -33679,7 +33694,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingContains(String value, {bool caseSensitive = true}) {
+      txExchangePendingRelativeContains(String value,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.contains(
         property: r'txExchangePending',
@@ -33690,7 +33706,8 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingMatches(String pattern, {bool caseSensitive = true}) {
+      txExchangePendingRelativeMatches(String pattern,
+          {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.matches(
         property: r'txExchangePending',
@@ -33701,7 +33718,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingIsEmpty() {
+      txExchangePendingRelativeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'txExchangePending',
@@ -33711,7 +33728,7 @@ extension ThemeAssetsV3QueryFilter
   }
 
   QueryBuilder<ThemeAssetsV3, ThemeAssetsV3, QAfterFilterCondition>
-      txExchangePendingIsNotEmpty() {
+      txExchangePendingRelativeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'txExchangePending',
diff --git a/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart b/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
index ce84785d4..6d925675e 100644
--- a/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
+++ b/lib/pages/settings_views/global_settings_view/appearance_settings/sub_widgets/stack_theme_card.dart
@@ -116,7 +116,7 @@ class _StackThemeCardState extends ConsumerState<StackThemeCard> {
   }
 
   Future<String> getThemeDirectorySize() async {
-    final themesDir = await StackFileSystem.applicationThemesDirectory();
+    final themesDir = StackFileSystem.themesDir!;
     final themeDir = Directory("${themesDir.path}/${widget.data.id}");
     int bytes = 0;
     if (await themeDir.exists()) {
diff --git a/lib/themes/theme_service.dart b/lib/themes/theme_service.dart
index ad72e491a..45073888f 100644
--- a/lib/themes/theme_service.dart
+++ b/lib/themes/theme_service.dart
@@ -30,7 +30,7 @@ class ThemeService {
   void init(MainDB db) => _db ??= db;
 
   Future<void> install({required Uint8List themeArchiveData}) async {
-    final themesDir = await StackFileSystem.applicationThemesDirectory();
+    final themesDir = StackFileSystem.themesDir!;
 
     final archive = ZipDecoder().decodeBytes(themeArchiveData);
 
@@ -45,7 +45,6 @@ class ThemeService {
 
     final theme = StackTheme.fromJson(
       json: Map<String, dynamic>.from(json),
-      applicationThemesDirectoryPath: themesDir.path,
     );
 
     try {
@@ -78,7 +77,7 @@ class ThemeService {
   }
 
   Future<void> remove({required String themeId}) async {
-    final themesDir = await StackFileSystem.applicationThemesDirectory();
+    final themesDir = StackFileSystem.themesDir!;
     final isarId = await db.isar.stackThemes
         .where()
         .themeIdEqualTo(themeId)
@@ -175,7 +174,7 @@ class ThemeService {
         return false;
       }
 
-      final themesDir = await StackFileSystem.applicationThemesDirectory();
+      final themesDir = StackFileSystem.themesDir!;
       final jsonFileExists =
           await File("${themesDir.path}/$themeId/theme.json").exists();
       final assetsDirExists =
diff --git a/lib/utilities/stack_file_system.dart b/lib/utilities/stack_file_system.dart
index 54bc9824e..b82954bca 100644
--- a/lib/utilities/stack_file_system.dart
+++ b/lib/utilities/stack_file_system.dart
@@ -63,16 +63,15 @@ abstract class StackFileSystem {
     }
   }
 
-  static Future<Directory> applicationThemesDirectory() async {
+  static Future<void> initThemesDir() async {
     final root = await applicationRootDirectory();
-    // if (Util.isDesktop) {
+
     final dir = Directory("${root.path}/themes");
     if (!dir.existsSync()) {
       await dir.create();
     }
-    return dir;
-    // } else {
-    //   return root;
-    // }
+    themesDir = dir;
   }
+
+  static Directory? themesDir;
 }
diff --git a/test/notifications/notification_card_test.dart b/test/notifications/notification_card_test.dart
index 7c8872844..55a9dcae5 100644
--- a/test/notifications/notification_card_test.dart
+++ b/test/notifications/notification_card_test.dart
@@ -1,46 +1,71 @@
-// import 'package:flutter/material.dart';
-// import 'package:flutter_svg/svg.dart';
-// import 'package:flutter_test/flutter_test.dart';
-// import 'package:stackduo/models/notification_model.dart';
-// import 'package:stackduo/notifications/notification_card.dart';
-// import 'package:stackduo/utilities/assets.dart';
-// import 'package:stackduo/utilities/enums/coin_enum.dart';
-// import 'package:stackduo/utilities/theme/light_colors.dart';
-// import 'package:stackduo/utilities/theme/stack_colors.dart';
-//
-// void main() {
-//   testWidgets("test notification card", (widgetTester) async {
-//     final key = UniqueKey();
-//     final notificationCard = NotificationCard(
-//       key: key,
-//       notification: NotificationModel(
-//           id: 1,
-//           title: "notification title",
-//           description: "notification description",
-//           iconAssetName: Assets.svg.iconFor(coin: Coin.bitcoin),
-//           date: DateTime.parse("1662544771"),
-//           walletId: "wallet id",
-//           read: true,
-//           shouldWatchForUpdates: true,
-//           coinName: "Bitcoin"),
-//     );
-//
-//     await widgetTester.pumpWidget(
-//       MaterialApp(
-//         theme: ThemeData(
-//           extensions: [
-//             StackColors.fromStackColorTheme(LightColors()),
-//           ],
-//         ),
-//         home: Material(
-//           child: notificationCard,
-//         ),
-//       ),
-//     );
-//
-//     expect(find.byWidget(notificationCard), findsOneWidget);
-//     expect(find.text("notification title"), findsOneWidget);
-//     expect(find.text("notification description"), findsOneWidget);
-//     expect(find.byType(SvgPicture), findsOneWidget);
-//   });
-// }
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/models/notification_model.dart';
+import 'package:stackwallet/notifications/notification_card.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/utilities/assets.dart';
+
+import '../sample_data/theme_json.dart';
+import 'notification_card_test.mocks.dart';
+
+@GenerateMocks([
+  ThemeService,
+])
+void main() {
+  testWidgets("test notification card", (widgetTester) async {
+    final key = UniqueKey();
+    final mockThemeService = MockThemeService();
+    final theme = StackTheme.fromJson(
+      json: lightThemeJsonMap,
+    );
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => theme,
+    );
+
+    final notificationCard = NotificationCard(
+      key: key,
+      notification: NotificationModel(
+          id: 1,
+          title: "notification title",
+          description: "notification description",
+          iconAssetName: Assets.svg.plus,
+          date: DateTime.parse("1662544771"),
+          walletId: "wallet id",
+          read: true,
+          shouldWatchForUpdates: true,
+          coinName: "Bitcoin"),
+    );
+
+    await widgetTester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          pThemeService.overrideWithValue(mockThemeService),
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                theme,
+              ),
+            ],
+          ),
+          home: Material(
+            child: notificationCard,
+          ),
+        ),
+      ),
+    );
+
+    expect(find.byWidget(notificationCard), findsOneWidget);
+    expect(find.text("notification title"), findsOneWidget);
+    expect(find.text("notification description"), findsOneWidget);
+    expect(find.byType(SvgPicture), findsOneWidget);
+  });
+}
diff --git a/test/pages/send_view/send_view_test.dart b/test/pages/send_view/send_view_test.dart
index dc94abb1a..975554c8d 100644
--- a/test/pages/send_view/send_view_test.dart
+++ b/test/pages/send_view/send_view_test.dart
@@ -1,164 +1,192 @@
-// import 'package:flutter/material.dart';
-// import 'package:flutter_riverpod/flutter_riverpod.dart';
-// import 'package:flutter_test/flutter_test.dart';
-// import 'package:mockito/annotations.dart';
-// import 'package:mockito/mockito.dart';
-// import 'package:stackduo/models/send_view_auto_fill_data.dart';
-// import 'package:stackduo/pages/send_view/send_view.dart';
-// import 'package:stackduo/providers/providers.dart';
-// import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart';
-// import 'package:stackduo/services/coins/coin_service.dart';
-// import 'package:stackduo/services/coins/manager.dart';
-// import 'package:stackduo/services/locale_service.dart';
-// import 'package:stackduo/services/node_service.dart';
-// import 'package:stackduo/services/wallets.dart';
-// import 'package:stackduo/services/wallets_service.dart';
-// import 'package:stackduo/utilities/enums/coin_enum.dart';
-// import 'package:stackduo/utilities/prefs.dart';
-// import 'package:stackduo/utilities/theme/light_colors.dart';
-// import 'package:stackduo/utilities/theme/stack_colors.dart';
-//
-// import 'send_view_test.mocks.dart';
-//
-// @GenerateMocks([
-//   Wallets,
-//   WalletsService,
-//   NodeService,
-//   BitcoinWallet,
-//   LocaleService,
-//   Prefs,
-// ], customMocks: [
-//   MockSpec<Manager>(returnNullOnMissingStub: true),
-//   MockSpec<CoinServiceAPI>(returnNullOnMissingStub: true),
-// ])
-// void main() {
-//   testWidgets("Send to valid address", (widgetTester) async {
-//     final mockWallets = MockWallets();
-//     final mockWalletsService = MockWalletsService();
-//     final mockNodeService = MockNodeService();
-//     final CoinServiceAPI wallet = MockBitcoinWallet();
-//     final mockLocaleService = MockLocaleService();
-//     final mockPrefs = MockPrefs();
-//
-//     when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
-//     when(wallet.walletName).thenAnswer((_) => "some wallet");
-//     when(wallet.walletId).thenAnswer((_) => "wallet id");
-//
-//     final manager = Manager(wallet);
-//     when(mockWallets.getManagerProvider("wallet id")).thenAnswer(
-//         (realInvocation) => ChangeNotifierProvider((ref) => manager));
-//     when(mockWallets.getManager("wallet id"))
-//         .thenAnswer((realInvocation) => manager);
-//
-//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-//     when(mockPrefs.currency).thenAnswer((_) => "USD");
-//     when(mockPrefs.enableCoinControl).thenAnswer((_) => false);
-//     when(wallet.validateAddress("send to address"))
-//         .thenAnswer((realInvocation) => true);
-//
-//     await widgetTester.pumpWidget(
-//       ProviderScope(
-//         overrides: [
-//           walletsChangeNotifierProvider.overrideWithValue(mockWallets),
-//           walletsServiceChangeNotifierProvider
-//               .overrideWithValue(mockWalletsService),
-//           nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService),
-//           localeServiceChangeNotifierProvider
-//               .overrideWithValue(mockLocaleService),
-//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-//           // previewTxButtonStateProvider
-//         ],
-//         child: MaterialApp(
-//           theme: ThemeData(
-//             extensions: [
-//               StackColors.fromStackColorTheme(
-//                 LightColors(),
-//               ),
-//             ],
-//           ),
-//           home: SendView(
-//             walletId: "wallet id",
-//             coin: Coin.bitcoin,
-//             autoFillData: SendViewAutoFillData(
-//                 address: "send to address", contactLabel: "contact label"),
-//           ),
-//         ),
-//       ),
-//     );
-//
-//     await widgetTester.pumpAndSettle();
-//
-//     expect(find.text("Send to"), findsOneWidget);
-//     expect(find.text("Amount"), findsOneWidget);
-//     expect(find.text("Note (optional)"), findsOneWidget);
-//     expect(find.text("Transaction fee (estimated)"), findsOneWidget);
-//     verify(manager.validateAddress("send to address")).called(1);
-//   });
-//
-//   testWidgets("Send to invalid address", (widgetTester) async {
-//     final mockWallets = MockWallets();
-//     final mockWalletsService = MockWalletsService();
-//     final mockNodeService = MockNodeService();
-//     final CoinServiceAPI wallet = MockBitcoinWallet();
-//     final mockLocaleService = MockLocaleService();
-//     final mockPrefs = MockPrefs();
-//
-//     when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
-//     when(wallet.walletName).thenAnswer((_) => "some wallet");
-//     when(wallet.walletId).thenAnswer((_) => "wallet id");
-//
-//     final manager = Manager(wallet);
-//     when(mockWallets.getManagerProvider("wallet id")).thenAnswer(
-//         (realInvocation) => ChangeNotifierProvider((ref) => manager));
-//     when(mockWallets.getManager("wallet id"))
-//         .thenAnswer((realInvocation) => manager);
-//
-//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-//     when(mockPrefs.currency).thenAnswer((_) => "USD");
-//     when(mockPrefs.enableCoinControl).thenAnswer((_) => false);
-//     when(wallet.validateAddress("send to address"))
-//         .thenAnswer((realInvocation) => false);
-//
-//     // when(manager.isOwnAddress("send to address"))
-//     //     .thenAnswer((realInvocation) => Future(() => true));
-//
-//     await widgetTester.pumpWidget(
-//       ProviderScope(
-//         overrides: [
-//           walletsChangeNotifierProvider.overrideWithValue(mockWallets),
-//           walletsServiceChangeNotifierProvider
-//               .overrideWithValue(mockWalletsService),
-//           nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService),
-//           localeServiceChangeNotifierProvider
-//               .overrideWithValue(mockLocaleService),
-//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-//           // previewTxButtonStateProvider
-//         ],
-//         child: MaterialApp(
-//           theme: ThemeData(
-//             extensions: [
-//               StackColors.fromStackColorTheme(
-//                 LightColors(),
-//               ),
-//             ],
-//           ),
-//           home: SendView(
-//             walletId: "wallet id",
-//             coin: Coin.bitcoin,
-//             autoFillData: SendViewAutoFillData(
-//                 address: "send to address", contactLabel: "contact label"),
-//           ),
-//         ),
-//       ),
-//     );
-//
-//     await widgetTester.pumpAndSettle();
-//
-//     expect(find.text("Send to"), findsOneWidget);
-//     expect(find.text("Amount"), findsOneWidget);
-//     expect(find.text("Note (optional)"), findsOneWidget);
-//     expect(find.text("Transaction fee (estimated)"), findsOneWidget);
-//     expect(find.text("Invalid address"), findsOneWidget);
-//     verify(manager.validateAddress("send to address")).called(1);
-//   });
-// }
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/models/send_view_auto_fill_data.dart';
+import 'package:stackwallet/pages/send_view/send_view.dart';
+import 'package:stackwallet/providers/providers.dart';
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/services/locale_service.dart';
+import 'package:stackwallet/services/node_service.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/services/wallets_service.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/utilities/amount/amount_unit.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/utilities/prefs.dart';
+
+import '../../sample_data/theme_json.dart';
+import 'send_view_test.mocks.dart';
+
+@GenerateMocks([
+  Wallets,
+  WalletsService,
+  NodeService,
+  BitcoinWallet,
+  LocaleService,
+  ThemeService,
+  Prefs,
+], customMocks: [
+  MockSpec<Manager>(returnNullOnMissingStub: true),
+  MockSpec<CoinServiceAPI>(returnNullOnMissingStub: true),
+])
+void main() {
+  testWidgets("Send to valid address", (widgetTester) async {
+    final mockWallets = MockWallets();
+    final mockWalletsService = MockWalletsService();
+    final mockNodeService = MockNodeService();
+    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final mockLocaleService = MockLocaleService();
+    final mockThemeService = MockThemeService();
+    final mockPrefs = MockPrefs();
+
+    when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
+    when(wallet.walletName).thenAnswer((_) => "some wallet");
+    when(wallet.walletId).thenAnswer((_) => "wallet id");
+
+    final manager = Manager(wallet);
+    when(mockWallets.getManagerProvider("wallet id")).thenAnswer(
+        (realInvocation) => ChangeNotifierProvider((ref) => manager));
+    when(mockWallets.getManager("wallet id"))
+        .thenAnswer((realInvocation) => manager);
+
+    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
+    when(mockPrefs.currency).thenAnswer((_) => "USD");
+    when(mockPrefs.enableCoinControl).thenAnswer((_) => false);
+    when(mockPrefs.amountUnit(Coin.bitcoin)).thenAnswer(
+      (_) => AmountUnit.normal,
+    );
+    when(wallet.validateAddress("send to address"))
+        .thenAnswer((realInvocation) => true);
+
+    await widgetTester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          walletsChangeNotifierProvider.overrideWithValue(mockWallets),
+          walletsServiceChangeNotifierProvider
+              .overrideWithValue(mockWalletsService),
+          nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService),
+          localeServiceChangeNotifierProvider
+              .overrideWithValue(mockLocaleService),
+          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
+          // previewTxButtonStateProvider
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: SendView(
+            walletId: "wallet id",
+            coin: Coin.bitcoin,
+            autoFillData: SendViewAutoFillData(
+                address: "send to address", contactLabel: "contact label"),
+          ),
+        ),
+      ),
+    );
+
+    await widgetTester.pumpAndSettle();
+
+    expect(find.text("Send to"), findsOneWidget);
+    expect(find.text("Amount"), findsOneWidget);
+    expect(find.text("Note (optional)"), findsOneWidget);
+    expect(find.text("Transaction fee (estimated)"), findsOneWidget);
+    verify(manager.validateAddress("send to address")).called(1);
+  });
+
+  testWidgets("Send to invalid address", (widgetTester) async {
+    final mockWallets = MockWallets();
+    final mockWalletsService = MockWalletsService();
+    final mockNodeService = MockNodeService();
+    final CoinServiceAPI wallet = MockBitcoinWallet();
+    final mockLocaleService = MockLocaleService();
+    final mockPrefs = MockPrefs();
+    final mockThemeService = MockThemeService();
+
+    when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
+    when(wallet.walletName).thenAnswer((_) => "some wallet");
+    when(wallet.walletId).thenAnswer((_) => "wallet id");
+
+    final manager = Manager(wallet);
+    when(mockWallets.getManagerProvider("wallet id")).thenAnswer(
+        (realInvocation) => ChangeNotifierProvider((ref) => manager));
+    when(mockWallets.getManager("wallet id"))
+        .thenAnswer((realInvocation) => manager);
+
+    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+    when(mockPrefs.currency).thenAnswer((_) => "USD");
+    when(mockPrefs.enableCoinControl).thenAnswer((_) => false);
+    when(mockPrefs.amountUnit(Coin.bitcoin)).thenAnswer(
+      (_) => AmountUnit.normal,
+    );
+    when(wallet.validateAddress("send to address"))
+        .thenAnswer((realInvocation) => false);
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
+
+    // when(manager.isOwnAddress("send to address"))
+    //     .thenAnswer((realInvocation) => Future(() => true));
+
+    await widgetTester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          walletsChangeNotifierProvider.overrideWithValue(mockWallets),
+          walletsServiceChangeNotifierProvider
+              .overrideWithValue(mockWalletsService),
+          nodeServiceChangeNotifierProvider.overrideWithValue(mockNodeService),
+          localeServiceChangeNotifierProvider
+              .overrideWithValue(mockLocaleService),
+          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService)
+          // previewTxButtonStateProvider
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: SendView(
+            walletId: "wallet id",
+            coin: Coin.bitcoin,
+            autoFillData: SendViewAutoFillData(
+                address: "send to address", contactLabel: "contact label"),
+          ),
+        ),
+      ),
+    );
+
+    await widgetTester.pumpAndSettle();
+
+    expect(find.text("Send to"), findsOneWidget);
+    expect(find.text("Amount"), findsOneWidget);
+    expect(find.text("Note (optional)"), findsOneWidget);
+    expect(find.text("Transaction fee (estimated)"), findsOneWidget);
+    expect(find.text("Invalid address"), findsOneWidget);
+    verify(manager.validateAddress("send to address")).called(1);
+  });
+}
diff --git a/test/widget_tests/address_book_card_test.dart b/test/widget_tests/address_book_card_test.dart
index 93ddbc3f4..670afc713 100644
--- a/test/widget_tests/address_book_card_test.dart
+++ b/test/widget_tests/address_book_card_test.dart
@@ -55,8 +55,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath:
-                      applicationThemesDirectoryPath,
                 ),
               ),
             ],
diff --git a/test/widget_tests/animated_text_test.dart b/test/widget_tests/animated_text_test.dart
index d00468b78..ff358dfb0 100644
--- a/test/widget_tests/animated_text_test.dart
+++ b/test/widget_tests/animated_text_test.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/animated_text.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/animated_text.dart';
+
+import '../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("Widget displays first word in strings list",
@@ -23,7 +25,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: const Material(
diff --git a/test/widget_tests/custom_buttons/app_bar_icon_button_test.dart b/test/widget_tests/custom_buttons/app_bar_icon_button_test.dart
index 5a3d9c69f..cdc2ccbef 100644
--- a/test/widget_tests/custom_buttons/app_bar_icon_button_test.dart
+++ b/test/widget_tests/custom_buttons/app_bar_icon_button_test.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("AppBarIconButton test", (tester) async {
@@ -23,7 +25,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: Material(
diff --git a/test/widget_tests/custom_buttons/draggable_switch_button_test.dart b/test/widget_tests/custom_buttons/draggable_switch_button_test.dart
index 8ba4c41cc..2919e05ff 100644
--- a/test/widget_tests/custom_buttons/draggable_switch_button_test.dart
+++ b/test/widget_tests/custom_buttons/draggable_switch_button_test.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/custom_buttons/draggable_switch_button.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/custom_buttons/draggable_switch_button.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("DraggableSwitchButton tapped", (tester) async {
@@ -19,7 +21,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: button,
@@ -46,7 +52,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: SizedBox(
@@ -78,7 +88,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: SizedBox(
diff --git a/test/widget_tests/custom_buttons/favorite_toggle_test.dart b/test/widget_tests/custom_buttons/favorite_toggle_test.dart
index 83aa1e0f9..90dbc5546 100644
--- a/test/widget_tests/custom_buttons/favorite_toggle_test.dart
+++ b/test/widget_tests/custom_buttons/favorite_toggle_test.dart
@@ -2,22 +2,41 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/custom_buttons/favorite_toggle.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/widgets/custom_buttons/favorite_toggle.dart';
 
+import '../../sample_data/theme_json.dart';
+import 'favorite_toggle_test.mocks.dart';
+
+@GenerateMocks([
+  ThemeService,
+])
 void main() {
   testWidgets("Test widget build", (widgetTester) async {
     final key = UniqueKey();
+    final mockThemeService = MockThemeService();
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
 
     await widgetTester.pumpWidget(
       ProviderScope(
-        overrides: [],
+        overrides: [
+          pThemeService.overrideWithValue(mockThemeService),
+        ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
diff --git a/test/widget_tests/custom_loading_overlay_test.dart b/test/widget_tests/custom_loading_overlay_test.dart
index 97704b08c..6d0eddb75 100644
--- a/test/widget_tests/custom_loading_overlay_test.dart
+++ b/test/widget_tests/custom_loading_overlay_test.dart
@@ -1,23 +1,49 @@
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/custom_loading_overlay.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/widgets/custom_loading_overlay.dart';
 
+import '../sample_data/theme_json.dart';
+import 'custom_loading_overlay_test.mocks.dart';
+
+@GenerateMocks([
+  ThemeService,
+])
 void main() {
-  testWidgets("Test wiget displays correct text", (widgetTester) async {
+  testWidgets("Test widget displays correct text", (widgetTester) async {
     final eventBus = EventBus();
+    final mockThemeService = MockThemeService();
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
+
     await widgetTester.pumpWidget(
-      MaterialApp(
-        theme: ThemeData(
-          extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
-          ],
-        ),
-        home: Material(
-          child: CustomLoadingOverlay(
-              message: "Updating exchange rate", eventBus: eventBus),
+      ProviderScope(
+        overrides: [
+          pThemeService.overrideWithValue(mockThemeService),
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: Material(
+            child: CustomLoadingOverlay(
+                message: "Updating exchange rate", eventBus: eventBus),
+          ),
         ),
       ),
     );
diff --git a/test/widget_tests/custom_pin_put_test.dart b/test/widget_tests/custom_pin_put_test.dart
index e6f4860fb..7fecada7e 100644
--- a/test/widget_tests/custom_pin_put_test.dart
+++ b/test/widget_tests/custom_pin_put_test.dart
@@ -64,7 +64,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
                 ),
               ),
             ],
@@ -96,7 +95,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
                 ),
               ),
             ],
@@ -148,7 +146,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
                 ),
               ),
             ],
@@ -184,7 +181,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
                 ),
               ),
             ],
@@ -220,7 +216,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
                 ),
               ),
             ],
@@ -261,7 +256,6 @@ void main() {
             StackColors.fromStackColorTheme(
               StackTheme.fromJson(
                 json: lightThemeJsonMap,
-                applicationThemesDirectoryPath: "test",
               ),
             ),
           ],
@@ -298,7 +292,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
                 ),
               ),
             ],
@@ -330,7 +323,7 @@ void main() {
     //           StackColors.fromStackColorTheme(
     //             StackTheme.fromJson(
     //               json: lightThemeJsonMap,
-    //               applicationThemesDirectoryPath: "test",
+    //
     //             ),
     //           ),
     //         ],
@@ -382,7 +375,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
                 ),
               ),
             ],
@@ -424,7 +416,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
                 ),
               ),
             ],
@@ -466,7 +457,6 @@ void main() {
               StackColors.fromStackColorTheme(
                 StackTheme.fromJson(
                   json: lightThemeJsonMap,
-                  applicationThemesDirectoryPath: "test",
                 ),
               ),
             ],
@@ -507,7 +497,6 @@ void main() {
             StackColors.fromStackColorTheme(
               StackTheme.fromJson(
                 json: lightThemeJsonMap,
-                applicationThemesDirectoryPath: "test",
               ),
             ),
           ],
diff --git a/test/widget_tests/desktop/custom_text_button_test.dart b/test/widget_tests/desktop/custom_text_button_test.dart
index f04ca597e..b1e4054c9 100644
--- a/test/widget_tests/desktop/custom_text_button_test.dart
+++ b/test/widget_tests/desktop/custom_text_button_test.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/utilities/util.dart';
-import 'package:stackduo/widgets/desktop/custom_text_button.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/desktop/custom_text_button.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("Test text button ", (widgetTester) async {
@@ -13,7 +14,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: Material(
diff --git a/test/widget_tests/desktop/desktop_app_bar_test.dart b/test/widget_tests/desktop/desktop_app_bar_test.dart
index 0c90c5944..8ddc453ab 100644
--- a/test/widget_tests/desktop/desktop_app_bar_test.dart
+++ b/test/widget_tests/desktop/desktop_app_bar_test.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
-import 'package:stackduo/widgets/desktop/desktop_app_bar.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("Test DesktopAppBar widget", (widgetTester) async {
@@ -14,7 +16,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: Material(
diff --git a/test/widget_tests/desktop/desktop_dialog_close_button_test.dart b/test/widget_tests/desktop/desktop_dialog_close_button_test.dart
index dab3b4c65..ec8b4ce39 100644
--- a/test/widget_tests/desktop/desktop_dialog_close_button_test.dart
+++ b/test/widget_tests/desktop/desktop_dialog_close_button_test.dart
@@ -2,10 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockingjay/mockingjay.dart' as mockingjay;
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
-import 'package:stackduo/widgets/desktop/desktop_dialog_close_button.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackwallet/widgets/desktop/desktop_dialog_close_button.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("test DesktopDialog button pressed", (widgetTester) async {
@@ -19,7 +21,11 @@ void main() {
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
             ],
           ),
           home: mockingjay.MockNavigatorProvider(
diff --git a/test/widget_tests/desktop/desktop_dialog_test.dart b/test/widget_tests/desktop/desktop_dialog_test.dart
index b5f6cc4d2..5eafb6f8c 100644
--- a/test/widget_tests/desktop/desktop_dialog_test.dart
+++ b/test/widget_tests/desktop/desktop_dialog_test.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/desktop/desktop_dialog.dart';
-import 'package:stackduo/widgets/desktop/desktop_dialog_close_button.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/desktop/desktop_dialog.dart';
+import 'package:stackwallet/widgets/desktop/desktop_dialog_close_button.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("test DesktopDialog builds", (widgetTester) async {
@@ -13,7 +15,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: Material(
diff --git a/test/widget_tests/desktop/desktop_scaffold_test.dart b/test/widget_tests/desktop/desktop_scaffold_test.dart
index ab996c0bb..8abb4cf5a 100644
--- a/test/widget_tests/desktop/desktop_scaffold_test.dart
+++ b/test/widget_tests/desktop/desktop_scaffold_test.dart
@@ -1,23 +1,48 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/desktop/desktop_scaffold.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart';
 
+import '../../sample_data/theme_json.dart';
+import 'desktop_scaffold_test.mocks.dart';
+
+@GenerateMocks([
+  ThemeService,
+])
 void main() {
   testWidgets("test DesktopScaffold", (widgetTester) async {
     final key = UniqueKey();
+    final mockThemeService = MockThemeService();
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
     await widgetTester.pumpWidget(
-      MaterialApp(
-        theme: ThemeData(
-          extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
-          ],
-        ),
-        home: Material(
-          child: DesktopScaffold(
-            key: key,
-            body: const SizedBox(),
+      ProviderScope(
+        overrides: [
+          pThemeService.overrideWithValue(mockThemeService),
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: Material(
+            child: DesktopScaffold(
+              key: key,
+              body: const SizedBox(),
+            ),
           ),
         ),
       ),
@@ -26,20 +51,35 @@ void main() {
 
   testWidgets("Test MasterScaffold for non desktop", (widgetTester) async {
     final key = UniqueKey();
+    final mockThemeService = MockThemeService();
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
 
     await widgetTester.pumpWidget(
-      MaterialApp(
-        theme: ThemeData(
-          extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
-          ],
-        ),
-        home: Material(
-          child: MasterScaffold(
-            key: key,
-            body: const SizedBox(),
-            appBar: AppBar(),
-            isDesktop: false,
+      ProviderScope(
+        overrides: [
+          pThemeService.overrideWithValue(mockThemeService),
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: Material(
+            child: MasterScaffold(
+              key: key,
+              body: const SizedBox(),
+              appBar: AppBar(),
+              isDesktop: false,
+            ),
           ),
         ),
       ),
@@ -48,20 +88,36 @@ void main() {
 
   testWidgets("Test MasterScaffold for desktop", (widgetTester) async {
     final key = UniqueKey();
+    final mockThemeService = MockThemeService();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
 
     await widgetTester.pumpWidget(
-      MaterialApp(
-        theme: ThemeData(
-          extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
-          ],
-        ),
-        home: Material(
-          child: MasterScaffold(
-            key: key,
-            body: const SizedBox(),
-            appBar: AppBar(),
-            isDesktop: true,
+      ProviderScope(
+        overrides: [
+          pThemeService.overrideWithValue(mockThemeService),
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: Material(
+            child: MasterScaffold(
+              key: key,
+              body: const SizedBox(),
+              appBar: AppBar(),
+              isDesktop: true,
+            ),
           ),
         ),
       ),
diff --git a/test/widget_tests/emoji_select_sheet_test.dart b/test/widget_tests/emoji_select_sheet_test.dart
index 5f973e94f..15be7b153 100644
--- a/test/widget_tests/emoji_select_sheet_test.dart
+++ b/test/widget_tests/emoji_select_sheet_test.dart
@@ -3,9 +3,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockingjay/mockingjay.dart' as mockingjay;
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/emoji_select_sheet.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/emoji_select_sheet.dart';
+
+import '../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("Widget displays correctly", (tester) async {
@@ -15,7 +17,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: const Material(
@@ -39,7 +45,11 @@ void main() {
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
             ],
           ),
           home: mockingjay.MockNavigatorProvider(
diff --git a/test/widget_tests/icon_widgets/addressbook_icon_test.dart b/test/widget_tests/icon_widgets/addressbook_icon_test.dart
index fd0407cd6..ad8470898 100644
--- a/test/widget_tests/icon_widgets/addressbook_icon_test.dart
+++ b/test/widget_tests/icon_widgets/addressbook_icon_test.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/icon_widgets/addressbook_icon.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/icon_widgets/addressbook_icon.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("test address book icon widget", (widgetTester) async {
@@ -16,7 +18,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: Material(
diff --git a/test/widget_tests/managed_favorite_test.dart b/test/widget_tests/managed_favorite_test.dart
index bb6997035..3d8bb66fa 100644
--- a/test/widget_tests/managed_favorite_test.dart
+++ b/test/widget_tests/managed_favorite_test.dart
@@ -1,30 +1,44 @@
+import 'package:decimal/decimal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/models/balance.dart';
-import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart';
-import 'package:stackduo/services/coins/coin_service.dart';
-import 'package:stackduo/services/coins/manager.dart';
-import 'package:stackduo/services/locale_service.dart';
-import 'package:stackduo/services/node_service.dart';
-import 'package:stackduo/services/wallets.dart';
-import 'package:stackduo/services/wallets_service.dart';
-import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-import 'package:stackduo/utilities/listenable_list.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/managed_favorite.dart';
+import 'package:stackwallet/models/balance.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/providers/providers.dart';
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/services/locale_service.dart';
+import 'package:stackwallet/services/node_service.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/services/wallets_service.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/amount/amount_unit.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/utilities/listenable_list.dart';
+import 'package:stackwallet/utilities/prefs.dart';
+import 'package:stackwallet/widgets/managed_favorite.dart';
 
+import '../sample_data/theme_json.dart';
 import 'managed_favorite_test.mocks.dart';
 
+/// quick amount constructor wrapper. Using an int is bad practice but for
+/// testing with small amounts this should be fine
+Amount _a(int i) => Amount.fromDecimal(
+      Decimal.fromInt(i),
+      fractionDigits: 8,
+    );
+
 @GenerateMocks([
   Wallets,
   WalletsService,
   BitcoinWallet,
+  ThemeService,
+  Prefs,
   LocaleService
 ], customMocks: [
   MockSpec<NodeService>(returnNullOnMissingStub: true),
@@ -35,20 +49,34 @@ void main() {
   testWidgets("Test wallet info row displays correctly", (widgetTester) async {
     final wallets = MockWallets();
     final CoinServiceAPI wallet = MockBitcoinWallet();
+    final mockThemeService = MockThemeService();
+    final mockPrefs = MockPrefs();
 
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
     when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
     when(wallet.walletName).thenAnswer((_) => "some wallet");
     when(wallet.walletId).thenAnswer((_) => "some wallet id");
 
+    when(mockPrefs.amountUnit(Coin.bitcoin)).thenAnswer(
+      (_) => AmountUnit.normal,
+    );
+    when(mockPrefs.maxDecimals(Coin.bitcoin)).thenAnswer(
+      (_) => 8,
+    );
+
     final manager = Manager(wallet);
     when(wallets.getManager("some wallet id"))
         .thenAnswer((realInvocation) => manager);
     when(manager.balance).thenAnswer(
       (realInvocation) => Balance(
-        total: 10.toAmountAsRaw(fractionDigits: 8),
-        spendable: 10.toAmountAsRaw(fractionDigits: 8),
-        blockedTotal: 0.toAmountAsRaw(fractionDigits: 8),
-        pendingSpendable: 0.toAmountAsRaw(fractionDigits: 8),
+        total: _a(10),
+        spendable: _a(10),
+        blockedTotal: _a(0),
+        pendingSpendable: _a(0),
       ),
     );
 
@@ -59,12 +87,16 @@ void main() {
       ProviderScope(
         overrides: [
           walletsChangeNotifierProvider.overrideWithValue(wallets),
+          pThemeService.overrideWithValue(mockThemeService),
+          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
@@ -86,10 +118,20 @@ void main() {
     final CoinServiceAPI wallet = MockBitcoinWallet();
     final mockLocaleService = MockLocaleService();
     final mockWalletsService = MockWalletsService();
+    final mockThemeService = MockThemeService();
+    final mockPrefs = MockPrefs();
 
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
     when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
     when(wallet.walletName).thenAnswer((_) => "some wallet");
     when(wallet.walletId).thenAnswer((_) => "some wallet id");
+    when(mockPrefs.amountUnit(Coin.bitcoin)).thenAnswer(
+      (_) => AmountUnit.normal,
+    );
 
     final manager = Manager(wallet);
 
@@ -97,15 +139,19 @@ void main() {
         .thenAnswer((realInvocation) => manager);
     when(manager.balance).thenAnswer(
       (realInvocation) => Balance(
-        total: 10.toAmountAsRaw(fractionDigits: 8),
-        spendable: 10.toAmountAsRaw(fractionDigits: 8),
-        blockedTotal: 0.toAmountAsRaw(fractionDigits: 8),
-        pendingSpendable: 0.toAmountAsRaw(fractionDigits: 8),
+        total: _a(10),
+        spendable: _a(10),
+        blockedTotal: _a(0),
+        pendingSpendable: _a(0),
       ),
     );
 
     when(manager.isFavorite).thenAnswer((realInvocation) => false);
 
+    when(mockPrefs.maxDecimals(Coin.bitcoin)).thenAnswer(
+      (_) => 8,
+    );
+
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
 
     when(wallets.getManagerProvider("some wallet id")).thenAnswer(
@@ -126,14 +172,18 @@ void main() {
               .overrideWithValue(mockLocaleService),
           favoritesProvider.overrideWithValue(favorites),
           nonFavoritesProvider.overrideWithValue(nonfavorites),
+          pThemeService.overrideWithValue(mockThemeService),
           walletsServiceChangeNotifierProvider
-              .overrideWithValue(mockWalletsService)
+              .overrideWithValue(mockWalletsService),
+          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
@@ -154,11 +204,22 @@ void main() {
     final CoinServiceAPI wallet = MockBitcoinWallet();
     final mockLocaleService = MockLocaleService();
     final mockWalletsService = MockWalletsService();
+    final mockThemeService = MockThemeService();
+    final mockPrefs = MockPrefs();
 
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
     when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
     when(wallet.walletName).thenAnswer((_) => "some wallet");
     when(wallet.walletId).thenAnswer((_) => "some wallet id");
 
+    when(mockPrefs.maxDecimals(Coin.bitcoin)).thenAnswer(
+      (_) => 8,
+    );
+
     final manager = Manager(wallet);
 
     when(wallets.getManager("some wallet id"))
@@ -167,12 +228,15 @@ void main() {
     when(manager.isFavorite).thenAnswer((realInvocation) => true);
     when(manager.balance).thenAnswer(
       (realInvocation) => Balance(
-        total: 10.toAmountAsRaw(fractionDigits: 8),
-        spendable: 10.toAmountAsRaw(fractionDigits: 8),
-        blockedTotal: 0.toAmountAsRaw(fractionDigits: 8),
-        pendingSpendable: 0.toAmountAsRaw(fractionDigits: 8),
+        total: _a(10),
+        spendable: _a(10),
+        blockedTotal: _a(0),
+        pendingSpendable: _a(0),
       ),
     );
+    when(mockPrefs.amountUnit(Coin.bitcoin)).thenAnswer(
+      (_) => AmountUnit.normal,
+    );
 
     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
 
@@ -194,6 +258,8 @@ void main() {
               .overrideWithValue(mockLocaleService),
           favoritesProvider.overrideWithValue(favorites),
           nonFavoritesProvider.overrideWithValue(nonfavorites),
+          pThemeService.overrideWithValue(mockThemeService),
+          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
           walletsServiceChangeNotifierProvider
               .overrideWithValue(mockWalletsService)
         ],
@@ -201,7 +267,9 @@ void main() {
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
diff --git a/test/widget_tests/node_card_test.dart b/test/widget_tests/node_card_test.dart
index 358ac34fe..b8e126696 100644
--- a/test/widget_tests/node_card_test.dart
+++ b/test/widget_tests/node_card_test.dart
@@ -4,16 +4,17 @@ import 'package:flutter_svg/svg.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/models/node_model.dart';
-import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/node_service.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/utilities/util.dart';
-import 'package:stackduo/widgets/node_card.dart';
-import 'package:stackduo/widgets/node_options_sheet.dart';
-
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/models/node_model.dart';
+import 'package:stackwallet/providers/providers.dart';
+import 'package:stackwallet/services/node_service.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/widgets/node_card.dart';
+import 'package:stackwallet/widgets/node_options_sheet.dart';
+
+import '../sample_data/theme_json.dart';
 import 'node_card_test.mocks.dart';
 
 @GenerateMocks([NodeService])
@@ -54,7 +55,9 @@ void main() {
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
@@ -112,7 +115,9 @@ void main() {
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
@@ -171,7 +176,9 @@ void main() {
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
diff --git a/test/widget_tests/node_options_sheet_test.dart b/test/widget_tests/node_options_sheet_test.dart
index 508e15670..b80e4682d 100644
--- a/test/widget_tests/node_options_sheet_test.dart
+++ b/test/widget_tests/node_options_sheet_test.dart
@@ -5,17 +5,18 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockingjay/mockingjay.dart' as mockingjay;
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/models/node_model.dart';
-import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/node_service.dart';
-import 'package:stackduo/services/wallets.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-import 'package:stackduo/utilities/prefs.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/node_options_sheet.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/models/node_model.dart';
+import 'package:stackwallet/providers/providers.dart';
+import 'package:stackwallet/services/node_service.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/utilities/prefs.dart';
+import 'package:stackwallet/widgets/node_options_sheet.dart';
 import 'package:tuple/tuple.dart';
 
+import '../sample_data/theme_json.dart';
 import 'node_options_sheet_test.mocks.dart';
 
 @GenerateMocks([Wallets, Prefs, NodeService])
@@ -60,7 +61,9 @@ void main() {
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
@@ -129,7 +132,11 @@ void main() {
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
             ],
           ),
           home: mockingjay.MockNavigatorProvider(
@@ -192,7 +199,9 @@ void main() {
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
diff --git a/test/widget_tests/progress_bar_test.dart b/test/widget_tests/progress_bar_test.dart
index 04751b78d..681a5ac0c 100644
--- a/test/widget_tests/progress_bar_test.dart
+++ b/test/widget_tests/progress_bar_test.dart
@@ -1,26 +1,30 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/progress_bar.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/progress_bar.dart';
+
+import '../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("Widget build", (widgetTester) async {
+    final theme = StackTheme.fromJson(
+      json: lightThemeJsonMap,
+    );
     await widgetTester.pumpWidget(
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(theme),
           ],
         ),
         home: Material(
           child: ProgressBar(
               width: 20,
               height: 10,
-              fillColor:
-                  StackColors.fromStackColorTheme(LightColors()).accentColorRed,
-              backgroundColor: StackColors.fromStackColorTheme(LightColors())
-                  .accentColorYellow,
+              fillColor: StackColors.fromStackColorTheme(theme).accentColorRed,
+              backgroundColor:
+                  StackColors.fromStackColorTheme(theme).accentColorYellow,
               percent: 30),
         ),
       ),
diff --git a/test/widget_tests/shake/shake_test.dart b/test/widget_tests/shake/shake_test.dart
index edaf3bbfe..ab9a80fed 100644
--- a/test/widget_tests/shake/shake_test.dart
+++ b/test/widget_tests/shake/shake_test.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/shake/shake.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/shake/shake.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("Widget build", (widgetTester) async {
@@ -10,21 +12,26 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: Material(
           child: Shake(
-              animationRange: 10,
-              controller: ShakeController(),
-              animationDuration: const Duration(milliseconds: 200),
-              child: Column(
-                children: const [
-                  Center(
-                    child: Text("Enter Pin"),
-                  )
-                ],
-              )),
+            animationRange: 10,
+            controller: ShakeController(),
+            animationDuration: const Duration(milliseconds: 200),
+            child: const Column(
+              children: [
+                Center(
+                  child: Text("Enter Pin"),
+                )
+              ],
+            ),
+          ),
         ),
       ),
     );
diff --git a/test/widget_tests/stack_dialog_test.dart b/test/widget_tests/stack_dialog_test.dart
index 109f7e3ff..0f42ab80a 100644
--- a/test/widget_tests/stack_dialog_test.dart
+++ b/test/widget_tests/stack_dialog_test.dart
@@ -2,9 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockingjay/mockingjay.dart' as mockingjay;
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/stack_dialog.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/stack_dialog.dart';
+
+import '../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("test StackDialogBase", (widgetTester) async {
@@ -12,7 +14,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: const Material(
@@ -29,7 +35,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: const Material(
@@ -60,7 +70,11 @@ void main() {
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
-              StackColors.fromStackColorTheme(LightColors()),
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
             ],
           ),
           home: mockingjay.MockNavigatorProvider(
diff --git a/test/widget_tests/table_view/table_view_cell_test.dart b/test/widget_tests/table_view/table_view_cell_test.dart
index e6ffe9ddf..14e66eb5e 100644
--- a/test/widget_tests/table_view/table_view_cell_test.dart
+++ b/test/widget_tests/table_view/table_view_cell_test.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/table_view/table_view_cell.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/table_view/table_view_cell.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("Widget build correctly", (widgetTester) async {
@@ -11,7 +13,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: const Material(
diff --git a/test/widget_tests/table_view/table_view_row_test.dart b/test/widget_tests/table_view/table_view_row_test.dart
index 3c7a9495c..4a84f0e64 100644
--- a/test/widget_tests/table_view/table_view_row_test.dart
+++ b/test/widget_tests/table_view/table_view_row_test.dart
@@ -3,26 +3,29 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/models/balance.dart';
-import 'package:stackduo/pages_desktop_specific/my_stack_view/coin_wallets_table.dart';
-import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart';
-import 'package:stackduo/services/coins/coin_service.dart';
-import 'package:stackduo/services/coins/manager.dart';
-import 'package:stackduo/services/wallets.dart';
-import 'package:stackduo/services/wallets_service.dart';
-import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/table_view/table_view_cell.dart';
-import 'package:stackduo/widgets/table_view/table_view_row.dart';
+import 'package:stackwallet/models/balance.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/pages_desktop_specific/my_stack_view/coin_wallets_table.dart';
+import 'package:stackwallet/providers/providers.dart';
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/services/wallets_service.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/widgets/table_view/table_view_cell.dart';
+import 'package:stackwallet/widgets/table_view/table_view_row.dart';
 
+import '../../sample_data/theme_json.dart';
 import 'table_view_row_test.mocks.dart';
 
 @GenerateMocks([
   Wallets,
   WalletsService,
+  ThemeService,
   BitcoinWallet
 ], customMocks: [
   MockSpec<Manager>(returnNullOnMissingStub: true),
@@ -30,18 +33,26 @@ import 'table_view_row_test.mocks.dart';
 ])
 void main() {
   testWidgets('Test table view row', (widgetTester) async {
+    widgetTester.binding.window.physicalSizeTestValue = const Size(2500, 1800);
+
     final mockWallet = MockWallets();
+    final mockThemeService = MockThemeService();
     final CoinServiceAPI wallet = MockBitcoinWallet();
     when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
 
     when(wallet.walletName).thenAnswer((_) => "some wallet");
     when(wallet.walletId).thenAnswer((_) => "Wallet id 1");
     when(wallet.balance).thenAnswer(
       (_) => Balance(
-        total: 0.toAmountAsRaw(fractionDigits: 8),
-        spendable: 0.toAmountAsRaw(fractionDigits: 8),
-        blockedTotal: 0.toAmountAsRaw(fractionDigits: 8),
-        pendingSpendable: 0.toAmountAsRaw(fractionDigits: 8),
+        total: Amount.zero,
+        spendable: Amount.zero,
+        blockedTotal: Amount.zero,
+        pendingSpendable: Amount.zero,
       ),
     );
 
@@ -56,30 +67,32 @@ void main() {
     when(mockWallet.getManagerProvider("wallet id 2")).thenAnswer(
         (realInvocation) => ChangeNotifierProvider((ref) => manager));
 
-    final walletIds = mockWallet.getWalletIdsFor(coin: Coin.bitcoin);
-
     await widgetTester.pumpWidget(
       ProviderScope(
         overrides: [
           walletsChangeNotifierProvider.overrideWithValue(mockWallet),
+          pThemeService.overrideWithValue(mockThemeService),
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
           home: Material(
             child: TableViewRow(
-                cells: [
-                  for (int j = 1; j <= 5; j++)
-                    TableViewCell(flex: 16, child: Text("Some Text ${j}"))
-                ],
-                expandingChild: const CoinWalletsTable(
-                  coin: Coin.bitcoin,
-                )),
+              cells: [
+                for (int j = 1; j <= 5; j++)
+                  TableViewCell(flex: 16, child: Text("Some ${j}"))
+              ],
+              expandingChild: const CoinWalletsTable(
+                coin: Coin.bitcoin,
+              ),
+            ),
           ),
         ),
       ),
@@ -87,7 +100,7 @@ void main() {
 
     await widgetTester.pumpAndSettle();
 
-    expect(find.text("Some Text 1"), findsOneWidget);
+    expect(find.text("Some 1"), findsOneWidget);
     expect(find.byType(TableViewRow), findsWidgets);
     expect(find.byType(TableViewCell), findsWidgets);
     expect(find.byType(CoinWalletsTable), findsWidgets);
diff --git a/test/widget_tests/table_view/table_view_test.dart b/test/widget_tests/table_view/table_view_test.dart
index ce77622b2..67813ec5f 100644
--- a/test/widget_tests/table_view/table_view_test.dart
+++ b/test/widget_tests/table_view/table_view_test.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/table_view/table_view.dart';
-import 'package:stackduo/widgets/table_view/table_view_cell.dart';
-import 'package:stackduo/widgets/table_view/table_view_row.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/table_view/table_view.dart';
+import 'package:stackwallet/widgets/table_view/table_view_cell.dart';
+import 'package:stackwallet/widgets/table_view/table_view_row.dart';
+
+import '../../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("Test create table row widget ", (widgetTester) async {
@@ -12,7 +14,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: Material(
diff --git a/test/widget_tests/textfield_icon_button_test.dart b/test/widget_tests/textfield_icon_button_test.dart
index 0abf892b1..8ce9400cd 100644
--- a/test/widget_tests/textfield_icon_button_test.dart
+++ b/test/widget_tests/textfield_icon_button_test.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/icon_widgets/x_icon.dart';
-import 'package:stackduo/widgets/textfield_icon_button.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
+import 'package:stackwallet/widgets/textfield_icon_button.dart';
+
+import '../sample_data/theme_json.dart';
 
 void main() {
   testWidgets("test", (widgetTester) async {
@@ -11,7 +13,11 @@ void main() {
       MaterialApp(
         theme: ThemeData(
           extensions: [
-            StackColors.fromStackColorTheme(LightColors()),
+            StackColors.fromStackColorTheme(
+              StackTheme.fromJson(
+                json: lightThemeJsonMap,
+              ),
+            ),
           ],
         ),
         home: const Material(
diff --git a/test/widget_tests/trade_card_test.dart b/test/widget_tests/trade_card_test.dart
index 810087304..d42c00b85 100644
--- a/test/widget_tests/trade_card_test.dart
+++ b/test/widget_tests/trade_card_test.dart
@@ -1,13 +1,28 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:stackduo/models/exchange/response_objects/trade.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/trade_card.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:stackwallet/models/exchange/response_objects/trade.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/widgets/trade_card.dart';
 
+import '../sample_data/theme_json.dart';
+import 'trade_card_test.mocks.dart';
+
+@GenerateMocks([
+  ThemeService,
+])
 void main() {
   testWidgets("Test Trade card builds", (widgetTester) async {
+    final mockThemeService = MockThemeService();
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
     final trade = Trade(
         uuid: "uuid",
         tradeId: "trade id",
@@ -34,12 +49,16 @@ void main() {
 
     await widgetTester.pumpWidget(
       ProviderScope(
-        overrides: [],
+        overrides: [
+          pThemeService.overrideWithValue(mockThemeService),
+        ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
diff --git a/test/widget_tests/transaction_card_test.dart b/test/widget_tests/transaction_card_test.dart
index a5e2209af..c4b89fb4a 100644
--- a/test/widget_tests/transaction_card_test.dart
+++ b/test/widget_tests/transaction_card_test.dart
@@ -1,505 +1,555 @@
-// import 'package:decimal/decimal.dart';
-// import 'package:flutter/material.dart';
-// import 'package:flutter_feather_icons/flutter_feather_icons.dart';
-// import 'package:flutter_riverpod/flutter_riverpod.dart';
-// import 'package:flutter_test/flutter_test.dart';
-// import 'package:mockingjay/mockingjay.dart' as mockingjay;
-// import 'package:mockito/annotations.dart';
-// import 'package:mockito/mockito.dart';
-// import 'package:stackwallet/models/isar/models/blockchain_data/address.dart';
-// import 'package:stackwallet/models/isar/models/blockchain_data/transaction.dart';
-// import 'package:stackwallet/models/isar/stack_theme.dart';
-// import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart';
-// import 'package:stackwallet/providers/providers.dart';
-// import 'package:stackwallet/services/coins/coin_service.dart';
-// import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
-// import 'package:stackwallet/services/coins/manager.dart';
-// import 'package:stackwallet/services/locale_service.dart';
-// import 'package:stackwallet/services/notes_service.dart';
-// import 'package:stackwallet/services/price_service.dart';
-// import 'package:stackwallet/services/wallets.dart';
-// import 'package:stackwallet/themes/stack_colors.dart';
-// import 'package:stackwallet/themes/theme_service.dart';
-// import 'package:stackwallet/utilities/amount/amount.dart';
-// import 'package:stackwallet/utilities/enums/coin_enum.dart';
-// import 'package:stackwallet/utilities/prefs.dart';
-// import 'package:stackwallet/utilities/util.dart';
-// import 'package:stackwallet/widgets/transaction_card.dart';
-// import 'package:tuple/tuple.dart';
-//
-// import '../sample_data/theme_json.dart';
-// import 'transaction_card_test.mocks.dart';
-//
-// @GenerateMocks([
-//   Wallets,
-//   Manager,
-//   CoinServiceAPI,
-//   FiroWallet,
-//   LocaleService,
-//   Prefs,
-//   PriceService,
-//   NotesService,
-//   ThemeService,
-// ], customMocks: [])
-// void main() {
-//   TestWidgetsFlutterBinding.ensureInitialized();
-//   testWidgets("Sent confirmed tx displays correctly", (tester) async {
-//     final mockManager = MockManager();
-//     final mockLocaleService = MockLocaleService();
-//     final wallets = MockWallets();
-//     final mockPrefs = MockPrefs();
-//     final mockPriceService = MockPriceService();
-//     final mockThemeService = MockThemeService();
-//
-//     final tx = Transaction(
-//       txid: "some txid",
-//       timestamp: 1648595998,
-//       type: TransactionType.outgoing,
-//       amount: 100000000,
-//       amountString: Amount(
-//         rawValue: BigInt.from(100000000),
-//         fractionDigits: Coin.firo.decimals,
-//       ).toJsonString(),
-//       fee: 3794,
-//       height: 450123,
-//       subType: TransactionSubType.none,
-//       isCancelled: false,
-//       walletId: '',
-//       isLelantus: null,
-//       slateId: '',
-//       otherData: '',
-//       nonce: null,
-//       inputs: [],
-//       outputs: [],
-//       numberOfMessages: null,
-//     )..address.value = Address(
-//         walletId: "walletId",
-//         value: "",
-//         publicKey: [],
-//         derivationIndex: 0,
-//         derivationPath: null,
-//         type: AddressType.p2pkh,
-//         subType: AddressSubType.receiving);
-//
-//     final CoinServiceAPI wallet = MockFiroWallet();
-//
-//     when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
-//       (_) => StackTheme.fromJson(
-//         json: lightThemeJsonMap,
-//         applicationThemesDirectoryPath: "test",
-//       ),
-//     );
-//     when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
-//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-//     when(mockPrefs.currency).thenAnswer((_) => "USD");
-//     when(mockPrefs.externalCalls).thenAnswer((_) => true);
-//     when(mockPriceService.getPrice(Coin.firo))
-//         .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
-//
-//     when(wallet.coin).thenAnswer((_) => Coin.firo);
-//
-//     when(wallets.getManager("wallet-id"))
-//         .thenAnswer((realInvocation) => Manager(wallet));
-//
-//     when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
-//     //
-//     await tester.pumpWidget(
-//       ProviderScope(
-//         overrides: [
-//           walletsChangeNotifierProvider.overrideWithValue(wallets),
-//           localeServiceChangeNotifierProvider
-//               .overrideWithValue(mockLocaleService),
-//           pThemeService.overrideWithValue(mockThemeService),
-//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-//           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
-//         ],
-//         child: MaterialApp(
-//           theme: ThemeData(
-//             extensions: [
-//               StackColors.fromStackColorTheme(
-//                 StackTheme.fromJson(
-//                   json: lightThemeJsonMap,
-//                   applicationThemesDirectoryPath: "test",
-//                 ),
-//               ),
-//             ],
-//           ),
-//           home: TransactionCard(transaction: tx, walletId: "wallet-id"),
-//         ),
-//       ),
-//     );
-//
-//     //
-//     final title = find.text("Sent");
-//     // final price1 = find.text("0.00 USD");
-//     final amount = Util.isDesktop
-//         ? find.text("-1.00000000 FIRO")
-//         : find.text("1.00000000 FIRO");
-//
-//     final icon = find.byIcon(FeatherIcons.arrowUp);
-//
-//     expect(title, findsOneWidget);
-//     // expect(price1, findsOneWidget);
-//     expect(amount, findsOneWidget);
-//     // expect(icon, findsOneWidget);
-//     //
-//     await tester.pumpAndSettle(const Duration(seconds: 2));
-//     //
-//     // final price2 = find.text("\$10.00");
-//     // expect(price2, findsOneWidget);
-//     //
-//     // verify(mockManager.addListener(any)).called(1);
-//     verify(mockLocaleService.addListener(any)).called(1);
-//
-//     verify(mockPrefs.currency).called(1);
-//     verify(mockPriceService.getPrice(Coin.firo)).called(1);
-//     verify(wallet.coin.ticker).called(1);
-//
-//     verify(mockLocaleService.locale).called(1);
-//
-//     verifyNoMoreInteractions(mockManager);
-//     verifyNoMoreInteractions(mockLocaleService);
-//   });
-//
-//   testWidgets("Anonymized confirmed tx displays correctly", (tester) async {
-//     final mockManager = MockManager();
-//     final mockLocaleService = MockLocaleService();
-//     final wallets = MockWallets();
-//     final mockPrefs = MockPrefs();
-//     final mockPriceService = MockPriceService();
-//     final mockThemeService = MockThemeService();
-//
-//     final tx = Transaction(
-//       txid: "some txid",
-//       timestamp: 1648595998,
-//       type: TransactionType.outgoing,
-//       amount: 9659,
-//       amountString: Amount(
-//         rawValue: BigInt.from(9659),
-//         fractionDigits: Coin.firo.decimals,
-//       ).toJsonString(),
-//       fee: 3794,
-//       height: 450123,
-//       subType: TransactionSubType.mint,
-//       isCancelled: false,
-//       walletId: '',
-//       isLelantus: null,
-//       slateId: '',
-//       otherData: '',
-//       nonce: null,
-//       inputs: [],
-//       outputs: [],
-//       numberOfMessages: null,
-//     )..address.value = Address(
-//         walletId: "walletId",
-//         value: "",
-//         publicKey: [],
-//         derivationIndex: 0,
-//         derivationPath: null,
-//         type: AddressType.p2pkh,
-//         subType: AddressSubType.receiving);
-//
-//     final CoinServiceAPI wallet = MockFiroWallet();
-//
-//     when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
-//       (_) => StackTheme.fromJson(
-//         json: lightThemeJsonMap,
-//         applicationThemesDirectoryPath: "test",
-//       ),
-//     );
-//     when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
-//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-//     when(mockPrefs.currency).thenAnswer((_) => "USD");
-//     when(mockPrefs.externalCalls).thenAnswer((_) => true);
-//     when(mockPriceService.getPrice(Coin.firo))
-//         .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
-//
-//     when(wallet.coin).thenAnswer((_) => Coin.firo);
-//     when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
-//
-//     when(wallets.getManager("wallet-id"))
-//         .thenAnswer((realInvocation) => Manager(wallet));
-//     //
-//     await tester.pumpWidget(
-//       ProviderScope(
-//         overrides: [
-//           walletsChangeNotifierProvider.overrideWithValue(wallets),
-//           localeServiceChangeNotifierProvider
-//               .overrideWithValue(mockLocaleService),
-//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-//           pThemeService.overrideWithValue(mockThemeService),
-//           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
-//         ],
-//         child: MaterialApp(
-//           theme: ThemeData(
-//             extensions: [
-//               StackColors.fromStackColorTheme(
-//                 StackTheme.fromJson(
-//                   json: lightThemeJsonMap,
-//                   applicationThemesDirectoryPath: "test",
-//                 ),
-//               ),
-//             ],
-//           ),
-//           home: TransactionCard(transaction: tx, walletId: "wallet-id"),
-//         ),
-//       ),
-//     );
-//
-//     //
-//     final title = find.text("Anonymized");
-//     // final price1 = find.text("0.00 USD");
-//     final amount = find.text("-0.00009659 FIRO");
-//
-//     final icon = find.byIcon(FeatherIcons.arrowUp);
-//
-//     expect(title, findsOneWidget);
-//     // expect(price1, findsOneWidget);
-//     expect(amount, findsOneWidget);
-//     // expect(icon, findsOneWidget);
-//     //
-//     await tester.pumpAndSettle(const Duration(seconds: 2));
-//     //
-//     // final price2 = find.text("\$10.00");
-//     // expect(price2, findsOneWidget);
-//     //
-//     // verify(mockManager.addListener(any)).called(1);
-//     verify(mockLocaleService.addListener(any)).called(1);
-//
-//     verify(mockPrefs.currency).called(1);
-//     verify(mockPriceService.getPrice(Coin.firo)).called(1);
-//     verify(wallet.coin.ticker).called(1);
-//
-//     verify(mockLocaleService.locale).called(1);
-//
-//     verifyNoMoreInteractions(mockManager);
-//     verifyNoMoreInteractions(mockLocaleService);
-//   });
-//
-//   testWidgets("Received unconfirmed tx displays correctly", (tester) async {
-//     final mockManager = MockManager();
-//     final mockLocaleService = MockLocaleService();
-//     final wallets = MockWallets();
-//     final mockPrefs = MockPrefs();
-//     final mockPriceService = MockPriceService();
-//     final mockThemeService = MockThemeService();
-//
-//     final tx = Transaction(
-//       txid: "some txid",
-//       timestamp: 1648595998,
-//       type: TransactionType.incoming,
-//       amount: 100000000,
-//       amountString: Amount(
-//         rawValue: BigInt.from(100000000),
-//         fractionDigits: Coin.firo.decimals,
-//       ).toJsonString(),
-//       fee: 3794,
-//       height: 450123,
-//       subType: TransactionSubType.none,
-//       isCancelled: false,
-//       walletId: '',
-//       isLelantus: null,
-//       slateId: '',
-//       otherData: '',
-//       nonce: null,
-//       inputs: [],
-//       outputs: [],
-//       numberOfMessages: null,
-//     )..address.value = Address(
-//         walletId: "walletId",
-//         value: "",
-//         publicKey: [],
-//         derivationIndex: 0,
-//         derivationPath: null,
-//         type: AddressType.p2pkh,
-//         subType: AddressSubType.receiving);
-//
-//     final CoinServiceAPI wallet = MockFiroWallet();
-//
-//     when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
-//       (_) => StackTheme.fromJson(
-//         json: lightThemeJsonMap,
-//         applicationThemesDirectoryPath: "test",
-//       ),
-//     );
-//     when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
-//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-//     when(mockPrefs.currency).thenAnswer((_) => "USD");
-//     when(mockPrefs.externalCalls).thenAnswer((_) => true);
-//     when(mockPriceService.getPrice(Coin.firo))
-//         .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
-//
-//     when(wallet.coin).thenAnswer((_) => Coin.firo);
-//
-//     when(wallets.getManager("wallet-id"))
-//         .thenAnswer((realInvocation) => Manager(wallet));
-//
-//     when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
-//
-//     await tester.pumpWidget(
-//       ProviderScope(
-//         overrides: [
-//           walletsChangeNotifierProvider.overrideWithValue(wallets),
-//           localeServiceChangeNotifierProvider
-//               .overrideWithValue(mockLocaleService),
-//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-//           pThemeService.overrideWithValue(mockThemeService),
-//           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
-//         ],
-//         child: MaterialApp(
-//           theme: ThemeData(
-//             extensions: [
-//               StackColors.fromStackColorTheme(
-//                 StackTheme.fromJson(
-//                   json: lightThemeJsonMap,
-//                   applicationThemesDirectoryPath: "test",
-//                 ),
-//               ),
-//             ],
-//           ),
-//           home: TransactionCard(transaction: tx, walletId: "wallet-id"),
-//         ),
-//       ),
-//     );
-//
-//     final title = find.text("Received");
-//     final amount = Util.isDesktop
-//         ? find.text("+1.00000000 FIRO")
-//         : find.text("1.00000000 FIRO");
-//
-//     expect(title, findsOneWidget);
-//     expect(amount, findsOneWidget);
-//
-//     await tester.pumpAndSettle(const Duration(seconds: 2));
-//
-//     verify(mockLocaleService.addListener(any)).called(1);
-//
-//     verify(mockPrefs.currency).called(1);
-//     verify(mockPriceService.getPrice(Coin.firo)).called(1);
-//     verify(wallet.coin.ticker).called(1);
-//
-//     verify(mockLocaleService.locale).called(1);
-//
-//     verifyNoMoreInteractions(mockManager);
-//     verifyNoMoreInteractions(mockLocaleService);
-//   });
-//
-//   testWidgets("Tap gesture", (tester) async {
-//     final mockManager = MockManager();
-//     final mockLocaleService = MockLocaleService();
-//     final wallets = MockWallets();
-//     final mockPrefs = MockPrefs();
-//     final mockPriceService = MockPriceService();
-//     final mockThemeService = MockThemeService();
-//     final navigator = mockingjay.MockNavigator();
-//
-//     final tx = Transaction(
-//       txid: "some txid",
-//       timestamp: 1648595998,
-//       type: TransactionType.outgoing,
-//       amount: 100000000,
-//       amountString: Amount(
-//         rawValue: BigInt.from(100000000),
-//         fractionDigits: Coin.firo.decimals,
-//       ).toJsonString(),
-//       fee: 3794,
-//       height: 450123,
-//       subType: TransactionSubType.none,
-//       isCancelled: false,
-//       walletId: '',
-//       isLelantus: null,
-//       slateId: '',
-//       otherData: '',
-//       nonce: null,
-//       inputs: [],
-//       outputs: [],
-//       numberOfMessages: null,
-//     )..address.value = Address(
-//         walletId: "walletId",
-//         value: "",
-//         publicKey: [],
-//         derivationIndex: 0,
-//         derivationPath: null,
-//         type: AddressType.p2pkh,
-//         subType: AddressSubType.receiving);
-//
-//     final CoinServiceAPI wallet = MockFiroWallet();
-//
-//     when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
-//       (_) => StackTheme.fromJson(
-//         json: lightThemeJsonMap,
-//         applicationThemesDirectoryPath: "test",
-//       ),
-//     );
-//     when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
-//     when(mockLocaleService.locale).thenAnswer((_) => "en_US");
-//     when(mockPrefs.currency).thenAnswer((_) => "USD");
-//     when(mockPrefs.externalCalls).thenAnswer((_) => true);
-//     when(mockPriceService.getPrice(Coin.firo))
-//         .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
-//
-//     when(wallet.coin).thenAnswer((_) => Coin.firo);
-//
-//     when(wallets.getManager("wallet id"))
-//         .thenAnswer((realInvocation) => Manager(wallet));
-//
-//     when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
-//
-//     mockingjay
-//         .when(() => navigator.pushNamed("/transactionDetails",
-//             arguments: Tuple3(tx, Coin.firo, "wallet id")))
-//         .thenAnswer((_) async => {});
-//
-//     await tester.pumpWidget(
-//       ProviderScope(
-//         overrides: [
-//           walletsChangeNotifierProvider.overrideWithValue(wallets),
-//           localeServiceChangeNotifierProvider
-//               .overrideWithValue(mockLocaleService),
-//           prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
-//           pThemeService.overrideWithValue(mockThemeService),
-//           priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
-//         ],
-//         child: MaterialApp(
-//           theme: ThemeData(
-//             extensions: [
-//               StackColors.fromStackColorTheme(
-//                 StackTheme.fromJson(
-//                   json: lightThemeJsonMap,
-//                   applicationThemesDirectoryPath: "test",
-//                 ),
-//               ),
-//             ],
-//           ),
-//           home: mockingjay.MockNavigatorProvider(
-//               navigator: navigator,
-//               child: TransactionCard(transaction: tx, walletId: "wallet id")),
-//         ),
-//       ),
-//     );
-//
-//     expect(find.byType(GestureDetector), findsOneWidget);
-//
-//     await tester.tap(find.byType(GestureDetector));
-//     await tester.pump();
-//
-//     verify(mockLocaleService.addListener(any)).called(1);
-//
-//     verify(mockPrefs.currency).called(2);
-//     verify(mockLocaleService.locale).called(4);
-//     verify(wallet.coin.ticker).called(1);
-//     verify(wallet.storedChainHeight).called(2);
-//
-//     verifyNoMoreInteractions(wallet);
-//     verifyNoMoreInteractions(mockLocaleService);
-//
-//     if (Util.isDesktop) {
-//       expect(find.byType(TransactionDetailsView), findsOneWidget);
-//     } else {
-//       mockingjay
-//           .verify(() => navigator.pushNamed("/transactionDetails",
-//               arguments: Tuple3(tx, Coin.firo, "wallet id")))
-//           .called(1);
-//     }
-//   });
-// }
+import 'package:decimal/decimal.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_feather_icons/flutter_feather_icons.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockingjay/mockingjay.dart' as mockingjay;
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:stackwallet/db/isar/main_db.dart';
+import 'package:stackwallet/models/isar/models/isar_models.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/pages/wallet_view/transaction_views/transaction_details_view.dart';
+import 'package:stackwallet/providers/db/main_db_provider.dart';
+import 'package:stackwallet/providers/global/locale_provider.dart';
+import 'package:stackwallet/providers/global/prefs_provider.dart';
+import 'package:stackwallet/providers/global/price_provider.dart';
+import 'package:stackwallet/providers/global/wallets_provider.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/firo/firo_wallet.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/services/locale_service.dart';
+import 'package:stackwallet/services/notes_service.dart';
+import 'package:stackwallet/services/price_service.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/amount/amount_unit.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/utilities/prefs.dart';
+import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/widgets/transaction_card.dart';
+import 'package:tuple/tuple.dart';
+
+import '../sample_data/theme_json.dart';
+import 'transaction_card_test.mocks.dart';
+
+@GenerateMocks([
+  Wallets,
+  Manager,
+  CoinServiceAPI,
+  FiroWallet,
+  LocaleService,
+  Prefs,
+  PriceService,
+  NotesService,
+  ThemeService,
+  MainDB,
+], customMocks: [])
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+  testWidgets("Sent confirmed tx displays correctly", (tester) async {
+    final mockManager = MockManager();
+    final mockLocaleService = MockLocaleService();
+    final wallets = MockWallets();
+    final mockPrefs = MockPrefs();
+    final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
+    final mockDB = MockMainDB();
+
+    final tx = Transaction(
+      txid: "some txid",
+      timestamp: 1648595998,
+      type: TransactionType.outgoing,
+      amount: 100000000,
+      amountString: Amount(
+        rawValue: BigInt.from(100000000),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
+      fee: 3794,
+      height: 450123,
+      subType: TransactionSubType.none,
+      isCancelled: false,
+      walletId: '',
+      isLelantus: null,
+      slateId: '',
+      otherData: '',
+      nonce: null,
+      inputs: [],
+      outputs: [],
+      numberOfMessages: null,
+    )..address.value = Address(
+        walletId: "walletId",
+        value: "",
+        publicKey: [],
+        derivationIndex: 0,
+        derivationPath: null,
+        type: AddressType.p2pkh,
+        subType: AddressSubType.receiving);
+
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
+    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+    when(mockPrefs.currency).thenAnswer((_) => "USD");
+    when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+
+    when(wallets.getManager("wallet-id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+
+    when(mockPrefs.amountUnit(Coin.firo)).thenAnswer(
+      (_) => AmountUnit.normal,
+    );
+    when(mockPrefs.maxDecimals(Coin.firo)).thenAnswer(
+      (_) => 8,
+    );
+
+    when(mockDB.getEthContractSync("")).thenAnswer(
+      (_) => null,
+    );
+    //
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          walletsChangeNotifierProvider.overrideWithValue(wallets),
+          localeServiceChangeNotifierProvider
+              .overrideWithValue(mockLocaleService),
+          pThemeService.overrideWithValue(mockThemeService),
+          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService),
+          mainDBProvider.overrideWithValue(mockDB),
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: TransactionCard(transaction: tx, walletId: "wallet-id"),
+        ),
+      ),
+    );
+
+    //
+    final title = find.text("Sent");
+    // final price1 = find.text("0.00 USD");
+    final amount = Util.isDesktop
+        ? find.text("-1.00000000 FIRO")
+        : find.text("1.00000000 FIRO");
+
+    final icon = find.byIcon(FeatherIcons.arrowUp);
+
+    expect(title, findsOneWidget);
+    // expect(price1, findsOneWidget);
+    expect(amount, findsOneWidget);
+    // expect(icon, findsOneWidget);
+    //
+    await tester.pumpAndSettle(const Duration(seconds: 2));
+    //
+    // final price2 = find.text("\$10.00");
+    // expect(price2, findsOneWidget);
+    //
+    // verify(mockManager.addListener(any)).called(1);
+    verify(mockLocaleService.addListener(any)).called(1);
+
+    verify(mockPrefs.currency).called(1);
+    verify(mockPriceService.getPrice(Coin.firo)).called(1);
+    verify(wallet.coin.ticker).called(1);
+
+    verify(mockLocaleService.locale).called(2);
+
+    verifyNoMoreInteractions(mockManager);
+    verifyNoMoreInteractions(mockLocaleService);
+  });
+
+  testWidgets("Anonymized confirmed tx displays correctly", (tester) async {
+    final mockManager = MockManager();
+    final mockLocaleService = MockLocaleService();
+    final wallets = MockWallets();
+    final mockPrefs = MockPrefs();
+    final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
+    final mockDB = MockMainDB();
+
+    final tx = Transaction(
+      txid: "some txid",
+      timestamp: 1648595998,
+      type: TransactionType.outgoing,
+      amount: 9659,
+      amountString: Amount(
+        rawValue: BigInt.from(9659),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
+      fee: 3794,
+      height: 450123,
+      subType: TransactionSubType.mint,
+      isCancelled: false,
+      walletId: '',
+      isLelantus: null,
+      slateId: '',
+      otherData: '',
+      nonce: null,
+      inputs: [],
+      outputs: [],
+      numberOfMessages: null,
+    )..address.value = Address(
+        walletId: "walletId",
+        value: "",
+        publicKey: [],
+        derivationIndex: 0,
+        derivationPath: null,
+        type: AddressType.p2pkh,
+        subType: AddressSubType.receiving);
+
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
+    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+    when(mockPrefs.currency).thenAnswer((_) => "USD");
+    when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+
+    when(mockPrefs.amountUnit(Coin.firo)).thenAnswer(
+      (_) => AmountUnit.normal,
+    );
+    when(mockPrefs.maxDecimals(Coin.firo)).thenAnswer(
+      (_) => 8,
+    );
+
+    when(mockDB.getEthContractSync("")).thenAnswer(
+      (_) => null,
+    );
+
+    when(wallets.getManager("wallet-id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+    //
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          walletsChangeNotifierProvider.overrideWithValue(wallets),
+          localeServiceChangeNotifierProvider
+              .overrideWithValue(mockLocaleService),
+          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
+          mainDBProvider.overrideWithValue(mockDB),
+          priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: TransactionCard(transaction: tx, walletId: "wallet-id"),
+        ),
+      ),
+    );
+
+    //
+    final title = find.text("Anonymized");
+    // final price1 = find.text("0.00 USD");
+    final amount = find.text("-0.00009659 FIRO");
+
+    final icon = find.byIcon(FeatherIcons.arrowUp);
+
+    expect(title, findsOneWidget);
+    // expect(price1, findsOneWidget);
+    expect(amount, findsOneWidget);
+    // expect(icon, findsOneWidget);
+    //
+    await tester.pumpAndSettle(const Duration(seconds: 2));
+    //
+    // final price2 = find.text("\$10.00");
+    // expect(price2, findsOneWidget);
+    //
+    // verify(mockManager.addListener(any)).called(1);
+    verify(mockLocaleService.addListener(any)).called(1);
+
+    verify(mockPrefs.currency).called(1);
+    verify(mockPriceService.getPrice(Coin.firo)).called(1);
+    verify(wallet.coin.ticker).called(1);
+
+    verify(mockLocaleService.locale).called(2);
+
+    verifyNoMoreInteractions(mockManager);
+    verifyNoMoreInteractions(mockLocaleService);
+  });
+
+  testWidgets("Received unconfirmed tx displays correctly", (tester) async {
+    final mockManager = MockManager();
+    final mockLocaleService = MockLocaleService();
+    final wallets = MockWallets();
+    final mockPrefs = MockPrefs();
+    final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
+    final mockDB = MockMainDB();
+
+    final tx = Transaction(
+      txid: "some txid",
+      timestamp: 1648595998,
+      type: TransactionType.incoming,
+      amount: 100000000,
+      amountString: Amount(
+        rawValue: BigInt.from(100000000),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
+      fee: 3794,
+      height: 450123,
+      subType: TransactionSubType.none,
+      isCancelled: false,
+      walletId: '',
+      isLelantus: null,
+      slateId: '',
+      otherData: '',
+      nonce: null,
+      inputs: [],
+      outputs: [],
+      numberOfMessages: null,
+    )..address.value = Address(
+        walletId: "walletId",
+        value: "",
+        publicKey: [],
+        derivationIndex: 0,
+        derivationPath: null,
+        type: AddressType.p2pkh,
+        subType: AddressSubType.receiving);
+
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
+    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+    when(mockPrefs.currency).thenAnswer((_) => "USD");
+    when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+
+    when(wallets.getManager("wallet-id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+
+    when(mockPrefs.amountUnit(Coin.firo)).thenAnswer(
+      (_) => AmountUnit.normal,
+    );
+    when(mockPrefs.maxDecimals(Coin.firo)).thenAnswer(
+      (_) => 8,
+    );
+
+    when(mockDB.getEthContractSync("")).thenAnswer(
+      (_) => null,
+    );
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          walletsChangeNotifierProvider.overrideWithValue(wallets),
+          localeServiceChangeNotifierProvider
+              .overrideWithValue(mockLocaleService),
+          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
+          mainDBProvider.overrideWithValue(mockDB),
+          priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: TransactionCard(transaction: tx, walletId: "wallet-id"),
+        ),
+      ),
+    );
+
+    final title = find.text("Received");
+    final amount = Util.isDesktop
+        ? find.text("+1.00000000 FIRO")
+        : find.text("1.00000000 FIRO");
+
+    expect(title, findsOneWidget);
+    expect(amount, findsOneWidget);
+
+    await tester.pumpAndSettle(const Duration(seconds: 2));
+
+    verify(mockLocaleService.addListener(any)).called(1);
+
+    verify(mockPrefs.currency).called(1);
+    verify(mockPriceService.getPrice(Coin.firo)).called(1);
+    verify(wallet.coin.ticker).called(1);
+
+    verify(mockLocaleService.locale).called(2);
+
+    verifyNoMoreInteractions(mockManager);
+    verifyNoMoreInteractions(mockLocaleService);
+  });
+
+  testWidgets("Tap gesture", (tester) async {
+    final mockManager = MockManager();
+    final mockLocaleService = MockLocaleService();
+    final wallets = MockWallets();
+    final mockPrefs = MockPrefs();
+    final mockPriceService = MockPriceService();
+    final mockThemeService = MockThemeService();
+    final mockDB = MockMainDB();
+    final navigator = mockingjay.MockNavigator();
+
+    final tx = Transaction(
+      txid: "some txid",
+      timestamp: 1648595998,
+      type: TransactionType.outgoing,
+      amount: 100000000,
+      amountString: Amount(
+        rawValue: BigInt.from(100000000),
+        fractionDigits: Coin.firo.decimals,
+      ).toJsonString(),
+      fee: 3794,
+      height: 450123,
+      subType: TransactionSubType.none,
+      isCancelled: false,
+      walletId: '',
+      isLelantus: null,
+      slateId: '',
+      otherData: '',
+      nonce: null,
+      inputs: [],
+      outputs: [],
+      numberOfMessages: null,
+    )..address.value = Address(
+        walletId: "walletId",
+        value: "",
+        publicKey: [],
+        derivationIndex: 0,
+        derivationPath: null,
+        type: AddressType.p2pkh,
+        subType: AddressSubType.receiving);
+
+    final CoinServiceAPI wallet = MockFiroWallet();
+
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
+    when(wallet.coin.ticker).thenAnswer((_) => "FIRO");
+    when(mockLocaleService.locale).thenAnswer((_) => "en_US");
+    when(mockPrefs.currency).thenAnswer((_) => "USD");
+    when(mockPrefs.externalCalls).thenAnswer((_) => true);
+    when(mockPriceService.getPrice(Coin.firo))
+        .thenAnswer((realInvocation) => Tuple2(Decimal.ten, 0.00));
+
+    when(wallet.coin).thenAnswer((_) => Coin.firo);
+
+    when(wallets.getManager("wallet id"))
+        .thenAnswer((realInvocation) => Manager(wallet));
+
+    when(wallet.storedChainHeight).thenAnswer((_) => 6000000);
+
+    mockingjay
+        .when(() => navigator.pushNamed("/transactionDetails",
+            arguments: Tuple3(tx, Coin.firo, "wallet id")))
+        .thenAnswer((_) async => {});
+
+    when(mockPrefs.amountUnit(Coin.firo)).thenAnswer(
+      (_) => AmountUnit.normal,
+    );
+    when(mockPrefs.maxDecimals(Coin.firo)).thenAnswer(
+      (_) => 8,
+    );
+
+    when(mockDB.getEthContractSync("")).thenAnswer(
+      (_) => null,
+    );
+
+    await tester.pumpWidget(
+      ProviderScope(
+        overrides: [
+          walletsChangeNotifierProvider.overrideWithValue(wallets),
+          localeServiceChangeNotifierProvider
+              .overrideWithValue(mockLocaleService),
+          prefsChangeNotifierProvider.overrideWithValue(mockPrefs),
+          pThemeService.overrideWithValue(mockThemeService),
+          mainDBProvider.overrideWithValue(mockDB),
+          priceAnd24hChangeNotifierProvider.overrideWithValue(mockPriceService)
+        ],
+        child: MaterialApp(
+          theme: ThemeData(
+            extensions: [
+              StackColors.fromStackColorTheme(
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
+              ),
+            ],
+          ),
+          home: mockingjay.MockNavigatorProvider(
+              navigator: navigator,
+              child: TransactionCard(transaction: tx, walletId: "wallet id")),
+        ),
+      ),
+    );
+
+    expect(find.byType(GestureDetector), findsOneWidget);
+
+    await tester.tap(find.byType(GestureDetector));
+    await tester.pump();
+
+    verify(mockLocaleService.addListener(any)).called(1);
+
+    verify(mockPrefs.currency).called(2);
+    verify(mockLocaleService.locale).called(3);
+    verify(wallet.coin.ticker).called(1);
+    verify(wallet.storedChainHeight).called(2);
+
+    verifyNoMoreInteractions(wallet);
+    verifyNoMoreInteractions(mockLocaleService);
+
+    if (Util.isDesktop) {
+      expect(find.byType(TransactionDetailsView), findsOneWidget);
+    } else {
+      mockingjay
+          .verify(() => navigator.pushNamed("/transactionDetails",
+              arguments: Tuple3(tx, Coin.firo, "wallet id")))
+          .called(1);
+    }
+  });
+}
diff --git a/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart b/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart
index acab25d1d..fee5ab6d5 100644
--- a/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart
+++ b/test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.dart
@@ -3,20 +3,21 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/models/balance.dart';
-import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart';
-import 'package:stackduo/services/coins/coin_service.dart';
-import 'package:stackduo/services/coins/manager.dart';
-import 'package:stackduo/services/node_service.dart';
-import 'package:stackduo/services/wallets.dart';
-import 'package:stackduo/services/wallets_service.dart';
-import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/wallet_info_row/sub_widgets/wallet_info_row_balance.dart';
+import 'package:stackwallet/models/balance.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/providers/providers.dart';
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/services/node_service.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/services/wallets_service.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/widgets/wallet_info_row/sub_widgets/wallet_info_row_balance.dart';
 
+import '../../../sample_data/theme_json.dart';
 import 'wallet_info_row_balance_future_test.mocks.dart';
 
 @GenerateMocks([
@@ -39,10 +40,10 @@ void main() {
     when(wallet.walletId).thenAnswer((_) => "some-wallet-id");
     when(wallet.balance).thenAnswer(
       (_) => Balance(
-        total: 0.toAmountAsRaw(fractionDigits: 8),
-        spendable: 0.toAmountAsRaw(fractionDigits: 8),
-        blockedTotal: 0.toAmountAsRaw(fractionDigits: 8),
-        pendingSpendable: 0.toAmountAsRaw(fractionDigits: 8),
+        total: Amount.zero,
+        spendable: Amount.zero,
+        blockedTotal: Amount.zero,
+        pendingSpendable: Amount.zero,
       ),
     );
 
@@ -61,7 +62,9 @@ void main() {
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),
diff --git a/test/widget_tests/wallet_info_row/wallet_info_row_test.dart b/test/widget_tests/wallet_info_row/wallet_info_row_test.dart
index 45a3ec421..c3fb2eef5 100644
--- a/test/widget_tests/wallet_info_row/wallet_info_row_test.dart
+++ b/test/widget_tests/wallet_info_row/wallet_info_row_test.dart
@@ -3,26 +3,29 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:stackduo/models/balance.dart';
-import 'package:stackduo/providers/providers.dart';
-import 'package:stackduo/services/coins/bitcoin/bitcoin_wallet.dart';
-import 'package:stackduo/services/coins/coin_service.dart';
-import 'package:stackduo/services/coins/manager.dart';
-import 'package:stackduo/services/node_service.dart';
-import 'package:stackduo/services/wallets.dart';
-import 'package:stackduo/services/wallets_service.dart';
-import 'package:stackduo/utilities/amount/amount.dart';
-import 'package:stackduo/utilities/enums/coin_enum.dart';
-import 'package:stackduo/utilities/theme/light_colors.dart';
-import 'package:stackduo/utilities/theme/stack_colors.dart';
-import 'package:stackduo/widgets/wallet_info_row/sub_widgets/wallet_info_row_balance.dart';
-import 'package:stackduo/widgets/wallet_info_row/wallet_info_row.dart';
+import 'package:stackwallet/models/balance.dart';
+import 'package:stackwallet/models/isar/stack_theme.dart';
+import 'package:stackwallet/providers/providers.dart';
+import 'package:stackwallet/services/coins/bitcoin/bitcoin_wallet.dart';
+import 'package:stackwallet/services/coins/coin_service.dart';
+import 'package:stackwallet/services/coins/manager.dart';
+import 'package:stackwallet/services/node_service.dart';
+import 'package:stackwallet/services/wallets.dart';
+import 'package:stackwallet/services/wallets_service.dart';
+import 'package:stackwallet/themes/stack_colors.dart';
+import 'package:stackwallet/themes/theme_service.dart';
+import 'package:stackwallet/utilities/amount/amount.dart';
+import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/widgets/wallet_info_row/sub_widgets/wallet_info_row_balance.dart';
+import 'package:stackwallet/widgets/wallet_info_row/wallet_info_row.dart';
 
+import '../../sample_data/theme_json.dart';
 import 'wallet_info_row_test.mocks.dart';
 
 @GenerateMocks([
   Wallets,
   WalletsService,
+  ThemeService,
   BitcoinWallet
 ], customMocks: [
   MockSpec<NodeService>(returnNullOnMissingStub: true),
@@ -33,16 +36,22 @@ import 'wallet_info_row_test.mocks.dart';
 void main() {
   testWidgets("Test wallet info row displays correctly", (widgetTester) async {
     final wallets = MockWallets();
+    final mockThemeService = MockThemeService();
     final CoinServiceAPI wallet = MockBitcoinWallet();
+    when(mockThemeService.getTheme(themeId: "light")).thenAnswer(
+      (_) => StackTheme.fromJson(
+        json: lightThemeJsonMap,
+      ),
+    );
     when(wallet.coin).thenAnswer((_) => Coin.bitcoin);
     when(wallet.walletName).thenAnswer((_) => "some wallet");
     when(wallet.walletId).thenAnswer((_) => "some-wallet-id");
     when(wallet.balance).thenAnswer(
       (_) => Balance(
-        total: 0.toAmountAsRaw(fractionDigits: 8),
-        spendable: 0.toAmountAsRaw(fractionDigits: 8),
-        blockedTotal: 0.toAmountAsRaw(fractionDigits: 8),
-        pendingSpendable: 0.toAmountAsRaw(fractionDigits: 8),
+        total: Amount.zero,
+        spendable: Amount.zero,
+        blockedTotal: Amount.zero,
+        pendingSpendable: Amount.zero,
       ),
     );
 
@@ -55,12 +64,15 @@ void main() {
       ProviderScope(
         overrides: [
           walletsChangeNotifierProvider.overrideWithValue(wallets),
+          pThemeService.overrideWithValue(mockThemeService),
         ],
         child: MaterialApp(
           theme: ThemeData(
             extensions: [
               StackColors.fromStackColorTheme(
-                LightColors(),
+                StackTheme.fromJson(
+                  json: lightThemeJsonMap,
+                ),
               ),
             ],
           ),

From d289cde9c151f13b04b49a0994dab66d550d94c2 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Mon, 3 Jul 2023 18:46:58 -0600
Subject: [PATCH 84/87] fix: ios path fix

(cherry picked from commit 36cb3c2a6975cd4dfa4ec7225dc944a71a9eda93)
---
 lib/models/isar/stack_theme.dart | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/models/isar/stack_theme.dart b/lib/models/isar/stack_theme.dart
index 27a0c4601..68808e23e 100644
--- a/lib/models/isar/stack_theme.dart
+++ b/lib/models/isar/stack_theme.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
@@ -2444,9 +2445,20 @@ class ThemeAssetsV3 implements IThemeAssets {
 
   static String prependIfNeeded(String relativePath) {
     final path = StackFileSystem.themesDir!.path;
+
     if (relativePath.startsWith(path)) {
       return relativePath;
     } else {
+      if (Platform.isIOS) {
+        const pattern = "/var/mobile/Containers/Data/Application/";
+        if (relativePath.startsWith(pattern)) {
+          final parts = relativePath.split("/Library/themes/");
+          if (parts.isNotEmpty) {
+            return "$path/${parts.last}";
+          }
+        }
+      }
+
       return "$path/$relativePath";
     }
   }

From 6ed62a37de6ac1861d652f43451916625121d843 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Tue, 4 Jul 2023 08:57:57 -0600
Subject: [PATCH 85/87] merge fixes

---
 lib/db/hive/db.dart                                       | 8 ++++----
 lib/models/isar/stack_theme.dart                          | 1 +
 lib/pages/receive_view/receive_view.dart                  | 2 +-
 .../wallet_view/sub_widgets/desktop_receive.dart          | 2 +-
 .../password/forgotten_passphrase_restore_from_swb.dart   | 5 ++---
 lib/utilities/desktop_password_service.dart               | 6 ++++++
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/db/hive/db.dart b/lib/db/hive/db.dart
index 3a8f241bb..0e6c57107 100644
--- a/lib/db/hive/db.dart
+++ b/lib/db/hive/db.dart
@@ -196,10 +196,10 @@ class DB {
   /// Clear all cached transactions for the specified coin
   Future<void> clearSharedTransactionCache({required Coin coin}) async {
     await deleteAll<dynamic>(boxName: _boxNameTxCache(coin: coin));
-    if (coin == Coin.firo) {
-      await deleteAll<dynamic>(boxName: _boxNameSetCache(coin: coin));
-      await deleteAll<dynamic>(boxName: _boxNameUsedSerialsCache(coin: coin));
-    }
+    // if (coin == Coin.firo) {
+    //   await deleteAll<dynamic>(boxName: _boxNameSetCache(coin: coin));
+    //   await deleteAll<dynamic>(boxName: _boxNameUsedSerialsCache(coin: coin));
+    // }
   }
 
   /////////////////////////////////////////
diff --git a/lib/models/isar/stack_theme.dart b/lib/models/isar/stack_theme.dart
index 68808e23e..a30274902 100644
--- a/lib/models/isar/stack_theme.dart
+++ b/lib/models/isar/stack_theme.dart
@@ -8,6 +8,7 @@ import 'package:stackduo/utilities/enums/coin_enum.dart';
 import 'package:stackduo/utilities/extensions/extensions.dart';
 import 'package:stackduo/utilities/extensions/impl/box_shadow.dart';
 import 'package:stackduo/utilities/extensions/impl/gradient.dart';
+import 'package:stackduo/utilities/stack_file_system.dart';
 
 part 'stack_theme.g.dart';
 
diff --git a/lib/pages/receive_view/receive_view.dart b/lib/pages/receive_view/receive_view.dart
index fce263570..5971faadc 100644
--- a/lib/pages/receive_view/receive_view.dart
+++ b/lib/pages/receive_view/receive_view.dart
@@ -11,7 +11,7 @@ import 'package:stackduo/pages/receive_view/generate_receiving_uri_qr_code_view.
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/route_generator.dart';
 import 'package:stackduo/themes/stack_colors.dart';
-import 'package:stackwallet/utilities/address_utils.dart';
+import 'package:stackduo/utilities/address_utils.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/clipboard_interface.dart';
 import 'package:stackduo/utilities/constants.dart';
diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
index 41e6aaaca..ae85903c2 100644
--- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
+++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart
@@ -10,7 +10,7 @@ import 'package:stackduo/pages/receive_view/generate_receiving_uri_qr_code_view.
 import 'package:stackduo/providers/providers.dart';
 import 'package:stackduo/route_generator.dart';
 import 'package:stackduo/themes/stack_colors.dart';
-import 'package:stackwallet/utilities/address_utils.dart';
+import 'package:stackduo/utilities/address_utils.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/clipboard_interface.dart';
 import 'package:stackduo/utilities/constants.dart';
diff --git a/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart b/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart
index 72e9f2081..ddcf81c4a 100644
--- a/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart
+++ b/lib/pages_desktop_specific/password/forgotten_passphrase_restore_from_swb.dart
@@ -5,7 +5,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:stackduo/db/hive/db.dart';
 import 'package:stackduo/notifications/show_flush_bar.dart';
 import 'package:stackduo/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart';
@@ -15,12 +14,12 @@ import 'package:stackduo/pages_desktop_specific/password/create_password_view.da
 import 'package:stackduo/providers/desktop/storage_crypto_handler_provider.dart';
 import 'package:stackduo/providers/global/secure_store_provider.dart';
 import 'package:stackduo/providers/global/wallets_provider.dart';
+import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/utilities/assets.dart';
 import 'package:stackduo/utilities/constants.dart';
 import 'package:stackduo/utilities/flutter_secure_storage_interface.dart';
 import 'package:stackduo/utilities/logger.dart';
 import 'package:stackduo/utilities/text_styles.dart';
-import 'package:stackduo/themes/stack_colors.dart';
 import 'package:stackduo/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackduo/widgets/desktop/desktop_app_bar.dart';
 import 'package:stackduo/widgets/desktop/desktop_dialog.dart';
@@ -203,8 +202,8 @@ class _ForgottenPassphraseRestoreFromSWBState
             await (ref.read(secureStoreProvider).store as DesktopSecureStore)
                 .close();
             ref.refresh(secureStoreProvider);
+            await ref.read(storageCryptoHandlerProvider).deleteBox();
             ref.refresh(storageCryptoHandlerProvider);
-            await Hive.deleteBoxFromDisk(DB.boxNameDesktopData);
             await DB.instance.init();
             if (mounted) {
               Navigator.of(context)
diff --git a/lib/utilities/desktop_password_service.dart b/lib/utilities/desktop_password_service.dart
index 8c0dab194..d0812e089 100644
--- a/lib/utilities/desktop_password_service.dart
+++ b/lib/utilities/desktop_password_service.dart
@@ -199,4 +199,10 @@ class DPS {
     }
     return value;
   }
+
+  /// Dangerous. Used in one place and should not be called anywhere else.
+  @Deprecated("Don't use this if at all possible")
+  Future<void> deleteBox() async {
+    await Hive.deleteBoxFromDisk(kBoxNameDesktopData);
+  }
 }

From f311ba4a1d791704ef6bd77fb6580420f414ece5 Mon Sep 17 00:00:00 2001
From: Diego Salazar <diego@cypherstack.com>
Date: Wed, 5 Jul 2023 13:07:55 -0600
Subject: [PATCH 86/87] Bump version (v1.0.10, build 15)

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 2fe27c3cc..88c17d074 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Stack Duo
 # 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.0.9+14
+version: 1.0.10+15
 
 environment:
   sdk: ">=3.0.2 <4.0.0"

From 43b15fd3884cfaefec5b58126dbb1b15794c384c Mon Sep 17 00:00:00 2001
From: Diego Salazar <diego@cypherstack.com>
Date: Sat, 29 Jun 2024 11:37:32 -0600
Subject: [PATCH 87/87] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 79b6cfaf5..fba7152fd 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+# The Stack Duo code has now been merged with the Stack Wallet code! This was due to a refactor where we sought to merge the codebases so getting releases out would be faster and less work. This repository is kept around for "releases" as Obtanium users and the like would get confused if we updated Duo on the same repo as Stack Wallet. Please see the [Stack Wallet repository](https://github.com/cypherstack/stack_wallet) for the latest, most up-to-date code.
+
 [![codecov](https://codecov.io/gh/cypherstack/stack_wallet/branch/main/graph/badge.svg?token=PM1N56UTEW)](https://codecov.io/gh/cypherstack/stack_wallet)
 
 # Stack Duo
@@ -22,4 +24,4 @@ Highlights include:
 
 ## Building
 
-You can look at the [build instructions](docs/build.md) for more information on how to build the app.
\ No newline at end of file
+You can look at the [build instructions](docs/build.md) for more information on how to build the app.