Merge branch 'ui-fixes' into add-ecash

lib/pages/send_view/send_view.dart

@@ -186,7 +186,10 @@ class _SendViewState extends ConsumerState<SendView> {
   late Amount _currentFee;
 
   void _setCurrentFee(String fee, bool shouldSetState) {
-    final value = Decimal.parse(fee).toAmount(fractionDigits: coin.decimals);
+    final value = fee.contains(",")
+        ? Decimal.parse(fee.replaceFirst(",", "."))
+            .toAmount(fractionDigits: coin.decimals)
+        : Decimal.parse(fee).toAmount(fractionDigits: coin.decimals);
 
     if (shouldSetState) {
       setState(() => _currentFee = value);

lib/pages/stack_privacy_calls.dart

@@ -8,10 +8,12 @@ import 'package:stackwallet/pages/pinpad_views/create_pin_view.dart';
 import 'package:stackwallet/pages_desktop_specific/password/create_password_view.dart';
 import 'package:stackwallet/providers/global/prefs_provider.dart';
 import 'package:stackwallet/providers/global/price_provider.dart';
+import 'package:stackwallet/providers/ui/color_theme_provider.dart';
 import 'package:stackwallet/services/exchange/exchange_data_loading_service.dart';
 import 'package:stackwallet/utilities/assets.dart';
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
+import 'package:stackwallet/utilities/theme/color_theme.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
 import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/conditional_parent.dart';
@@ -308,6 +310,10 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
 
   @override
   Widget build(BuildContext context) {
+    final bool lightChan =
+        ref.read(colorThemeProvider.state).state.themeType == ThemeType.chan;
+    final bool darkChan = ref.read(colorThemeProvider.state).state.themeType ==
+        ThemeType.darkChans;
     return Row(
       children: [
         Expanded(
@@ -344,19 +350,15 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
                   Column(
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      // if (isDesktop)
+                      (lightChan || darkChan)
-                      //   const SizedBox(
+                          ? Image(
-                      //     height: 10,
+                              image: AssetImage(Assets.png.chanEasy),
-                      //   ),
+                            )
-                      SvgPicture.asset(
+                          : SvgPicture.asset(
                               Assets.svg.personaEasy(context),
                               width: 140,
                               height: 140,
                             ),
-                      // if (isDesktop)
-                      //   const SizedBox(
-                      //     height: 12,
-                      //   ),
                       Center(
                         child: Text(
                           "Easy Crypto",
@@ -453,11 +455,20 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
                         const SizedBox(
                           height: 10,
                         ),
-                      SvgPicture.asset(
+                      (lightChan || darkChan)
+                          ? Image(
+                              image: AssetImage(Assets.png.chanIncognito),
+                            )
+                          : SvgPicture.asset(
                               Assets.svg.personaIncognito(context),
                               width: 140,
                               height: 140,
                             ),
+                      // SvgPicture.asset(
+                      //   Assets.svg.personaIncognito(context),
+                      //   width: 140,
+                      //   height: 140,
+                      // ),
                       if (isDesktop)
                         const SizedBox(
                           height: 12,

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

@@ -310,7 +310,12 @@ class _DesktopWalletFeaturesState extends ConsumerState<DesktopWalletFeatures> {
     );
 
     final showMore = manager.hasPaynymSupport ||
-        manager.hasCoinControlSupport ||
+        (manager.hasCoinControlSupport &&
+            ref.watch(
+              prefsChangeNotifierProvider.select(
+                (value) => value.enableCoinControl,
+              ),
+            )) ||
         manager.coin == Coin.firo ||
         manager.coin == Coin.firoTestNet ||
         manager.hasWhirlpoolSupport;

lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart

@@ -6,10 +6,12 @@ import 'package:flutter_svg/svg.dart';
 import 'package:stackwallet/db/hive/db.dart';
 import 'package:stackwallet/providers/global/prefs_provider.dart';
 import 'package:stackwallet/providers/global/price_provider.dart';
+import 'package:stackwallet/providers/ui/color_theme_provider.dart';
 import 'package:stackwallet/services/exchange/exchange_data_loading_service.dart';
 import 'package:stackwallet/utilities/assets.dart';
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
+import 'package:stackwallet/utilities/theme/color_theme.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
 import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/desktop/desktop_dialog.dart';
@@ -224,6 +226,10 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
 
   @override
   Widget build(BuildContext context) {
+    final bool lightChan =
+        ref.read(colorThemeProvider.state).state.themeType == ThemeType.chan;
+    final bool darkChan = ref.read(colorThemeProvider.state).state.themeType ==
+        ThemeType.darkChans;
     return Row(
       children: [
         Expanded(
@@ -265,7 +271,16 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
                         const SizedBox(
                           height: 10,
                         ),
-                      SvgPicture.asset(
+                      //
+                      (lightChan || darkChan)
+                          ? Image(
+                              image: AssetImage(
+                                Assets.png.chanEasy,
+                              ),
+                              width: 120,
+                              height: 120,
+                            )
+                          : SvgPicture.asset(
                               Assets.svg.personaEasy(context),
                               width: 120,
                               height: 120,
@@ -371,11 +386,22 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
                         const SizedBox(
                           height: 10,
                         ),
-                      SvgPicture.asset(
+                      (lightChan || darkChan)
+                          ? Image(
+                              image: AssetImage(Assets.png.chanIncognito),
+                              width: 120,
+                              height: 120,
+                            )
+                          : SvgPicture.asset(
                               Assets.svg.personaIncognito(context),
                               width: 120,
                               height: 120,
                             ),
+                      // SvgPicture.asset(
+                      //   Assets.svg.personaIncognito(context),
+                      //   width: 120,
+                      //   height: 120,
+                      // ),
                       if (isDesktop)
                         const SizedBox(
                           height: 12,

lib/services/coins/bitcoincash/bitcoincash_wallet.dart

@@ -2413,7 +2413,15 @@ class BitcoinCashWallet extends CoinServiceAPI
     // don't care about sorting if using all utxos
     if (!coinControl) {
       // sort spendable by age (oldest first)
-      spendableOutputs.sort((a, b) => b.blockTime!.compareTo(a.blockTime!));
+      spendableOutputs.sort((a, b) {
+        if (a.blockTime != null && b.blockTime != null) {
+          return b.blockTime!.compareTo(a.blockTime!);
+        } else if (a.blockTime != null) {
+          return -1;
+        } else {
+          return 1;
+        }
+      });
     }
 
     Logging.instance.log("spendableOutputs.length: ${spendableOutputs.length}",

lib/services/coins/wownero/wownero_wallet.dart

@@ -50,7 +50,7 @@ import 'package:stackwallet/utilities/prefs.dart';
 import 'package:stackwallet/utilities/stack_file_system.dart';
 import 'package:tuple/tuple.dart';
 
-const int MINIMUM_CONFIRMATIONS = 10;
+const int MINIMUM_CONFIRMATIONS = 4;
 
 class WowneroWallet extends CoinServiceAPI with WalletCache, WalletDB {
   WowneroWallet({

lib/services/locale_service.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+
 import 'package:devicelocale/devicelocale.dart';
 import 'package:flutter/material.dart';
 
@@ -8,7 +9,9 @@ class LocaleService extends ChangeNotifier {
   String get locale => _locale;
 
   Future<void> loadLocale({bool notify = true}) async {
-    _locale =Platform.isWindows ? "en_US" :  await Devicelocale.currentLocale ?? "en_US";
+    _locale = Platform.isWindows
+        ? "en_US"
+        : await Devicelocale.currentLocale ?? "en_US";
     if (notify) {
       notifyListeners();
     }

lib/utilities/assets.dart

@@ -410,6 +410,9 @@ class _PNG {
 
   String get glasses => "assets/images/glasses.png";
   String get glassesHidden => "assets/images/glasses-hidden.png";
+
+  String get chanEasy => "assets/images/chan-persona-easy.png";
+  String get chanIncognito => "assets/images/chan-persona-incognito.png";
 }
 
 class _ANIMATIONS {

pubspec.yaml

@@ -211,6 +211,8 @@ flutter:
   #  - images/a_dot_burr.jpeg
   #  - images/a_dot_ham.jpeg
   assets:
+    - assets/images/chan-persona-incognito.png
+    - assets/images/chan-persona-easy.png
     - assets/images/splash.png
     - assets/icon/icon.png
     - google_fonts/