merge fixes

Author: julian-CStack

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));
+    // }
   }
 
   /////////////////////////////////////////

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';
 

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';

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';

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)

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);
+  }
 }