monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-03 09:29:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3585

Browse source 
b9a1fa8 History: display Payment proof dialog immediately after clicking the button (rating89us)
This commit is contained in:
luigi1111 2021-06-24 13:54:42 -05:00
commit bea763d7f8
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.qml
View file

@ -1003,7 +1003,6 @@ ApplicationWindow {
} }
function txProofComputed(txid, result){ function txProofComputed(txid, result){
informationPopup.title = qsTr("Payment proof") + translationManager.emptyString;
if (result.indexOf("error|") === 0) { if (result.indexOf("error|") === 0) {
var errorString = result.split("|")[1]; var errorString = result.split("|")[1];
informationPopup.text = qsTr("Couldn't generate a proof because of the following reason: \n") + errorString + translationManager.emptyString; informationPopup.text = qsTr("Couldn't generate a proof because of the following reason: \n") + errorString + translationManager.emptyString;
@ -1012,8 +1011,6 @@ ApplicationWindow {
informationPopup.text = result; informationPopup.text = result;
informationPopup.icon = StandardIcon.Critical; informationPopup.icon = StandardIcon.Critical;
} }
informationPopup.onCloseCallback = null
informationPopup.open()
} }
// called on "checkProof" // called on "checkProof"

4
pages/History.qml
View file

@ -1717,6 +1717,10 @@ Rectangle {
console.log("getProof: Generate clicked: txid " + hash + ", address " + address); console.log("getProof: Generate clicked: txid " + hash + ", address " + address);
middlePanel.getProofClicked(hash, address, ''); middlePanel.getProofClicked(hash, address, '');
informationPopup.title = qsTr("Payment proof") + translationManager.emptyString;
informationPopup.text = qsTr("Generating payment proof") + "..." + translationManager.emptyString;
informationPopup.onCloseCallback = null
informationPopup.open()
} }
function toClipboard(text){ function toClipboard(text){