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

electrum/gui/qml/components/WalletMainView.qml

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

electrum/gui/qml/components/main.qml

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

electrum/gui/qml/qedaemon.py

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