Merge remote-tracking branch 'origin/staging' into add-ethereum

# Conflicts:
#	lib/utilities/theme/forest_colors.dart

assets/svg/themed/orange/stack-icon1.svg

@@ -0,0 +1,5 @@
+<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M41.3715 9.57675C37.2965 7.22564 32.2041 10.1695 32.2041 14.8717C32.2041 19.5739 34.4762 23.6489 38.2004 26.163L53.9717 35.3057L54.0112 35.2908L69.9948 26.0543L41.3715 9.57675Z" fill="#B3B3B3"/>
+<path d="M38.2014 26.163C34.4771 23.6489 32.205 19.4159 32.205 14.8717C32.205 12.6342 33.3757 10.7671 35.0402 9.7101C34.9612 9.75455 35.1192 9.66564 35.0402 9.7101L10.0917 23.7279L6.08593 26.1481L3.35449 27.7188C5.07337 26.8446 7.22692 26.7754 9.14831 27.8917L16.0189 31.8037L22.0399 35.2859L38.0236 44.5076L53.9677 35.2958L38.1964 26.1531L38.2014 26.163Z" fill="#666666"/>
+<path d="M70 44.5187L38.0278 62.9917L31.992 59.5095L31.9673 59.4848L6.06054 44.5187C4.28733 43.3629 2.84505 41.7872 1.82755 40.014C0.642111 37.9691 0 35.618 0 33.1829C0 30.9899 1.10147 29.1771 2.70181 28.1004C2.91914 27.967 3.13153 27.8435 3.35874 27.725C5.07762 26.8507 7.23116 26.7816 9.15256 27.8979L15.9836 31.8394L22.0047 35.3068L22.0442 35.292L38.0278 44.5137L53.9719 35.3019L70 44.5137V44.5187Z" fill="#232323"/>
+</svg>

crypto_plugins/flutter_libmonero

@@ -1 +1 @@
-Subproject commit 5bcbe75b8712cd16f977b5acd2b364b29fdbf80c
+Subproject commit d91086cced36ac9c0497d2959eb92b4be9aaec47

lib/services/coins/epiccash/epiccash_wallet.dart

@@ -40,7 +40,7 @@ import 'package:stackwallet/utilities/test_epic_box_connection.dart';
 import 'package:tuple/tuple.dart';
 import 'package:websocket_universal/websocket_universal.dart';
 
-const int MINIMUM_CONFIRMATIONS = 10;
+const int MINIMUM_CONFIRMATIONS = 3;
 
 const String GENESIS_HASH_MAINNET = "";
 const String GENESIS_HASH_TESTNET = "";

lib/utilities/theme/color_theme.dart

@@ -39,7 +39,7 @@ extension ThemeTypeExt on ThemeType {
       case "oledBlack":
         return ThemeType.oledBlack;
       case "orange":
-        return ThemeType.oledBlack;
+        return ThemeType.orange;
       case "fruitSorbet":
         return ThemeType.fruitSorbet;
       case "forest":

lib/utilities/theme/forest_colors.dart

@@ -107,7 +107,7 @@ class ForestColors extends StackColorTheme {
   @override
   Color get numpadTextDefault => const Color(0xFFFFFFFF);
   @override
-  Color get bottomNavText => const Color(0xFF232323);
+  Color get bottomNavText => const Color(0xFF22867A);
   @override
   Color get customTextButtonEnabledText => infoItemIcons;
   @override
@@ -177,7 +177,7 @@ class ForestColors extends StackColorTheme {
   @override
   Color get bottomNavIconBack => const Color(0xFFA7C7CF);
   @override
-  Color get bottomNavIconIcon => accentColorDark; //const Color(0xFF227386);
+  Color get bottomNavIconIcon => const Color(0xFF22867A);
 
   @override
   Color get topNavIconPrimary => accentColorDark; //const Color(0xFF227386);

lib/utilities/theme/ocean_breeze_colors.dart

@@ -114,7 +114,7 @@ class OceanBreezeColors extends StackColorTheme {
   @override
   Color get numpadTextDefault => const Color(0xFFFFFFFF);
   @override
-  Color get bottomNavText => const Color(0xFF232323);
+  Color get bottomNavText => const Color(0xFF227386);
   @override
   Color get customTextButtonEnabledText => buttonTextBorderless;
   @override

lib/utilities/theme/orange_colors.dart

@@ -83,7 +83,7 @@ class OrangeColors extends StackColorTheme {
   @override
   Color get numpadBackDefault => const Color(0xFFF36B43);
   @override
-  Color get bottomNavBack => const Color(0xFFFFFFFF);
+  Color get bottomNavBack => const Color(0xFFF36B43);
 
   // button text/element
   @override
@@ -107,7 +107,7 @@ class OrangeColors extends StackColorTheme {
   @override
   Color get numpadTextDefault => const Color(0xFFFFFFFF);
   @override
-  Color get bottomNavText => const Color(0xFF232323);
+  Color get bottomNavText => const Color(0xFFFFFFFF);
   @override
   Color get customTextButtonEnabledText => buttonTextBorderless;
   @override

lib/widgets/wallet_navigation_bar/components/icons/receive_nav_icon.dart

@@ -12,7 +12,7 @@ class ReceiveNavIcon extends StatelessWidget {
       decoration: BoxDecoration(
         color: Theme.of(context)
             .extension<StackColors>()!
-            .accentColorDark
+            .bottomNavIconIcon
             .withOpacity(0.4),
         borderRadius: BorderRadius.circular(
           24,
@@ -24,7 +24,7 @@ class ReceiveNavIcon extends StatelessWidget {
           Assets.svg.arrowDownLeft,
           width: 12,
           height: 12,
-          color: Theme.of(context).extension<StackColors>()!.accentColorDark,
+          color: Theme.of(context).extension<StackColors>()!.bottomNavIconIcon,
         ),
       ),
     );

lib/widgets/wallet_navigation_bar/components/icons/send_nav_icon.dart

@@ -12,7 +12,7 @@ class SendNavIcon extends StatelessWidget {
       decoration: BoxDecoration(
         color: Theme.of(context)
             .extension<StackColors>()!
-            .accentColorDark
+            .bottomNavIconIcon
             .withOpacity(0.4),
         borderRadius: BorderRadius.circular(
           24,
@@ -24,7 +24,7 @@ class SendNavIcon extends StatelessWidget {
           Assets.svg.arrowUpRight,
           width: 12,
           height: 12,
-          color: Theme.of(context).extension<StackColors>()!.accentColorDark,
+          color: Theme.of(context).extension<StackColors>()!.bottomNavIconIcon,
         ),
       ),
     );

lib/widgets/wallet_navigation_bar/components/wallet_navigation_bar_item.dart

@@ -67,7 +67,10 @@ class WalletNavigationBarItem extends ConsumerWidget {
                   data.overrideText ??
                       Text(
                         data.label ?? "",
-                        style: STextStyles.buttonSmall(context),
+                        style: STextStyles.buttonSmall(context).copyWith(
+                            color: Theme.of(context)
+                                .extension<StackColors>()!
+                                .bottomNavText),
                       ),
                 ],
               ),

lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart

@@ -187,8 +187,13 @@ class _WalletNavigationBarState extends ConsumerState<WalletNavigationBar> {
                                         overrideText: AnimatedCrossFade(
                                           firstChild: Text(
                                             "More",
-                                            style: STextStyles.buttonSmall(
+                                            style:
-                                                context),
+                                                STextStyles.buttonSmall(context)
+                                                    .copyWith(
+                                                        color: Theme.of(context)
+                                                            .extension<
+                                                                StackColors>()!
+                                                            .bottomNavText),
                                           ),
                                           secondChild: Text(
                                             "More",

pubspec.yaml

@@ -11,7 +11,7 @@ description: Stack Wallet
 # 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.6.7+149
+version: 1.6.8+151
 
 environment:
   sdk: ">=2.17.0 <3.0.0"