diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-01-21 14:47:14 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-01-21 14:47:14 -0600 |
| commit | f6ba2e28cbffdda51b7899f9e32e9edf0c820e7b (patch) | |
| tree | d932062d70d905f4dfb57af65b8c544e9c05a057 | |
| parent | 442320bc3635a387b60ddebac226a3b6cd3d975e (diff) | |
| parent | b26cbe81017590e53acba8c0c91aa7dd0016f5e6 (diff) | |
| download | monzero-gui-f6ba2e28cbffdda51b7899f9e32e9edf0c820e7b.tar.gz monzero-gui-f6ba2e28cbffdda51b7899f9e32e9edf0c820e7b.tar.xz monzero-gui-f6ba2e28cbffdda51b7899f9e32e9edf0c820e7b.zip | |
Merge pull request #1873
b26cbe8 HistoryTable: show address and address label in tx details (mmbyday)
| -rw-r--r-- | components/HistoryTable.qml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index a1240ab7..9ed575ca 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -41,16 +41,18 @@ ListView { property int rowSpacing: 12 property var addressBookModel: null - function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note, destinations, rings) { + function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note, destinations, rings, address, address_label) { var trStart = '<tr><td width="85" style="padding-top:5px"><b>', trMiddle = '</b></td><td style="padding-left:10px;padding-top:5px;">', trEnd = "</td></tr>"; return '<table border="0">' + (tx_id ? trStart + qsTr("Tx ID:") + trMiddle + tx_id + trEnd : "") - + (paymentId ? trStart + qsTr("Payment ID:") + trMiddle + paymentId + trEnd : "") + + (address_label ? trStart + qsTr("Address label:") + trMiddle + address_label + trEnd : "") + + (address ? trStart + qsTr("Address:") + trMiddle + address + trEnd : "") + + (paymentId ? trStart + qsTr("Payment ID:") + trMiddle + paymentId + trEnd : "") + (tx_key ? trStart + qsTr("Tx key:") + trMiddle + tx_key + trEnd : "") - + (tx_note ? trStart + qsTr("Tx note:") + trMiddle + tx_note + trEnd : "") + + (tx_note ? trStart + qsTr("Tx note:") + trMiddle + tx_note + trEnd : "") + (destinations ? trStart + qsTr("Destinations:") + trMiddle + destinations + trEnd : "") + (rings ? trStart + qsTr("Rings:") + trMiddle + rings + trEnd : "") + "</table>" @@ -468,10 +470,12 @@ ListView { var tx_key = currentWallet.getTxKey(hash) var tx_note = currentWallet.getUserNote(hash) var rings = currentWallet.getRings(hash) + var address_label = subaddrIndex == 0 ? qsTr("Primary address") : currentWallet.getSubaddressLabel(subaddrAccount, subaddrIndex) + var address = currentWallet.address(subaddrAccount, subaddrIndex) if (rings) rings = rings.replace(/\|/g, '\n') informationPopup.title = "Transaction details"; - informationPopup.content = buildTxDetailsString(hash,paymentId,tx_key,tx_note,destinations, rings); + informationPopup.content = buildTxDetailsString(hash,paymentId,tx_key,tx_note,destinations, rings, address, address_label); informationPopup.onCloseCallback = null informationPopup.open(); } |