diff --git a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart index 7cd3782e1..1affff3b8 100644 --- a/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart +++ b/lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_send.dart @@ -142,15 +142,14 @@ class _DesktopSendState extends ConsumerState { if ((coin == Coin.firo || coin == Coin.firoTestNet)) { if (ref.read(publicPrivateBalanceStateProvider.state).state == "Private") { - availableBalance = wallet.info.cachedBalance.spendable; + availableBalance = wallet.info.cachedBalanceSecondary.spendable; // (manager.wallet as FiroWallet).availablePrivateBalance(); } else { - availableBalance = wallet.info.cachedBalanceSecondary.spendable; + availableBalance = wallet.info.cachedBalance.spendable; // (manager.wallet as FiroWallet).availablePublicBalance(); } } else { availableBalance = wallet.info.cachedBalance.spendable; - ; } final coinControlEnabled = @@ -821,7 +820,7 @@ class _DesktopSendState extends ConsumerState { const SizedBox( height: 4, ), - if (coin == Coin.firo) + if (coin == Coin.firo || coin == Coin.firoTestNet) Text( "Send from", style: STextStyles.desktopTextExtraSmall(context).copyWith( @@ -831,11 +830,11 @@ class _DesktopSendState extends ConsumerState { ), textAlign: TextAlign.left, ), - if (coin == Coin.firo) + if (coin == Coin.firo || coin == Coin.firoTestNet) const SizedBox( height: 10, ), - if (coin == Coin.firo) + if (coin == Coin.firo || coin == Coin.firoTestNet) DropdownButtonHideUnderline( child: DropdownButton2( isExpanded: true, @@ -917,7 +916,7 @@ class _DesktopSendState extends ConsumerState { ), ), ), - if (coin == Coin.firo) + if (coin == Coin.firo || coin == Coin.firoTestNet) const SizedBox( height: 20, ), @@ -1486,7 +1485,7 @@ class _DesktopSendState extends ConsumerState { .read( publicPrivateBalanceStateProvider .state) - .state != + .state == "Private") { throw UnimplementedError("FIXME"); // TODO: [prio=high] firo fee fix diff --git a/lib/wallets/wallet/wallet_mixin_interfaces/electrumx_interface.dart b/lib/wallets/wallet/wallet_mixin_interfaces/electrumx_interface.dart index 7146454f1..cd7e590ec 100644 --- a/lib/wallets/wallet/wallet_mixin_interfaces/electrumx_interface.dart +++ b/lib/wallets/wallet/wallet_mixin_interfaces/electrumx_interface.dart @@ -625,9 +625,19 @@ mixin ElectrumXInterface on Bip39HDWallet { // TODO: use coinlib final txb = bitcoindart.TransactionBuilder( - network: bitcoindart.testnet, + network: bitcoindart.NetworkType( + messagePrefix: cryptoCurrency.networkParams.messagePrefix, + bech32: cryptoCurrency.networkParams.bech32Hrp, + bip32: bitcoindart.Bip32Type( + public: cryptoCurrency.networkParams.pubHDPrefix, + private: cryptoCurrency.networkParams.privHDPrefix, + ), + pubKeyHash: cryptoCurrency.networkParams.p2pkhPrefix, + scriptHash: cryptoCurrency.networkParams.p2shPrefix, + wif: cryptoCurrency.networkParams.wifPrefix, + ), ); - txb.setVersion(1); + txb.setVersion(1); // TODO possibly override this for certain coins? // Add transaction inputs for (var i = 0; i < utxoSigningData.length; i++) {