AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9663 from accumulator/qml_swap_success_popup

Browse Source 
qml: swap: don't show long swap success message in info box, show in popup instead and close swap dialog after accept.
This commit is contained in:
accumulator
2025-03-24 19:59:41 +01:00
committed by GitHub
parent 1aa066ea19 4494c3e2b5
commit 67171af4a5
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/gui/qml/components/SwapDialog.qml
View File

@@ -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: {

5
electrum/gui/qml/qeconfig.py
View File

@@ -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):

10
electrum/gui/qml/qeswaphelper.py
View File

@@ -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!')