Browse Source

[Qt] hide bump context menu action if tx already has been bumped

0.15
Jonas Schnelli 8 years ago
parent
commit
32325a3f58
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
  1. 2
      src/qt/transactionview.cpp
  2. 4
      src/qt/walletmodel.cpp
  3. 2
      src/qt/walletmodel.h

2
src/qt/transactionview.cpp

@ -379,7 +379,7 @@ void TransactionView::contextualMenu(const QPoint &point) @@ -379,7 +379,7 @@ void TransactionView::contextualMenu(const QPoint &point)
uint256 hash;
hash.SetHex(selection.at(0).data(TransactionTableModel::TxHashRole).toString().toStdString());
abandonAction->setEnabled(model->transactionCanBeAbandoned(hash));
bumpFeeAction->setEnabled(model->transactionSignalsRBF(hash));
bumpFeeAction->setEnabled(model->transactionCanBeBumped(hash));
if(index.isValid())
{

4
src/qt/walletmodel.cpp

@ -656,11 +656,11 @@ bool WalletModel::abandonTransaction(uint256 hash) const @@ -656,11 +656,11 @@ bool WalletModel::abandonTransaction(uint256 hash) const
return wallet->AbandonTransaction(hash);
}
bool WalletModel::transactionSignalsRBF(uint256 hash) const
bool WalletModel::transactionCanBeBumped(uint256 hash) const
{
LOCK2(cs_main, wallet->cs_wallet);
const CWalletTx *wtx = wallet->GetWalletTx(hash);
return wtx && SignalsOptInRBF(*wtx);
return wtx && SignalsOptInRBF(*wtx) && !wtx->mapValue.count("replaced_by_txid");
}
bool WalletModel::bumpFee(uint256 hash)

2
src/qt/walletmodel.h

@ -207,7 +207,7 @@ public: @@ -207,7 +207,7 @@ public:
bool transactionCanBeAbandoned(uint256 hash) const;
bool abandonTransaction(uint256 hash) const;
bool transactionSignalsRBF(uint256 hash) const;
bool transactionCanBeBumped(uint256 hash) const;
bool bumpFee(uint256 hash);
static bool isWalletEnabled();

Loading…
Cancel
Save