AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of github.com:spesmilo/electrum

Browse Source
This commit is contained in:
ThomasV
2025-01-17 14:43:15 +01:00
parent f23971660e 19a4b149d3
commit 28c053027f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/components/WalletMainView.qml
View File

@@ -485,7 +485,7 @@ Item {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'), title: qsTr('Error'),
iconSource: Qt.resolvedUrl('../../icons/warning.png'), iconSource: Qt.resolvedUrl('../../icons/warning.png'),
text: message text: message ? message : qsTr('Payment failed')
}) })
dialog.open() dialog.open()
} }

4
electrum/gui/qml/components/main.qml
View File

@@ -613,10 +613,10 @@ ApplicationWindow
} }
// TODO: add to notification queue instead of barging through // TODO: add to notification queue instead of barging through
function onPaymentSucceeded(key) { function onPaymentSucceeded(key) {
notificationPopup.show(Daemon.currentWallet.name, qsTr('Payment Succeeded')) notificationPopup.show(Daemon.currentWallet.name, qsTr('Payment succeeded'))
} }
function onPaymentFailed(key, reason) { function onPaymentFailed(key, reason) {
notificationPopup.show(Daemon.currentWallet.name, qsTr('Payment Failed') + ': ' + reason) notificationPopup.show(Daemon.currentWallet.name, qsTr('Payment failed') + ': ' + reason)
} }
} }

4
electrum/gui/qml/qedaemon.py
View File

@@ -251,8 +251,8 @@ class QEDaemon(AuthMixin, QObject):
assert wallet is not None assert wallet is not None
self._current_wallet = QEWallet.getInstanceFor(wallet) self._current_wallet = QEWallet.getInstanceFor(wallet)
self.availableWallets.updateWallet(self._path) self.availableWallets.updateWallet(self._path)
if wallet.requires_unlock(): wallet.unlock(password or None) # not conditional on wallet.requires_unlock in qml, as
wallet.unlock(password or None) # the auth wrapper doesn't pass the entered password, but instead we rely on the password in memory
self._loading = False self._loading = False
self.loadingChanged.emit() self.loadingChanged.emit()
self.walletLoaded.emit(self._name, self._path) self.walletLoaded.emit(self._name, self._path)