Merge branch 'arti' into fusion

lib/pages/exchange_view/exchange_form.dart

@@ -36,7 +36,6 @@ import 'package:stackwallet/services/exchange/exchange_data_loading_service.dart
 import 'package:stackwallet/services/exchange/exchange_response.dart';
 import 'package:stackwallet/services/exchange/majestic_bank/majestic_bank_exchange.dart';
 import 'package:stackwallet/services/exchange/trocador/trocador_exchange.dart';
-import 'package:stackwallet/services/tor_service.dart';
 import 'package:stackwallet/themes/stack_colors.dart';
 import 'package:stackwallet/utilities/amount/amount_unit.dart';
 import 'package:stackwallet/utilities/assets.dart';
@@ -780,9 +779,6 @@ class _ExchangeFormState extends ConsumerState<ExchangeForm> {
       });
     }
 
-    // Instantiate the Tor service.
-    torService = TorService.sharedInstance;
-
     super.initState();
   }
 
@@ -1017,7 +1013,4 @@ class _ExchangeFormState extends ConsumerState<ExchangeForm> {
       ],
     );
   }
-
-  // TorService instance.
-  late TorService torService;
 }

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/services/exchange/exchange_data_loading_service.dart

@@ -162,18 +162,21 @@ class ExchangeDataLoadingService {
         // await _loadChangeNowEstimatedRatePairs();
          */
 
+        // Exchanges which support Tor just get treated normally.
+        final futures = [
+          loadMajesticBankCurrencies(),
+          loadTrocadorCurrencies(),
+        ];
+
         // If using Tor, don't load data for exchanges which don't support Tor.
         //
         // Add to this list when adding an exchange which doesn't supports Tor.
         if (!Prefs.instance.useTor) {
-          await _loadChangeNowCurrencies();
+          futures.add(_loadChangeNowCurrencies());
         }
 
-        // Exchanges which support Tor just get treated normally.
+        // wait for all loading futures to complete
-        await Future.wait([
+        await Future.wait(futures);
-          loadMajesticBankCurrencies(),
-          loadTrocadorCurrencies(),
-        ]);
 
         Logging.instance.log(
           "ExchangeDataLoadingService.loadAll finished in ${DateTime.now().difference(start).inSeconds} seconds",

scripts/android/build_all.sh

@@ -7,7 +7,6 @@ mkdir build
 (cd ../../crypto_plugins/flutter_liblelantus/scripts/android && ./build_all.sh ) &
 (cd ../../crypto_plugins/flutter_libepiccash/scripts/android && ./install_ndk.sh && ./build_all.sh )  &
 (cd ../../crypto_plugins/flutter_libmonero/scripts/android/ && ./build_all.sh  ) &
-(cd ../../crypto_plugins/tor/scripts/android && ./install_ndk.sh && ./build_all.sh )  &
 
 wait
 echo "Done building"

scripts/linux/build_all.sh

@@ -9,7 +9,6 @@ mkdir -p build
 (cd ../../crypto_plugins/flutter_liblelantus/scripts/linux && ./build_all.sh ) &
 (cd ../../crypto_plugins/flutter_libepiccash/scripts/linux && ./build_all.sh )  &
 (cd ../../crypto_plugins/flutter_libmonero/scripts/linux && ./build_monero_all.sh && ./build_sharedfile.sh ) &
-(cd ../../crypto_plugins/tor/scripts/linux && ./build_all.sh ) &
 
 wait
 echo "Done building"