monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-18 00:37:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3550

Browse source 
417eaea History: stay on the same page after editing description (rating89us)
This commit is contained in:
luigi1111 2021-06-21 13:36:34 -05:00
commit 5f2b5d940c
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pages/History.qml
View file

@ -1269,7 +1269,7 @@ Rectangle {
if(res[i].state === 'copyable_address') (address ? root.toClipboard(address) : root.toClipboard(addressField.text)); if(res[i].state === 'copyable_address') (address ? root.toClipboard(address) : root.toClipboard(addressField.text));
if(res[i].state === 'copyable_receiving_address') root.toClipboard(currentWallet.address(subaddrAccount, subaddrIndex)); if(res[i].state === 'copyable_receiving_address') root.toClipboard(currentWallet.address(subaddrAccount, subaddrIndex));
if(res[i].state === 'copyable_txkey') root.getTxKey(hash, res[i]); if(res[i].state === 'copyable_txkey') root.getTxKey(hash, res[i]);
if(res[i].state === 'set_tx_note') root.editDescription(hash, tx_note); if(res[i].state === 'set_tx_note') root.editDescription(hash, tx_note, root.txPage);
if(res[i].state === 'details') root.showTxDetails(hash, paymentId, destinations, subaddrAccount, subaddrIndex, dateTime, displayAmount, isout); if(res[i].state === 'details') root.showTxDetails(hash, paymentId, destinations, subaddrAccount, subaddrIndex, dateTime, displayAmount, isout);
if(res[i].state === 'proof') root.showTxProof(hash, paymentId, destinations, subaddrAccount, subaddrIndex); if(res[i].state === 'proof') root.showTxProof(hash, paymentId, destinations, subaddrAccount, subaddrIndex);
doCollapse = false; doCollapse = false;
@ -1432,7 +1432,7 @@ Rectangle {
} }
} }
function updateFilter(){ function updateFilter(currentPage){
// applying filters // applying filters
root.txData = JSON.parse(JSON.stringify(root.txModelData)); // deepcopy root.txData = JSON.parse(JSON.stringify(root.txModelData)); // deepcopy
@ -1482,6 +1482,9 @@ Rectangle {
root.updateSort(); root.updateSort();
root.updateDisplay(root.txOffset, root.txMax); root.updateDisplay(root.txOffset, root.txMax);
if (currentPage) {
root.paginationJump(parseInt(currentPage));
}
} }
function updateSort(){ function updateSort(){
@ -1620,20 +1623,20 @@ Rectangle {
root.txCount = root.txData.length; root.txCount = root.txData.length;
} }
function update() { function update(currentPage) {
// handle outside mutation of tx model; incoming/outgoing funds or new blocks. Update table. // handle outside mutation of tx model; incoming/outgoing funds or new blocks. Update table.
currentWallet.history.refresh(currentWallet.currentSubaddressAccount); currentWallet.history.refresh(currentWallet.currentSubaddressAccount);
root.updateTransactionsFromModel(); root.updateTransactionsFromModel();
root.updateFilter(); root.updateFilter(currentPage);
} }
function editDescription(_hash, _tx_note){ function editDescription(_hash, _tx_note, currentPage){
inputDialog.labelText = qsTr("Set description:") + translationManager.emptyString; inputDialog.labelText = qsTr("Set description:") + translationManager.emptyString;
inputDialog.onAcceptedCallback = function() { inputDialog.onAcceptedCallback = function() {
appWindow.currentWallet.setUserNote(_hash, inputDialog.inputText); appWindow.currentWallet.setUserNote(_hash, inputDialog.inputText);
appWindow.showStatusMessage(qsTr("Updated description."),3); appWindow.showStatusMessage(qsTr("Updated description."),3);
root.update(); root.update(currentPage);
} }
inputDialog.onRejectedCallback = null; inputDialog.onRejectedCallback = null;
inputDialog.open(_tx_note); inputDialog.open(_tx_note);