Skip to content

Commit

Permalink
Fix for conflict of PRs #1060 and #1063 (#1065)
Browse files Browse the repository at this point in the history
  • Loading branch information
psolstice authored Aug 17, 2021
1 parent 91a1345 commit b2eba12
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/qt/transactiondesc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
CAmount nTxFee = nDebit - wtx.tx->GetValueOut();

if (wtx.tx->IsLelantusJoinSplit() && wtx.tx->vin.size() > 0) {
nTxFee = lelantus::ParseLelantusJoinSplit(wtx.tx->vin[0])->getFee();
nTxFee = lelantus::ParseLelantusJoinSplit(*wtx.tx)->getFee();
}
if (nTxFee > 0)
strHTML += "<b>" + tr("Transaction fee") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, -nTxFee) + "<br>";
Expand Down

0 comments on commit b2eba12

Please sign in to comment.