Merge #14988: wallet: Fix for confirmed column in csv export for payment to self transactions

jonasschnelli · jonasschnelli · commit f2e2c5ebcccf · 2020-05-29T14:42:48.000+02:00
9760293 wallet: Fix for exported confirmation field in payment to self transactions (Ben Carman) Pull request description: Closes #3455 ACKs for top commit: jonasschnelli: Tested ACK 9760293 Tree-SHA512: 8207768771ad787f716b966c4aa7aeef2da8a602e32e3510e41c7b49ec5ec679a3835d248be5016d4b37764f9914846f7c41c11cf48cddb617cb7ef831318fd7
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -618,7 +618,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);

Original file line number	Diff line number	Diff line change
`@@ -618,7 +618,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const`
`618`	`618`	`return details;`
`619`	`619`	`}`
`620`	`620`	`case ConfirmedRole:`
`621`		`- return rec->status.countsForBalance;`
	`621`	`+ return rec->status.status == TransactionStatus::Status::Confirming \|\| rec->status.status == TransactionStatus::Status::Confirmed;`
`622`	`622`	`case FormattedAmountRole:`
`623`	`623`	`// Used for copy/export, so don't include separators`
`624`	`624`	`return formatTxAmount(rec, false, BitcoinUnits::separatorNever);`