Merge remote-tracking branch 'origin/staging' into tor

lib/electrumx_rpc/cached_electrumx.dart

@@ -9,6 +9,7 @@
  */
 
 import 'dart:convert';
+import 'dart:math';
 
 import 'package:stackwallet/db/hive/db.dart';
 import 'package:stackwallet/electrumx_rpc/electrumx.dart';
@@ -157,7 +158,6 @@ class CachedElectrumX {
 
   Future<List<String>> getUsedCoinSerials({
     required Coin coin,
-    int startNumber = 0,
   }) async {
     try {
       final box = await DB.instance.getUsedSerialsCacheBox(coin: coin);
@@ -168,7 +168,7 @@ class CachedElectrumX {
           _list == null ? {} : List<String>.from(_list).toSet();
 
       final startNumber =
-          cachedSerials.length - 10; // 10 being some arbitrary buffer
+          max(0, cachedSerials.length - 100); // 100 being some arbitrary buffer
 
       final serials = await electrumXClient.getUsedCoinSerials(
         startNumber: startNumber,

lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart

@@ -13,6 +13,7 @@ import 'dart:async';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:stackwallet/db/hive/db.dart';
 import 'package:stackwallet/models/epicbox_config_model.dart';
 import 'package:stackwallet/notifications/show_flush_bar.dart';
 import 'package:stackwallet/pages/address_book_views/address_book_view.dart';
@@ -36,11 +37,14 @@ import 'package:stackwallet/services/event_bus/global_event_bus.dart';
 import 'package:stackwallet/themes/stack_colors.dart';
 import 'package:stackwallet/utilities/assets.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
+import 'package:stackwallet/utilities/show_loading.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/background.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackwallet/widgets/desktop/secondary_button.dart';
 import 'package:stackwallet/widgets/rounded_white_container.dart';
+import 'package:stackwallet/widgets/stack_dialog.dart';
 import 'package:tuple/tuple.dart';
 
 /// [eventBus] should only be set during testing
@@ -306,6 +310,61 @@ class _WalletSettingsViewState extends ConsumerState<WalletSettingsView> {
                                       );
                                     },
                                   ),
+                                if (coin == Coin.firo)
+                                  const SizedBox(
+                                    height: 8,
+                                  ),
+                                if (coin == Coin.firo)
+                                  Consumer(
+                                    builder: (_, ref, __) {
+                                      return SettingsListButton(
+                                        iconAssetName: Assets.svg.eye,
+                                        title: "Clear electrumx cache",
+                                        onPressed: () async {
+                                          String? result;
+                                          await showDialog<void>(
+                                            useSafeArea: false,
+                                            barrierDismissible: true,
+                                            context: context,
+                                            builder: (_) => StackOkDialog(
+                                              title:
+                                                  "Are you sure you want to clear "
+                                                  "${coin.prettyName} electrumx cache?",
+                                              onOkPressed: (value) {
+                                                result = value;
+                                              },
+                                              leftButton: SecondaryButton(
+                                                label: "Cancel",
+                                                onPressed: () {
+                                                  Navigator.of(context).pop();
+                                                },
+                                              ),
+                                            ),
+                                          );
+
+                                          if (result == "OK" && mounted) {
+                                            await showLoading(
+                                              whileFuture: Future.wait<void>(
+                                                [
+                                                  Future.delayed(
+                                                    const Duration(
+                                                      milliseconds: 1500,
+                                                    ),
+                                                  ),
+                                                  DB.instance
+                                                      .clearSharedTransactionCache(
+                                                    coin: coin,
+                                                  ),
+                                                ],
+                                              ),
+                                              context: context,
+                                              message: "Clearing cache...",
+                                            );
+                                          }
+                                        },
+                                      );
+                                    },
+                                  ),
                                 if (coin == Coin.nano || coin == Coin.banano)
                                   const SizedBox(
                                     height: 8,

lib/pages/wallet_view/sub_widgets/tx_icon.dart

@@ -35,6 +35,7 @@ class TxIcon extends ConsumerWidget {
 
   String _getAssetName(
       bool isCancelled, bool isReceived, bool isPending, IThemeAssets assets) {
+
     if (!isReceived && transaction.subType == TransactionSubType.mint) {
       if (isCancelled) {
         return Assets.svg.anonymizeFailed;
@@ -47,7 +48,7 @@ class TxIcon extends ConsumerWidget {
 
     if (isReceived) {
       if (isCancelled) {
-        return assets.receive;
+        return assets.receiveCancelled;
       }
       if (isPending) {
         return assets.receivePending;

lib/pages/wallet_view/transaction_views/transaction_details_view.dart

@@ -358,8 +358,6 @@ class _TransactionDetailsViewState
     final currentHeight = ref.watch(walletsChangeNotifierProvider
         .select((value) => value.getManager(walletId).currentHeight));
 
-    print("THIS TRANSACTION IS $_transaction");
-
     return ConditionalParent(
       condition: !isDesktop,
       builder: (child) => Background(
@@ -1584,8 +1582,7 @@ class _TransactionDetailsViewState
                       coin.requiredConfirmations,
                     ) ==
                     false &&
-                _transaction.isCancelled == false &&
+                _transaction.isCancelled == false)
-                _transaction.type == TransactionType.outgoing)
             ? ConditionalParent(
                 condition: isDesktop,
                 builder: (child) => Padding(

test/services/coins/firo/firo_wallet_test.dart

@@ -2286,8 +2286,8 @@ void main() {
       when(cachedClient.getAnonymitySet(
               groupId: "1", blockhash: "", coin: Coin.firo))
           .thenAnswer((_) async => GetAnonymitySetSampleData.data);
-      when(cachedClient.getUsedCoinSerials(startNumber: 0, coin: Coin.firo))
+      when(cachedClient.getUsedCoinSerials(coin: Coin.firo)).thenAnswer(
-          .thenAnswer((_) async => List<String>.from(
+          (_) async => List<String>.from(
               GetUsedSerialsSampleData.serials['serials'] as List));
 
       final firo = FiroWallet(