diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-03-27 11:49:36 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-03-27 11:49:36 -0500 |
| commit | 00e34f78464d8720b3aaf61e4cdaba7daddbe26d (patch) | |
| tree | 7405cb0540cc8488a197eee802c0ecb445f125cb /components | |
| parent | fdaf557b994cd206782a1e039c6455c8dcc850ab (diff) | |
| parent | 22a111450128dcd105452d4d570a11779f1c1e9f (diff) | |
| download | monzero-gui-00e34f78464d8720b3aaf61e4cdaba7daddbe26d.tar.gz monzero-gui-00e34f78464d8720b3aaf61e4cdaba7daddbe26d.tar.xz monzero-gui-00e34f78464d8720b3aaf61e4cdaba7daddbe26d.zip | |
Merge pull request #1172
65ea07a Add a shared ringdb management page - rings and blackballed outputs
22a1114 Add segregation key reuse mitigation options
Diffstat (limited to 'components')
| -rw-r--r-- | components/HistoryTable.qml | 8 | ||||
| -rw-r--r-- | components/HistoryTableMobile.qml | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml index b846865b..cac884ae 100644 --- a/components/HistoryTable.qml +++ b/components/HistoryTable.qml @@ -39,7 +39,7 @@ ListView { property int rowSpacing: 12 property var addressBookModel: null - function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note, destinations) { + function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note, destinations, rings) { 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>"; @@ -50,6 +50,7 @@ ListView { + (tx_key ? trStart + qsTr("Tx key:") + trMiddle + tx_key + 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>" + translationManager.emptyString; } @@ -103,8 +104,11 @@ ListView { onClicked: { var tx_key = currentWallet.getTxKey(hash) var tx_note = currentWallet.getUserNote(hash) + var rings = currentWallet.getRings(hash) + if (rings) + rings = rings.replace(/\|/g, '\n') informationPopup.title = "Transaction details"; - informationPopup.content = buildTxDetailsString(hash,paymentId,tx_key,tx_note,destinations); + informationPopup.content = buildTxDetailsString(hash,paymentId,tx_key,tx_note,destinations, rings); informationPopup.onCloseCallback = null informationPopup.open(); } diff --git a/components/HistoryTableMobile.qml b/components/HistoryTableMobile.qml index d3f39bf9..3b1dc31c 100644 --- a/components/HistoryTableMobile.qml +++ b/components/HistoryTableMobile.qml @@ -38,7 +38,7 @@ ListView { property var previousItem property var addressBookModel: null - function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note, destinations) { + function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note, destinations, rings) { 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>"; @@ -49,6 +49,7 @@ ListView { + (tx_key ? trStart + qsTr("Tx key:") + trMiddle + tx_key + 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>" + translationManager.emptyString; } @@ -91,9 +92,11 @@ ListView { onClicked: { var tx_key = currentWallet.getTxKey(hash) var tx_note = currentWallet.getUserNote(hash) - + var rings = currentWallet.getRings(hash) + if (rings) + rings = rings.replace(/\|/g, '\n') informationPopup.title = "Transaction details"; - informationPopup.text = buildTxDetailsString(hash,paymentId,tx_key,tx_note,destinations); + informationPopup.text = buildTxDetailsString(hash,paymentId,tx_key,tx_note,destinations, rings); informationPopup.open(); informationPopup.onCloseCallback = null } |