From 86d3258910f3d138d3859159d344a6a888258165 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Wed, 26 Jul 2023 13:18:18 -0600 Subject: [PATCH] Monkey help message --- crypto_plugins/flutter_libmonero | 2 +- lib/pages/monkey/monkey_view.dart | 33 +++--------------- lib/pages/wallet_view/wallet_view.dart | 46 +++++++++++--------------- 3 files changed, 25 insertions(+), 56 deletions(-) diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index e48952185..407425c9f 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit e48952185556a10f182184fd572bcb04365f5831 +Subproject commit 407425c9fcf7a30c81f1345246c7225bc18b5cd5 diff --git a/lib/pages/monkey/monkey_view.dart b/lib/pages/monkey/monkey_view.dart index b631b0703..075191235 100644 --- a/lib/pages/monkey/monkey_view.dart +++ b/lib/pages/monkey/monkey_view.dart @@ -22,6 +22,7 @@ import 'package:stackwallet/widgets/conditional_parent.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/desktop/secondary_button.dart'; +import 'package:stackwallet/widgets/stack_dialog.dart'; class MonkeyView extends ConsumerStatefulWidget { const MonkeyView({ @@ -220,34 +221,10 @@ class _MonkeyViewState extends ConsumerState { useSafeArea: false, barrierDismissible: true, builder: (context) { - return Dialog( - child: Material( - borderRadius: BorderRadius.circular( - 20, - ), - child: Container( - height: 200, - decoration: BoxDecoration( - color: Theme.of(context) - .extension()! - .popupBG, - borderRadius: BorderRadius.circular( - 20, - ), - ), - child: Column( - children: [ - Center( - child: Text( - "Help", - style: STextStyles.pageTitleH2( - context), - ), - ) - ], - ), - ), - ), + return const StackOkDialog( + title: "About MonKeys", + message: + "A MonKey is a visual representation of your Banano address.", ); }); }), diff --git a/lib/pages/wallet_view/wallet_view.dart b/lib/pages/wallet_view/wallet_view.dart index 0dcfe18dc..b2d5de8e6 100644 --- a/lib/pages/wallet_view/wallet_view.dart +++ b/lib/pages/wallet_view/wallet_view.dart @@ -925,33 +925,25 @@ class _WalletViewState extends ConsumerState { ); }, ), - if (ref.watch( - walletsChangeNotifierProvider.select( - (value) => value - .getManager(widget.walletId) - .hasCoinControlSupport, - ), - ) && - ref.watch( - prefsChangeNotifierProvider.select( - (value) => value.enableCoinControl, - ), - )) - WalletNavigationBarItemData( - icon: SvgPicture.asset(Assets.svg.monkey, - height: 20, - width: 20, - color: Theme.of(context).extension()!.bottomNavIconIcon,), - label: "MonKey", - onTap: () { - Navigator.of(context).pushNamed( - MonkeyView.routeName, - arguments: Tuple2( - widget.walletId, - widget.managerProvider, - ), - ); - }), + WalletNavigationBarItemData( + icon: SvgPicture.asset( + Assets.svg.monkey, + height: 20, + width: 20, + color: Theme.of(context) + .extension()! + .bottomNavIconIcon, + ), + label: "MonKey", + onTap: () { + Navigator.of(context).pushNamed( + MonkeyView.routeName, + arguments: Tuple2( + widget.walletId, + widget.managerProvider, + ), + ); + }), if (ref.watch( walletsChangeNotifierProvider.select( (value) => value