From 74344168f2d6fd9ab832ad43ec5158d79f51ef22 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Mon, 3 Apr 2023 14:30:36 -0500 Subject: [PATCH 01/12] reduce MINIMUM_CONFIRMATIONS to 2 --- lib/services/coins/epiccash/epiccash_wallet.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/coins/epiccash/epiccash_wallet.dart b/lib/services/coins/epiccash/epiccash_wallet.dart index 4574d0019..643ab6505 100644 --- a/lib/services/coins/epiccash/epiccash_wallet.dart +++ b/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 = 2; const String GENESIS_HASH_MAINNET = ""; const String GENESIS_HASH_TESTNET = ""; From a6c2a30af49cef74b9f298a3249daadb20cc698f Mon Sep 17 00:00:00 2001 From: sneurlax Date: Mon, 3 Apr 2023 14:36:06 -0500 Subject: [PATCH 02/12] bump min confs to 3 --- lib/services/coins/epiccash/epiccash_wallet.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/coins/epiccash/epiccash_wallet.dart b/lib/services/coins/epiccash/epiccash_wallet.dart index 643ab6505..436bec9bb 100644 --- a/lib/services/coins/epiccash/epiccash_wallet.dart +++ b/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 = 2; +const int MINIMUM_CONFIRMATIONS = 3; const String GENESIS_HASH_MAINNET = ""; const String GENESIS_HASH_TESTNET = ""; From 76b349d2b18399a9c03b918a4ab481327f04b80a Mon Sep 17 00:00:00 2001 From: Diego Salazar Date: Mon, 3 Apr 2023 18:00:45 -0600 Subject: [PATCH 03/12] Bump version (v1.6.8, build 150) --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 3ae8c99b0..8fa356f0a 100644 --- a/pubspec.yaml +++ b/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+150 environment: sdk: ">=2.17.0 <3.0.0" From 53a4d8a4cd892ac60879e1773c9a625f3521098a Mon Sep 17 00:00:00 2001 From: julian Date: Mon, 3 Apr 2023 16:37:20 -0600 Subject: [PATCH 04/12] desktop show more button fix --- .../sub_widgets/desktop_wallet_features.dart | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart index 5b1c3edce..da5fd5745 100644 --- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart +++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart @@ -355,19 +355,21 @@ class _DesktopWalletFeaturesState extends ConsumerState { const SizedBox( width: 16, ), - SecondaryButton( - label: "More", - width: buttonWidth, - buttonHeight: ButtonHeight.l, - icon: SvgPicture.asset( - Assets.svg.bars, - height: 20, - width: 20, - color: - Theme.of(context).extension()!.buttonTextSecondary, + if (showMore) + SecondaryButton( + label: "More", + width: buttonWidth, + buttonHeight: ButtonHeight.l, + icon: SvgPicture.asset( + Assets.svg.bars, + height: 20, + width: 20, + color: Theme.of(context) + .extension()! + .buttonTextSecondary, + ), + onPressed: () => _onMorePressed(), ), - onPressed: () => _onMorePressed(), - ), ], ); } From b2031a6cc67ab82242a898abf376ed4e4abe96d1 Mon Sep 17 00:00:00 2001 From: julian-CStack Date: Wed, 5 Apr 2023 11:38:07 -0600 Subject: [PATCH 05/12] update libmonero ref --- crypto_plugins/flutter_libmonero | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index 5bcbe75b8..2038d9fb7 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit 5bcbe75b8712cd16f977b5acd2b364b29fdbf80c +Subproject commit 2038d9fb7c42d3a65cd02e330d08bb231cc7b769 From ef23738e480d7de871f004ac3fce6edf540bfe6c Mon Sep 17 00:00:00 2001 From: Diego Salazar Date: Wed, 5 Apr 2023 12:45:04 -0600 Subject: [PATCH 06/12] Bump version (v1.6.8, build 151) --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 8fa356f0a..26de24880 100644 --- a/pubspec.yaml +++ b/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.8+150 +version: 1.6.8+151 environment: sdk: ">=2.17.0 <3.0.0" From 1021270310b94694d86b59dca3ebfcd286e1e102 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Wed, 5 Apr 2023 16:28:03 -0600 Subject: [PATCH 07/12] copied stack icon into orange theme --- assets/svg/themed/orange/stack-icon1.svg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 assets/svg/themed/orange/stack-icon1.svg diff --git a/assets/svg/themed/orange/stack-icon1.svg b/assets/svg/themed/orange/stack-icon1.svg new file mode 100644 index 000000000..f316012d7 --- /dev/null +++ b/assets/svg/themed/orange/stack-icon1.svg @@ -0,0 +1,5 @@ + + + + + From 9ebc7287c6f6cfe177055bfd40e4f4975bd1574d Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Wed, 5 Apr 2023 16:28:48 -0600 Subject: [PATCH 08/12] fixed orange theme on start up instead of oled black --- lib/utilities/theme/color_theme.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/utilities/theme/color_theme.dart b/lib/utilities/theme/color_theme.dart index eb728355e..9741d7326 100644 --- a/lib/utilities/theme/color_theme.dart +++ b/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": From 848336bb071b89ea56ff199ea224d06e57113533 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Wed, 5 Apr 2023 16:45:33 -0600 Subject: [PATCH 09/12] fix send/receive icon colors for wallet nav bar --- lib/utilities/theme/forest_colors.dart | 2 +- lib/utilities/theme/orange_colors.dart | 2 +- .../components/icons/receive_nav_icon.dart | 4 ++-- .../wallet_navigation_bar/components/icons/send_nav_icon.dart | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/utilities/theme/forest_colors.dart b/lib/utilities/theme/forest_colors.dart index d6854d6e8..b3f46adc6 100644 --- a/lib/utilities/theme/forest_colors.dart +++ b/lib/utilities/theme/forest_colors.dart @@ -177,7 +177,7 @@ class ForestColors extends StackColorTheme { @override Color get bottomNavIconBack => const Color(0xFFA7C7CF); @override - Color get bottomNavIconIcon => const Color(0xFF227386); + Color get bottomNavIconIcon => const Color(0xFF22867A); @override Color get topNavIconPrimary => const Color(0xFF227386); diff --git a/lib/utilities/theme/orange_colors.dart b/lib/utilities/theme/orange_colors.dart index 48074c94f..b8c766bdb 100644 --- a/lib/utilities/theme/orange_colors.dart +++ b/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 diff --git a/lib/widgets/wallet_navigation_bar/components/icons/receive_nav_icon.dart b/lib/widgets/wallet_navigation_bar/components/icons/receive_nav_icon.dart index 54420543f..62c9aae63 100644 --- a/lib/widgets/wallet_navigation_bar/components/icons/receive_nav_icon.dart +++ b/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()! - .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()!.accentColorDark, + color: Theme.of(context).extension()!.bottomNavIconIcon, ), ), ); diff --git a/lib/widgets/wallet_navigation_bar/components/icons/send_nav_icon.dart b/lib/widgets/wallet_navigation_bar/components/icons/send_nav_icon.dart index 7b7da5799..cbffa3396 100644 --- a/lib/widgets/wallet_navigation_bar/components/icons/send_nav_icon.dart +++ b/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()! - .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()!.accentColorDark, + color: Theme.of(context).extension()!.bottomNavIconIcon, ), ), ); From 05eb6bd20da09edb04326a69b1e2aefe25bc1c65 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Wed, 5 Apr 2023 16:58:27 -0600 Subject: [PATCH 10/12] set text color for wallet nav --- lib/utilities/theme/orange_colors.dart | 2 +- .../components/wallet_navigation_bar_item.dart | 5 ++++- .../wallet_navigation_bar/wallet_navigation_bar.dart | 9 +++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/utilities/theme/orange_colors.dart b/lib/utilities/theme/orange_colors.dart index b8c766bdb..eeac65b89 100644 --- a/lib/utilities/theme/orange_colors.dart +++ b/lib/utilities/theme/orange_colors.dart @@ -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 diff --git a/lib/widgets/wallet_navigation_bar/components/wallet_navigation_bar_item.dart b/lib/widgets/wallet_navigation_bar/components/wallet_navigation_bar_item.dart index 8f1cade50..bbe54c0dc 100644 --- a/lib/widgets/wallet_navigation_bar/components/wallet_navigation_bar_item.dart +++ b/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()! + .bottomNavText), ), ], ), diff --git a/lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart b/lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart index d8f58450f..d8e311de6 100644 --- a/lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart +++ b/lib/widgets/wallet_navigation_bar/wallet_navigation_bar.dart @@ -187,8 +187,13 @@ class _WalletNavigationBarState extends ConsumerState { overrideText: AnimatedCrossFade( firstChild: Text( "More", - style: STextStyles.buttonSmall( - context), + style: + STextStyles.buttonSmall(context) + .copyWith( + color: Theme.of(context) + .extension< + StackColors>()! + .bottomNavText), ), secondChild: Text( "More", From 81009d00232fc09f90e095dc48e5d7a40ec5f997 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Wed, 5 Apr 2023 17:03:18 -0600 Subject: [PATCH 11/12] corrected nav text colors --- lib/utilities/theme/forest_colors.dart | 2 +- lib/utilities/theme/ocean_breeze_colors.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utilities/theme/forest_colors.dart b/lib/utilities/theme/forest_colors.dart index b3f46adc6..ff553f436 100644 --- a/lib/utilities/theme/forest_colors.dart +++ b/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 diff --git a/lib/utilities/theme/ocean_breeze_colors.dart b/lib/utilities/theme/ocean_breeze_colors.dart index 9390c55b5..1b528d6a1 100644 --- a/lib/utilities/theme/ocean_breeze_colors.dart +++ b/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 From 18f0bb2eb8538b0f77f2cfdd54f737b924c597a8 Mon Sep 17 00:00:00 2001 From: julian Date: Thu, 6 Apr 2023 12:37:19 -0600 Subject: [PATCH 12/12] submodule ref update --- crypto_plugins/flutter_libmonero | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index 2038d9fb7..d91086cce 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit 2038d9fb7c42d3a65cd02e330d08bb231cc7b769 +Subproject commit d91086cced36ac9c0497d2959eb92b4be9aaec47