github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-12-24 02:23:45 +01:00
Code Releases Activity

Merge pull request #3147

Browse Source 
4661167 onTransactionCommitted: don't show informationPopup on success (xiphon)
This commit is contained in:
luigi1111 2020-10-13 12:39:34 -05:00
commit 26ad7b78b5
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.qml
View File

@ -997,16 +997,9 @@ ApplicationWindow {
informationPopup.title = qsTr("Error") + translationManager.emptyString informationPopup.title = qsTr("Error") + translationManager.emptyString
informationPopup.text = qsTr("Couldn't send the money: ") + transaction.errorString informationPopup.text = qsTr("Couldn't send the money: ") + transaction.errorString
informationPopup.icon = StandardIcon.Critical informationPopup.icon = StandardIcon.Critical
informationPopup.onCloseCallback = null;
informationPopup.open();
} else { } else {
var txid_text = ""
informationPopup.title = qsTr("Information") + translationManager.emptyString
for (var i = 0; i < txid.length; ++i) {
if (txid_text.length > 0)
txid_text += ", "
txid_text += txid[i]
}
informationPopup.text = (viewOnly)? qsTr("Transaction saved to file: %1").arg(path) : qsTr("Monero sent successfully: %1 transaction(s) ").arg(txid.length) + txid_text + translationManager.emptyString
informationPopup.icon = StandardIcon.Information
if (transactionDescription.length > 0) { if (transactionDescription.length > 0) {
for (var i = 0; i < txid.length; ++i) for (var i = 0; i < txid.length; ++i)
currentWallet.setUserNote(txid[i], transactionDescription); currentWallet.setUserNote(txid[i], transactionDescription);
@ -1015,10 +1008,7 @@ ApplicationWindow {
// Clear tx fields // Clear tx fields
middlePanel.transferView.clearFields() middlePanel.transferView.clearFields()
successfulTxPopup.open(txid) successfulTxPopup.open(txid)
} }
informationPopup.onCloseCallback = null
informationPopup.open()
currentWallet.refresh() currentWallet.refresh()
currentWallet.disposeTransaction(transaction) currentWallet.disposeTransaction(transaction)
currentWallet.storeAsync(function(success) { currentWallet.storeAsync(function(success) {