Browse Source

qml: don't implicitly send_onchain from ConfirmTxDialog, externalize

patch-4
Sander van Grieken 3 years ago
parent
commit
3dffd3e0b5
  1. 3
      electrum/gui/qml/components/ConfirmTxDialog.qml
  2. 3
      electrum/gui/qml/components/OpenChannel.qml
  3. 4
      electrum/gui/qml/components/Send.qml

3
electrum/gui/qml/components/ConfirmTxDialog.qml

@ -252,9 +252,6 @@ ElDialog {
enabled: finalizer.valid enabled: finalizer.valid
onClicked: { onClicked: {
txaccepted() txaccepted()
if (!Daemon.currentWallet.isWatchOnly) {
finalizer.send_onchain()
}
dialog.close() dialog.close()
} }
} }

3
electrum/gui/qml/components/OpenChannel.qml

@ -180,6 +180,9 @@ Pane {
var dialog = confirmOpenChannelDialog.createObject(root, { var dialog = confirmOpenChannelDialog.createObject(root, {
'satoshis': channelopener.amount 'satoshis': channelopener.amount
}) })
dialog.txaccepted.connect(function() {
dialog.finalizer.send_onchain()
})
dialog.open() dialog.open()
} }
onChannelOpening: { onChannelOpening: {

4
electrum/gui/qml/components/Send.qml

@ -171,6 +171,8 @@ Pane {
rootItem.clear() rootItem.clear()
if (Daemon.currentWallet.isWatchOnly) { if (Daemon.currentWallet.isWatchOnly) {
showUnsignedTx(dialog.finalizer.serializedTx()) showUnsignedTx(dialog.finalizer.serializedTx())
} else {
dialog.finalizer.send_onchain()
} }
}) })
dialog.open() dialog.open()
@ -281,6 +283,8 @@ Pane {
dialog.txaccepted.connect(function() { dialog.txaccepted.connect(function() {
if (Daemon.currentWallet.isWatchOnly) { if (Daemon.currentWallet.isWatchOnly) {
showUnsignedTx(dialog.finalizer.serializedTx()) showUnsignedTx(dialog.finalizer.serializedTx())
} else {
dialog.finalizer.send_onchain()
} }
}) })
dialog.open() dialog.open()

Loading…
Cancel
Save