diff --git a/lib/pages/wallet_view/transaction_views/all_transactions_view.dart b/lib/pages/wallet_view/transaction_views/all_transactions_view.dart index f0247b429..9bd55a41c 100644 --- a/lib/pages/wallet_view/transaction_views/all_transactions_view.dart +++ b/lib/pages/wallet_view/transaction_views/all_transactions_view.dart @@ -852,6 +852,8 @@ class _DesktopTransactionCardRowState prefix = "-"; } else if (_transaction.type == TransactionType.incoming) { prefix = "+"; + } else { + prefix = ""; } } else { prefix = ""; diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_wallet_view.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_wallet_view.dart index adb3da885..512774df8 100644 --- a/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_wallet_view.dart +++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_wallet_view.dart @@ -7,6 +7,7 @@ import 'package:flutter_svg/svg.dart'; import 'package:stackwallet/pages/add_wallet_views/add_token_view/edit_wallet_tokens_view.dart'; import 'package:stackwallet/pages/token_view/my_tokens_view.dart'; import 'package:stackwallet/pages/wallet_view/sub_widgets/transactions_list.dart'; +import 'package:stackwallet/pages/wallet_view/transaction_views/all_transactions_view.dart'; import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart'; import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_summary.dart'; import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/my_wallet.dart'; @@ -285,7 +286,12 @@ class _DesktopWalletViewState extends ConsumerState { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "Tokens", + ref.watch(walletsChangeNotifierProvider.select( + (value) => value + .getManager(widget.walletId) + .hasTokenSupport)) + ? "Tokens" + : "Recent transactions", style: STextStyles.desktopTextExtraSmall(context) .copyWith( color: Theme.of(context) @@ -294,21 +300,36 @@ class _DesktopWalletViewState extends ConsumerState { ), ), CustomTextButton( - text: "Edit", - onTap: () async { - final result = await showDialog( - context: context, - builder: (context) => EditWalletTokensView( - walletId: widget.walletId, - isDesktopPopup: true, - ), - ); + text: ref.watch(walletsChangeNotifierProvider.select( + (value) => value + .getManager(widget.walletId) + .hasTokenSupport)) + ? "Edit" + : "See all", + onTap: ref.watch(walletsChangeNotifierProvider.select( + (value) => value + .getManager(widget.walletId) + .hasTokenSupport)) + ? () async { + final result = await showDialog( + context: context, + builder: (context) => EditWalletTokensView( + walletId: widget.walletId, + isDesktopPopup: true, + ), + ); - if (result == 42) { - // wallet tokens were edited so update ui - setState(() {}); - } - }, + if (result == 42) { + // wallet tokens were edited so update ui + setState(() {}); + } + } + : () { + Navigator.of(context).pushNamed( + AllTransactionsView.routeName, + arguments: widget.walletId, + ); + }, ), ], ),