Skip to content

Refactor TransactionDesc::FormatTxStatus and TransactionStatus #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 15, 2022
Merged

Refactor TransactionDesc::FormatTxStatus and TransactionStatus #552

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1bc143
qt, refactor: remove redundant scope in `TransactionDesc::FormatTxSta…
w0xlt Feb 18, 2022
045f8d0
scripted-diff: rename nDepth -> depth
w0xlt Feb 21, 2022
ad6aded
qt, refactor: remove unused parameters in `TransactionDesc::FormatTxS…
w0xlt Feb 21, 2022
66d58ad
qt, refactor: remove unused field `qint64 TransactionStatus::open_for`
w0xlt Feb 21, 2022
343f83d
qt, refactor: Use member initializers in TransactionStatus
w0xlt Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
qt, refactor: remove redundant scope in `TransactionDesc::FormatTxSta… 
…tus()`
  • Loading branch information
@w0xlt
w0xlt committed Feb 24, 2022
commit b1bc1431db1e86eefaf4a91e08663628d94656fc
22 changes: 10 additions & 12 deletions src/qt/transactiondesc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,16 @@ using wallet::isminetype;

QString TransactionDesc::FormatTxStatus(const interfaces::WalletTx& wtx, const interfaces::WalletTxStatus& status, bool inMempool, int numBlocks)
{
{
int nDepth = status.depth_in_main_chain;
if (nDepth < 0) {
return tr("conflicted with a transaction with %1 confirmations").arg(-nDepth);
} else if (nDepth == 0) {
const QString abandoned{status.is_abandoned ? QLatin1String(", ") + tr("abandoned") : QString()};
return tr("0/unconfirmed, %1").arg(inMempool ? tr("in memory pool") : tr("not in memory pool")) + abandoned;
} else if (nDepth < 6) {
return tr("%1/unconfirmed").arg(nDepth);
} else {
return tr("%1 confirmations").arg(nDepth);
}
int nDepth = status.depth_in_main_chain;
if (nDepth < 0) {
return tr("conflicted with a transaction with %1 confirmations").arg(-nDepth);
} else if (nDepth == 0) {
const QString abandoned{status.is_abandoned ? QLatin1String(", ") + tr("abandoned") : QString()};
return tr("0/unconfirmed, %1").arg(inMempool ? tr("in memory pool") : tr("not in memory pool")) + abandoned;
} else if (nDepth < 6) {
return tr("%1/unconfirmed").arg(nDepth);
} else {
return tr("%1 confirmations").arg(nDepth);
}
}

Expand Down