Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #2220

Browse Source 
8d49ad9 tx_key not displayed by default, click to reveal (ph4r05)
6d03d63 get_tx_key, get_tx_proof, tx_spend_proof async (ph4r05)
This commit is contained in:
luigi1111
2019-06-21 14:39:20 -05:00
parent 934ca28e2c 6d03d63c88
commit f6a797fcb5
4 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pages/History.qml
View File

@@ -1099,17 +1099,13 @@ Rectangle {
MoneroComponents.TextPlain {
font.family: MoneroComponents.Style.fontRegular.name
font.pixelSize: 15
text: {
var txKey = currentWallet.getTxKey(hash)
if(txKey) return txKey;
else return "-"
}
text: qsTr("Click to reveal")
color: MoneroComponents.Style.defaultFontColor
anchors.verticalCenter: parent.verticalCenter
state: "txkey_hidden"
MouseArea {
state: "copyable"
state: "copyable_txkey"
anchors.fill: parent
hoverEnabled: true
onEntered: parent.color = MoneroComponents.Style.orange
@@ -1200,6 +1196,7 @@ Rectangle {
if(res[i].containsMouse === true){
if(res[i].state === 'copyable' && res[i].parent.hasOwnProperty('text')) toClipboard(res[i].parent.text);
if(res[i].state === 'copyable_address') root.toClipboard(address);
if(res[i].state === 'copyable_txkey') root.getTxKey(hash, res[i]);
if(res[i].state === 'set_tx_note') root.editDescription(hash);
if(res[i].state === 'details') root.showTxDetails(hash, paymentId, destinations, subaddrAccount, subaddrIndex);
if(res[i].state === 'proof') root.showTxProof(hash, paymentId, destinations, subaddrAccount, subaddrIndex);
@@ -1577,8 +1574,18 @@ Rectangle {
}
}
function getTxKey(hash, elem){
if (elem.parent.state != 'ready'){
currentWallet.getTxKeyAsync(hash, function(hash, txKey) {
elem.parent.text = txKey ? txKey : '-';
elem.parent.state = 'ready';
});
}
toClipboard(elem.parent.text);
}
function showTxDetails(hash, paymentId, destinations, subaddrAccount, subaddrIndex){
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") + translationManager.emptyString) : currentWallet.getSubaddressLabel(subaddrAccount, subaddrIndex)
@@ -1586,10 +1593,12 @@ Rectangle {
if (rings)
rings = rings.replace(/\|/g, '\n')
informationPopup.title = qsTr("Transaction details") + translationManager.emptyString;
informationPopup.content = buildTxDetailsString(hash, paymentId, tx_key, tx_note, destinations, rings, address, address_label);
informationPopup.onCloseCallback = null
informationPopup.open();
currentWallet.getTxKeyAsync(hash, function(hash, tx_key) {
informationPopup.title = qsTr("Transaction details") + translationManager.emptyString;
informationPopup.content = buildTxDetailsString(hash, paymentId, tx_key, tx_note, destinations, rings, address, address_label);
informationPopup.onCloseCallback = null
informationPopup.open();
});
}
function showTxProof(hash, paymentId, destinations, subaddrAccount, subaddrIndex){