diff --git a/electrum/gui/qml/components/SwapDialog.qml b/electrum/gui/qml/components/SwapDialog.qml index 19c94d3ef..ba24db9cc 100644 --- a/electrum/gui/qml/components/SwapDialog.qml +++ b/electrum/gui/qml/components/SwapDialog.qml @@ -242,7 +242,7 @@ ElDialog { Layout.fillWidth: true text: qsTr('Ok') icon.source: Qt.resolvedUrl('../../icons/confirmed.png') - enabled: swaphelper.valid && !swaphelper.busy + enabled: swaphelper.valid onClicked: { console.log('Swap triggered from dialog ' + this + ' using swaphelper ' + swaphelper) swaphelper.executeSwap() diff --git a/electrum/gui/qml/qeswaphelper.py b/electrum/gui/qml/qeswaphelper.py index be519e4d3..889066d2c 100644 --- a/electrum/gui/qml/qeswaphelper.py +++ b/electrum/gui/qml/qeswaphelper.py @@ -34,7 +34,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener): self._rangeMax = 0 self._tx = None self._valid = False - self._busy = False self._userinfo = ' '.join([ _('Move the slider to set the amount and direction of the swap.'), _('Swapping lightning funds for onchain funds will increase your capacity to receive lightning payments.'), @@ -208,17 +207,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener): self._isReverse = isReverse self.isReverseChanged.emit() - busyChanged = pyqtSignal() - @pyqtProperty(bool, notify=busyChanged) - def busy(self): - return self._busy - - @busy.setter - def busy(self, busy): - if self._busy != busy: - self._busy = busy - self.busyChanged.emit() - def init_swap_slider_range(self): lnworker = self._wallet.wallet.lnworker @@ -375,8 +363,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener): except Exception as e: self._logger.error(str(e)) self.swapFailed.emit(str(e)) - finally: - self.busy = False threading.Thread(target=swap_task, daemon=True).start() @@ -402,8 +388,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener): except Exception as e: self._logger.error(str(e)) self.swapFailed.emit(str(e)) - finally: - self.busy = False threading.Thread(target=swap_task, daemon=True).start() @@ -413,11 +397,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener): if not self._wallet.wallet.network: self.error.emit(_("You are offline.")) return - - if self._busy: - self._logger.error('swap already in progress for this swaphelper') - return - if confirm: self._do_execute_swap() return @@ -431,7 +410,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener): @auth_protect def _do_execute_swap(self): - self.busy = True if self.isReverse: lightning_amount = self._send_amount onchain_amount = self._receive_amount