Skip to content

QML send change to lightning #10723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
accumulator wants to merge 6 commits into
base: master
Choose a base branch
from
Open

QML send change to lightning #10723

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d91f490
qml: refactor ConfirmTxDialog; don't use accept signal to confirm pay…
accumulator Apr 9, 2026
6bbb20f
qml: qeconfig add property for send-change-to-lightning
accumulator Jan 23, 2025
5bb718d
qml: add send-to-lightning in ConfirmTxDialog
accumulator Jan 23, 2025
2224250
qml: add change-to-swap support to QETxFinalizer
accumulator Mar 25, 2025
cdfcf88
qml: make finalizer options a flag, allowing to enable/disable certai…
accumulator Jun 11, 2026
708dc41
qml: add busy property on QETxFinalizer for guarding re-entry while b…
accumulator Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion electrum/gui/qml/components/ConfirmTxDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ ElDialog {
property alias amountLabelText: amountLabel.text
property alias sendButtonText: sendButton.text

signal confirmed

title: qsTr('Transaction Fee')
iconSource: Qt.resolvedUrl('../../icons/question.png')

Expand Down Expand Up @@ -163,6 +165,7 @@ ElDialog {
id: optionslayout
width: parent.width
columns: 2
rowSpacing: 0

ElCheckBox {
Layout.fillWidth: true
Expand Down Expand Up @@ -203,6 +206,38 @@ ElDialog {
helptext: Config.longDescFor('WALLET_COIN_CHOOSER_OUTPUT_ROUNDING')
}

ElCheckBox {
id: cb_send_change_to_lightning
Layout.fillWidth: true
visible: Daemon.currentWallet.isLightning && Daemon.currentWallet.lightningCanReceive.satsInt > 0
text: Config.shortDescFor('WALLET_SEND_CHANGE_TO_LIGHTNING')
onCheckedChanged: {
if (activeFocus) {
Config.sendChangeToLightning = checked
finalizer.doUpdate()
}
}
Component.onCompleted: {
checked = Config.sendChangeToLightning
}
}

HelpButton {
visible: Daemon.currentWallet.isLightning && Daemon.currentWallet.lightningCanReceive.satsInt > 0
heading: Config.shortDescFor('WALLET_SEND_CHANGE_TO_LIGHTNING')
helptext: Config.longDescFor('WALLET_SEND_CHANGE_TO_LIGHTNING')
}

Label {
visible: cb_send_change_to_lightning.visible && cb_send_change_to_lightning.checked
color: constants.mutedForeground
font.pixelSize: constants.fontSizeSmall
text: finalizer.swapStatusMsg
Layout.topMargin: -constants.paddingSmall
Layout.leftMargin: cb_send_change_to_lightning.contentItem.leftPadding
+ cb_send_change_to_lightning.padding
}

}
}

Expand Down Expand Up @@ -284,7 +319,7 @@ ElDialog {
: qsTr('Pay...')
icon.source: '../../icons/confirmed.png'
enabled: finalizer.valid
onClicked: doAccept()
onClicked: confirmed()
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions electrum/gui/qml/components/MessageDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ ElDialog {
property bool yesno: false
property alias text: message.text
property bool richText: false
property alias buttonText: primaryButton.text
property alias buttonIcon: primaryButton.icon.source

z: 1 // raise z so it also covers dialogs using overlay as parent

Expand Down Expand Up @@ -55,6 +57,7 @@ ElDialog {
}

FlatButton {
id: primaryButton
Layout.fillWidth: true
textUnderIcon: false
text: qsTr('Ok')
Expand Down
15 changes: 11 additions & 4 deletions electrum/gui/qml/components/OpenChannelDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ ElDialog {
width: parent.width
height: parent.height

property var _openerConfirmTxDialog: null

ColumnLayout {
anchors.fill: parent
spacing: 0
Expand Down Expand Up @@ -255,14 +257,18 @@ ElDialog {
Component {
id: confirmOpenChannelDialog
ConfirmTxDialog {
id: _confirmOpenChannelDialog
amountLabelText: qsTr('Channel capacity')
sendButtonText: qsTr('Open Channel')
finalizer: channelopener.finalizer

onClosed: destroy()
}
}

ChannelOpener {
id: channelopener

wallet: Daemon.currentWallet
onAuthRequired: (method, authMessage) => {
app.handleAuthRequired(channelopener, method, authMessage)
Expand All @@ -288,13 +294,13 @@ ElDialog {
})
}
onFinalizerChanged: {
var dialog = confirmOpenChannelDialog.createObject(app, {
_openerConfirmTxDialog = confirmOpenChannelDialog.createObject(app, {
satoshis: channelopener.amount
})
dialog.accepted.connect(function() {
dialog.finalizer.signAndSend()
_openerConfirmTxDialog.confirmed.connect(function() {
_openerConfirmTxDialog.finalizer.signAndSend()
})
dialog.open()
_openerConfirmTxDialog.open()
}
onChannelOpening: (peer) => {
console.log('Channel is opening')
Expand All @@ -318,6 +324,7 @@ ElDialog {
if (!has_onchain_backup) {
app.channelOpenProgressDialog.channelBackup = channelopener.channelBackup(cid)
}
_openerConfirmTxDialog.close()
// TODO: handle incomplete TX
root.close()
}
Expand Down
54 changes: 46 additions & 8 deletions electrum/gui/qml/components/WalletMainView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,12 @@ Item {
message: invoice.message
})
var canComplete = !Daemon.currentWallet.isWatchOnly && Daemon.currentWallet.canSignWithoutCosigner
dialog.accepted.connect(function() {
dialog.confirmed.connect(function() {
if (invoice.canSave)
if (!invoice.saveInvoice())
if (!invoice.saveInvoice()) {
dialog.close()
return
}
if (!canComplete) {
if (Daemon.currentWallet.isWatchOnly) {
dialog.finalizer.saveOrShow()
Expand Down Expand Up @@ -148,7 +150,7 @@ Item {
? qsTr('Sweep...')
: qsTr('Sweep')
})
finalizerDialog.accepted.connect(function() {
finalizerDialog.confirmed.connect(function() {
if (Daemon.currentWallet.isWatchOnly) {
var confirmdialog = app.messageDialog.createObject(mainView, {
title: qsTr('Confirm Sweep'),
Expand All @@ -164,6 +166,7 @@ Item {
}
console.log("Sending sweep transaction")
finalizerDialog.finalizer.send()
finalizerDialog.close()
})
finalizerDialog.open()
})
Expand Down Expand Up @@ -672,6 +675,8 @@ Item {
id: _confirmPaymentDialog
title: qsTr('Confirm Payment')
finalizer: TxFinalizer {
id: _txfinalizer
property var _swapwaitdialog
wallet: Daemon.currentWallet
canRbf: true
onFinished: (signed, saved, complete) => {
Expand All @@ -693,7 +698,7 @@ Item {
}
showExport(getSerializedTx(), msg)
}
_confirmPaymentDialog.destroy()
_confirmPaymentDialog.close()
}
onSignError: (message) => {
var dialog = app.messageDialog.createObject(mainView, {
Expand All @@ -703,12 +708,43 @@ Item {
})
dialog.open()
}
onSwapError: (message) => {
if (_swapwaitdialog)
_swapwaitdialog.close()
var dialog = app.messageDialog.createObject(mainView, {
title: qsTr('Error'),
text: [qsTr('Could not swap change'), message].join('\n\n'),
iconSource: '../../../icons/warning.png'
})
dialog.open()
}
onSwapStart: {
_swapwaitdialog = app.messageDialog.createObject(mainView, {
title: qsTr('Please wait...'),
text: [qsTr('waiting for lightning invoice'), ''].join('\n\n'),

@f321x f321x Jul 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
text: [qsTr('waiting for lightning invoice'), ''].join('\n\n'),
text: [qsTr('Requesting Submarine Swap for change...'), ''].join('\n\n'),

Might be easier to understand? It might not be clear to the user why they have to wait for a lightning invoice if they aren't aware of the swap technicalities.

Image

iconSource: Qt.resolvedUrl('../../icons/info.png'),
buttonText: qsTr('Cancel'),
buttonIcon: Qt.resolvedUrl('../../icons/closebutton.png')
})
_swapwaitdialog.accepted.connect(function() {
cancelSwap()
})
Comment on lines +731 to +733

@f321x f321x Jul 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should clicking outside the dialog/back maybe also cancel the swap?

_swapwaitdialog.rejected.connect(function() {
    cancelSwap()
})

Alternatively we could also disallow closing the dialog by clicking outside so the user must either wait or click cancel.

_swapwaitdialog.open()
}
onSwapFunded: {
if (_swapwaitdialog)
_swapwaitdialog.close()
}
onAuthRequired: (method, authMessage) => {
app.handleAuthRequired(_txfinalizer, method, authMessage)
}
}

// TODO: lingering confirmPaymentDialogs can raise exceptions in
// the child finalizer when currentWallet disappears, but we need
// it long enough for the finalizer to finish..
// onClosed: destroy()
// NOTE: destroy-on-close was previously disabled due to the 'accept' signal implicitly
// closing the dialog, while the finalizer could still trigger a callback.
// ConfirmTxDialog now instead emits a custom 'confirmed' signal when user ok's, but
// keep in mind this requires explicit closing of the dialog afterwards
onClosed: destroy()
}
}

Expand All @@ -725,6 +761,8 @@ Item {
canRbf: true
privateKeys: _confirmSweepDialog.privateKeys
}

onClosed: destroy()
}
}

Expand Down
11 changes: 11 additions & 0 deletions electrum/gui/qml/qeconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,17 @@ def walletDidUseSinglePassword(self):
# TODO: consider removing once encrypted wallet file headers are available
return self.config.WALLET_DID_USE_SINGLE_PASSWORD

sendChangeToLightningChanged = pyqtSignal()
@pyqtProperty(bool, notify=sendChangeToLightningChanged)
def sendChangeToLightning(self):
return self.config.WALLET_SEND_CHANGE_TO_LIGHTNING

@sendChangeToLightning.setter
def sendChangeToLightning(self, sendChangeToLightning):
if sendChangeToLightning != self.config.WALLET_SEND_CHANGE_TO_LIGHTNING:
self.config.WALLET_SEND_CHANGE_TO_LIGHTNING = sendChangeToLightning
self.sendChangeToLightningChanged.emit()

@pyqtSlot('qint64', result=str)
@pyqtSlot(QEAmount, result=str)
def formatSatsForEditing(self, satoshis):
Expand Down
Loading