diff --git a/electrum/gui/qml/components/SwapDialog.qml b/electrum/gui/qml/components/SwapDialog.qml index 759b6890a..68c4f0d6e 100644 --- a/electrum/gui/qml/components/SwapDialog.qml +++ b/electrum/gui/qml/components/SwapDialog.qml @@ -315,6 +315,20 @@ ElDialog { function onSliderPosChanged() { swapslider.value = swaphelper.sliderPos } + function onStateChanged() { + if (swaphelper.state == SwapHelper.Success) { + var dialog = app.messageDialog.createObject(app, { + title: qsTr('Success!'), + text: Config.getTranslatedMessage(swaphelper.isReverse + ? 'MSG_REVERSE_SWAP_FUNDING_MEMPOOL' + : 'MSG_FORWARD_SWAP_FUNDING_MEMPOOL') + }) + dialog.accepted.connect(function() { + Qt.callLater(root.close) + }) + dialog.open() + } + } } Component.onCompleted: { diff --git a/electrum/gui/qml/qeconfig.py b/electrum/gui/qml/qeconfig.py index 83ff34f9a..e1bf70e4c 100644 --- a/electrum/gui/qml/qeconfig.py +++ b/electrum/gui/qml/qeconfig.py @@ -8,6 +8,7 @@ from electrum.bitcoin import TOTAL_COIN_SUPPLY_LIMIT_IN_BTC from electrum.i18n import set_language, languages from electrum.logging import get_logger from electrum.util import base_unit_name_to_decimal_point +from electrum.gui import messages from .qetypes import QEAmount from .auth import AuthMixin, auth_protect @@ -33,6 +34,10 @@ class QEConfig(AuthMixin, QObject): cv = getattr(self.config.cv, key) return cv.get_long_desc() if cv else '' + @pyqtSlot(str, result=str) + def getTranslatedMessage(self, key) -> str: + return getattr(messages, key) + languageChanged = pyqtSignal() @pyqtProperty(str, notify=languageChanged) def language(self): diff --git a/electrum/gui/qml/qeswaphelper.py b/electrum/gui/qml/qeswaphelper.py index f64cd531e..527bb359d 100644 --- a/electrum/gui/qml/qeswaphelper.py +++ b/electrum/gui/qml/qeswaphelper.py @@ -560,10 +560,7 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener): txid = fut.result() try: # swaphelper might be destroyed at this point if txid: - self.userinfo = ' '.join([ - _('Success!'), - messages.MSG_FORWARD_SWAP_FUNDING_MEMPOOL, - ]) + self.userinfo = _('Success!') self.state = QESwapHelper.State.Success else: self.userinfo = _('Swap failed!') @@ -640,10 +637,7 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener): txid = fut.result() try: # swaphelper might be destroyed at this point if txid: - self.userinfo = ' '.join([ - _('Success!'), - messages.MSG_REVERSE_SWAP_FUNDING_MEMPOOL, - ]) + self.userinfo = _('Success!') self.state = QESwapHelper.State.Success else: self.userinfo = _('Swap failed!')