File tree Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Original file line number Diff line number Diff line change 2323#include < key_io.h>
2424#include < node/ui_interface.h>
2525#include < policy/fees.h>
26- #include < txmempool.h>
2726#include < validation.h>
2827#include < wallet/coincontrol.h>
2928#include < wallet/fees.h>
@@ -795,7 +794,7 @@ void SendCoinsDialog::useAvailableBalance(SendCoinsEntry* entry)
795794 m_coin_control->fAllowWatchOnly = model->wallet ().privateKeysDisabled () && !model->wallet ().hasExternalSigner ();
796795
797796 // Calculate available amount to send.
798- CAmount amount = model->wallet (). getAvailableBalance (* m_coin_control);
797+ CAmount amount = model->getAvailableBalance (m_coin_control. get () );
799798 for (int i = 0 ; i < ui->entries ->count (); ++i) {
800799 SendCoinsEntry* e = qobject_cast<SendCoinsEntry*>(ui->entries ->itemAt (i)->widget ());
801800 if (e && !e->isHidden () && e != entry) {
Original file line number Diff line number Diff line change @@ -203,7 +203,9 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
203203 return DuplicateAddress;
204204 }
205205
206- CAmount nBalance = m_wallet->getAvailableBalance (coinControl);
206+ // If no coin was manually selected, use the cached balance
207+ // Future: can merge this call with 'createTransaction'.
208+ CAmount nBalance = getAvailableBalance (&coinControl);
207209
208210 if (total > nBalance)
209211 {
@@ -608,3 +610,7 @@ uint256 WalletModel::getLastBlockProcessed() const
608610{
609611 return m_client_model ? m_client_model->getBestBlockHash () : uint256{};
610612}
613+
614+ CAmount WalletModel::getAvailableBalance (const CCoinControl* control) {
615+ return control && control->HasSelected () ? wallet ().getAvailableBalance (*control) : getCachedBalance ().balance ;
616+ }
Original file line number Diff line number Diff line change @@ -160,6 +160,10 @@ class WalletModel : public QObject
160160 // Retrieve the cached wallet balance
161161 interfaces::WalletBalances getCachedBalance () const ;
162162
163+ // If coin control has selected outputs, searches the total amount inside the wallet.
164+ // Otherwise, uses the wallet's cached available balance.
165+ CAmount getAvailableBalance (const wallet::CCoinControl* control);
166+
163167private:
164168 std::unique_ptr<interfaces::Wallet> m_wallet;
165169 std::unique_ptr<interfaces::Handler> m_handler_unload;
You can’t perform that action at this time.
0 commit comments