From d78a3e510479a69bd7c4ba22690dda04076fc31b Mon Sep 17 00:00:00 2001 From: julian Date: Tue, 14 Nov 2023 17:21:55 -0600 Subject: [PATCH] txn2 flag in ui branch --- lib/pages/wallet_view/wallet_view.dart | 7 +++++-- .../my_stack_view/wallet_view/desktop_wallet_view.dart | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/pages/wallet_view/wallet_view.dart b/lib/pages/wallet_view/wallet_view.dart index 13f816560..ae0bead7e 100644 --- a/lib/pages/wallet_view/wallet_view.dart +++ b/lib/pages/wallet_view/wallet_view.dart @@ -850,8 +850,11 @@ class _WalletViewState extends ConsumerState { text: "See all", onTap: () { Navigator.of(context).pushNamed( - coin == Coin.bitcoincash || - coin == Coin.bitcoincashTestnet + ref + .read(pWallets) + .getWallet(widget.walletId) + .isarTransactionVersion == + 2 ? AllTransactionsV2View.routeName : AllTransactionsView.routeName, arguments: walletId, 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 75afa80e2..dae79310e 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 @@ -466,9 +466,7 @@ class _DesktopWalletViewState extends ConsumerState { } } else { await Navigator.of(context).pushNamed( - walletInfo.coin == Coin.bitcoincash || - walletInfo.coin == - Coin.bitcoincashTestnet + wallet.isarTransactionVersion == 2 ? AllTransactionsV2View.routeName : AllTransactionsView.routeName, arguments: widget.walletId,