Merge f2e2c5ebcc into merged_master (Bitcoin PR #14988)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:53 +00:00
commit be610d6bda

View file

@ -623,7 +623,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
return details;
}
case ConfirmedRole:
return rec->status.countsForBalance;
return rec->status.status == TransactionStatus::Status::Confirming || rec->status.status == TransactionStatus::Status::Confirmed;
case FormattedAmountRole:
// Used for copy/export, so don't include separators
return formatTxAmount(rec, false, BitcoinUnits::separatorNever);