From 6333166320cdb9b6aa54d02ebbbf904e1f90d26f Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Thu, 11 Apr 2019 07:34:44 -0400 Subject: [PATCH] QT: get fee directly from elementsmode transactions --- src/qt/bitcoinunits.cpp | 4 ++-- src/qt/transactiondesc.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index f96428551e..e9af8bbb5d 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -54,8 +54,8 @@ QString BitcoinUnits::shortName(int unit) { switch(unit) { - case uBTC: return QString::fromUtf8("bits"); - case SAT: return QString("sat"); + case uBTC: return QString::fromUtf8("L-bits"); + case SAT: return QString("L-sat"); default: return longName(unit); } } diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 00ba85dcbd..99fa20f66b 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -213,7 +213,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall strHTML += "" + tr("Total credit") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, nValue) + "
"; } - CAmount nTxFee = nDebit - valueFor(wtx.tx->GetValueOutMap(), ::policyAsset); + CAmount nTxFee = GetFeeMap(*wtx.tx)[::policyAsset]; if (nTxFee > 0) strHTML += "" + tr("Transaction fee") + ": " + BitcoinUnits::formatHtmlWithUnit(unit, -nTxFee) + "
"; }