From 367daad3c57b1a7fa45350ac6ba40d511315809d Mon Sep 17 00:00:00 2001 From: julian <julian@cypherstack.com> Date: Wed, 17 Jul 2024 10:17:21 -0600 Subject: [PATCH] ui bugfixes --- .../addresses/address_details_view.dart | 19 ++++++++++++------- .../sub_widgets/desktop_receive.dart | 4 +++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/pages/receive_view/addresses/address_details_view.dart b/lib/pages/receive_view/addresses/address_details_view.dart index eb102bfe7..2b0e09187 100644 --- a/lib/pages/receive_view/addresses/address_details_view.dart +++ b/lib/pages/receive_view/addresses/address_details_view.dart @@ -22,6 +22,7 @@ import '../../../utilities/address_utils.dart'; import '../../../utilities/text_styles.dart'; import '../../../utilities/util.dart'; import '../../../wallets/isar/providers/wallet_info_provider.dart'; +import '../../../wallets/wallet/intermediate/bip39_hd_wallet.dart'; import '../../../widgets/address_private_key.dart'; import '../../../widgets/background.dart'; import '../../../widgets/conditional_parent.dart'; @@ -371,13 +372,17 @@ class _AddressDetailsViewState extends ConsumerState<AddressDetailsView> { detail: address.subType.prettyName, button: Container(), ), - const _Div( - height: 12, - ), - AddressPrivateKey( - walletId: widget.walletId, - address: address, - ), + if (ref.watch(pWallets).getWallet(widget.walletId) + is Bip39HDWallet) + const _Div( + height: 12, + ), + if (ref.watch(pWallets).getWallet(widget.walletId) + is Bip39HDWallet) + AddressPrivateKey( + walletId: widget.walletId, + address: address, + ), if (!isDesktop) const SizedBox( height: 20, diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart index 09de81b26..a792641ba 100644 --- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart +++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_receive.dart @@ -182,7 +182,9 @@ class _DesktopReceiveState extends ConsumerState<DesktopReceive> { final wallet = ref.read(pWallets).getWallet(walletId); supportsSpark = ref.read(pWallets).getWallet(walletId) is SparkInterface; showMultiType = supportsSpark || - ref.read(pWallets).getWallet(walletId) is MultiAddressInterface; + (wallet is! BCashInterface && + wallet is Bip39HDWallet && + wallet.supportedAddressTypes.length > 1); _walletAddressTypes.add(wallet.info.mainAddressType);