mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-10 22:18:54 +01:00
Merge bitcoin-core/gui#119: Replace send-to-self with dual send+receive entries
099dbe4224GUI: TransactionRecord: When time/index/etc match, sort send before receive (Luke Dashjr)2d182f77cdBugfix: Ignore ischange flag when we're not the sender (Luke Dashjr)71fbdb7f40GUI: Remove SendToSelf TransactionRecord type (Luke Dashjr)f3fbe99fcfGUI: TransactionRecord: Refactor to turn send-to-self into send+receive pairs (Luke Dashjr)b9765ba1d6GUI: TransactionRecord: Use "any from me" as the criteria for deciding whether a transaction is a send or receive (Luke Dashjr) Pull request description: Makes the GUI transaction list more like the RPC, and IMO clearer in general. As a side effect, this also fixes the GUI entries when a transaction is a net profit to us, but some inputs were also from us. Originally https://github.com/bitcoin/bitcoin/pull/15115 Has Concept ACKs from @*Empact @*jonasschnelli ACKs for top commit: hebasto: ACK099dbe4224. Tree-SHA512: 7d581add2f59431aa019126d54232a1f15723def5147d7a1b672e9b6d525b6e5a944cc437701aa1bd5bd0fbe557a3d1f4b239337f42bdba4fe1d3960442d0e3b
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
|
||||
#include <core_io.h>
|
||||
#include <interfaces/handler.h>
|
||||
#include <tinyformat.h>
|
||||
#include <uint256.h>
|
||||
|
||||
#include <algorithm>
|
||||
@@ -377,8 +378,6 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
|
||||
case TransactionRecord::SendToAddress:
|
||||
case TransactionRecord::SendToOther:
|
||||
return tr("Sent to");
|
||||
case TransactionRecord::SendToSelf:
|
||||
return tr("Payment to yourself");
|
||||
case TransactionRecord::Generated:
|
||||
return tr("Mined");
|
||||
default:
|
||||
@@ -421,8 +420,6 @@ QString TransactionTableModel::formatTxToAddress(const TransactionRecord *wtx, b
|
||||
return lookupAddress(wtx->address, tooltip) + watchAddress;
|
||||
case TransactionRecord::SendToOther:
|
||||
return QString::fromStdString(wtx->address) + watchAddress;
|
||||
case TransactionRecord::SendToSelf:
|
||||
return lookupAddress(wtx->address, tooltip) + watchAddress;
|
||||
default:
|
||||
return tr("(n/a)") + watchAddress;
|
||||
}
|
||||
@@ -441,8 +438,6 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const
|
||||
if(label.isEmpty())
|
||||
return COLOR_BAREADDRESS;
|
||||
} break;
|
||||
case TransactionRecord::SendToSelf:
|
||||
return COLOR_BAREADDRESS;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -560,7 +555,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
|
||||
case Status:
|
||||
return QString::fromStdString(rec->status.sortKey);
|
||||
case Date:
|
||||
return rec->time;
|
||||
return QString::fromStdString(strprintf("%020s-%s", rec->time, rec->status.sortKey));
|
||||
case Type:
|
||||
return formatTxType(rec);
|
||||
case Watchonly:
|
||||
|
||||
Reference in New Issue
Block a user