monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

History: search by receiving address, receiving address label, address book label

Browse source
This commit is contained in:
rating89us 2020-11-07 20:04:12 +01:00 committed by GitHub
parent df2b85e7ee
commit cedfa5aabb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pages/History.qml
View file

@ -771,7 +771,6 @@ Rectangle {
return qsTr("Waiting confirmation...") + translationManager.emptyString; return qsTr("Waiting confirmation...") + translationManager.emptyString;
} }
if (address) { if (address) {
const addressBookName = currentWallet ? currentWallet.addressBook.getDescription(address) : null;
return (addressBookName ? FontAwesome.addressBook + " " + addressBookName : TxUtils.addressTruncate(address, 8)); return (addressBookName ? FontAwesome.addressBook + " " + addressBookName : TxUtils.addressTruncate(address, 8));
} }
if (amount != 0) { if (amount != 0) {
@ -780,8 +779,6 @@ Rectangle {
return qsTr("My wallet") + translationManager.emptyString; return qsTr("My wallet") + translationManager.emptyString;
} }
} else { } else {
const receivingAddress = currentWallet ? currentWallet.address(subaddrAccount, subaddrIndex) : null;
const receivingAddressLabel = currentWallet ? appWindow.currentWallet.getSubaddressLabel(subaddrAccount, subaddrIndex) : null;
if (receivingAddress) { if (receivingAddress) {
if (subaddrIndex == 0) { if (subaddrIndex == 0) {
return qsTr("Address") + " #0" + " (" + qsTr("Primary address") + ")" + translationManager.emptyString; return qsTr("Address") + " #0" + " (" + qsTr("Primary address") + ")" + translationManager.emptyString;
@ -1417,6 +1414,12 @@ Rectangle {
txs.push(item); txs.push(item);
} else if(item.address !== "" && item.address.toLowerCase().startsWith(root.sortSearchString.toLowerCase())){ } else if(item.address !== "" && item.address.toLowerCase().startsWith(root.sortSearchString.toLowerCase())){
txs.push(item); txs.push(item);
} else if(item.receivingAddress !== "" && item.receivingAddress.toLowerCase().startsWith(root.sortSearchString.toLowerCase())){
txs.push(item);
} else if(item.receivingAddressLabel !== "" && item.receivingAddressLabel.toLowerCase().startsWith(root.sortSearchString.toLowerCase())){
txs.push(item);
} else if(item.addressBookName !== "" && item.addressBookName.toLowerCase().startsWith(root.sortSearchString.toLowerCase())){
txs.push(item);
} else if(typeof item.blockheight !== "undefined" && item.blockheight.toString().startsWith(root.sortSearchString)) { } else if(typeof item.blockheight !== "undefined" && item.blockheight.toString().startsWith(root.sortSearchString)) {
txs.push(item); txs.push(item);
} else if(item.tx_note.toLowerCase().indexOf(root.sortSearchString.toLowerCase()) !== -1) { } else if(item.tx_note.toLowerCase().indexOf(root.sortSearchString.toLowerCase()) !== -1) {
@ -1522,8 +1525,16 @@ Rectangle {
var tx_note = currentWallet.getUserNote(hash); var tx_note = currentWallet.getUserNote(hash);
var address = ""; var address = "";
if(isout) { var addressBookName = "";
var receivingAddress = "";
var receivingAddressLabel = "";
if (isout) {
address = TxUtils.destinationsToAddress(destinations); address = TxUtils.destinationsToAddress(destinations);
addressBookName = currentWallet ? currentWallet.addressBook.getDescription(address) : null;
} else {
receivingAddress = currentWallet ? currentWallet.address(subaddrAccount, subaddrIndex) : null;
receivingAddressLabel = currentWallet ? appWindow.currentWallet.getSubaddressLabel(subaddrAccount, subaddrIndex) : null;
} }
if (isout) if (isout)
@ -1541,6 +1552,7 @@ Rectangle {
"hash": hash, "hash": hash,
"paymentId": paymentId, "paymentId": paymentId,
"address": address, "address": address,
"addressBookName": addressBookName,
"destinations": destinations, "destinations": destinations,
"tx_note": tx_note, "tx_note": tx_note,
"dateHuman": dateHuman, "dateHuman": dateHuman,
@ -1551,6 +1563,8 @@ Rectangle {
"fee": fee, "fee": fee,
"confirmations": confirmations, "confirmations": confirmations,
"confirmationsRequired": confirmationsRequired, "confirmationsRequired": confirmationsRequired,
"receivingAddress": receivingAddress,
"receivingAddressLabel": receivingAddressLabel,
"subaddrAccount": subaddrAccount, "subaddrAccount": subaddrAccount,
"subaddrIndex": subaddrIndex "subaddrIndex": subaddrIndex
}); });