diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-09 10:47:56 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-09 10:48:27 +0100 |
| commit | 00b4b8d1c47a2189d085140cfb45be492de16db5 (patch) | |
| tree | 7c4f7fe4962ddcb6afca8757ed83ef1b5198cb5e /src/qt | |
| parent | 0800092fc252dd85ea726c50c29086e62e179b5e (diff) | |
| parent | a3c3ddbd7ba68b9a9871b8574e05cc146a69f811 (diff) | |
Merge pull request #7154
a3c3ddb [Qt] add InMempool() info to transaction details (Jonas Schnelli)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/transactiondesc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 801c6c62d2..920ff06351 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -35,9 +35,11 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx) { int nDepth = wtx.GetDepthInMainChain(); if (nDepth < 0) - return tr("conflicted"); + return tr("conflicted with a transaction with %1 confirmations").arg(-nDepth); else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0) return tr("%1/offline").arg(nDepth); + else if (nDepth == 0) + return tr("0/unconfirmed, %1").arg((wtx.InMempool() ? tr("in memory pool") : tr("not in memory pool"))); else if (nDepth < 6) return tr("%1/unconfirmed").arg(nDepth); else |