sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin-core/gui#284: refactor: Simplify SendCoinsDialog::updateCoinControlState

Browse Source 
5f438d66c1fbc0e524d12fef233f2ed2952e6f17 refactor, qt: Simplify SendCoinsDialog::updateCoinControlState (João Barbosa)

Pull request description:

  This PR doesn't change behaviour, removes the coin control argument from `updateCoinControlState` since it's a class member.

ACKs for top commit:
  hebasto:
    ACK 5f438d66c1fbc0e524d12fef233f2ed2952e6f17, I have reviewed the code and it looks OK, I agree it can be merged.
  jonatack:
    Code review ACK 5f438d66c1fbc0e524d12fef233f2ed2952e6f17
  kristapsk:
    utACK 5f438d66c1fbc0e524d12fef233f2ed2952e6f17. Code looks correct.

Tree-SHA512: 14abaa3d561f8c8854fed989b6aca886dcca42135880bac76070043f61c0042ec8967f2b83e50bbbb82050ef0f074209e97fa300cb4dc51ee182316e0846506d
This commit is contained in:
Hennadii Stepanov 2021-04-25 17:00:58 +03:00 committed by Konstantin Akimov
parent b2d889380c
commit a63f9c31cc
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qt/sendcoinsdialog.cpp
View File

@ -316,7 +316,7 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
m_current_transaction = std::make_unique<WalletModelTransaction>(recipients);
WalletModel::SendCoinsReturn prepareStatus;
updateCoinControlState(*m_coin_control);
updateCoinControlState();
prepareStatus = model->prepareTransaction(*m_current_transaction, *m_coin_control);
@ -829,18 +829,18 @@ void SendCoinsDialog::updateFeeMinimizedLabel()
}
}
void SendCoinsDialog::updateCoinControlState(CCoinControl& ctrl)
void SendCoinsDialog::updateCoinControlState()
{
if (ui->radioCustomFee->isChecked()) {
ctrl.m_feerate = CFeeRate(ui->customFee->value());
m_coin_control->m_feerate = CFeeRate(ui->customFee->value());
} else {
ctrl.m_feerate.reset();
m_coin_control->m_feerate.reset();
}
// Avoid using global defaults when sending money from the GUI
// Either custom fee will be used or if not selected, the confirmation target from dropdown box
ctrl.m_confirm_target = getConfTargetForIndex(ui->confTargetSelector->currentIndex());
m_coin_control->m_confirm_target = getConfTargetForIndex(ui->confTargetSelector->currentIndex());
// Include watch-only for wallets without private key
ctrl.fAllowWatchOnly = model->wallet().privateKeysDisabled();
m_coin_control->fAllowWatchOnly = model->wallet().privateKeysDisabled();
}
void SendCoinsDialog::updateNumberOfBlocks(int count, const QDateTime& blockDate, const QString& blockHash, double nVerificationProgress, bool header, SynchronizationState sync_state) {
@ -853,7 +853,7 @@ void SendCoinsDialog::updateSmartFeeLabel()
{
if(!model || !model->getOptionsModel())
return;
updateCoinControlState(*m_coin_control);
updateCoinControlState();
m_coin_control->m_feerate.reset(); // Explicitly use only fee estimation rate for smart fee labels
int returned_target;
FeeReason reason;
@ -1013,7 +1013,7 @@ void SendCoinsDialog::coinControlUpdateLabels()
if (!model || !model->getOptionsModel())
return;
updateCoinControlState(*m_coin_control);
updateCoinControlState();
// set pay amounts
CoinControlDialog::payAmounts.clear();

3
src/qt/sendcoinsdialog.h
View File

@ -79,8 +79,7 @@ private:
// Format confirmation message
bool PrepareSendText(QString& question_string, QString& informative_text, QString& detailed_text);
void updateFeeMinimizedLabel();
// Update the passed in CCoinControl with state from the GUI
void updateCoinControlState(CCoinControl& ctrl);
void updateCoinControlState();
private Q_SLOTS:
void sendButtonClicked(bool checked);