qml: don't implicitly send_onchain from ConfirmTxDialog, externalize

3 years ago · 3dffd3e0b5
3 changed files with 7 additions and 3 deletions
--- a/electrum/gui/qml/components/ConfirmTxDialog.qml
+++ b/electrum/gui/qml/components/ConfirmTxDialog.qml
@ -252,9 +252,6 @@ ElDialog {
                enabled: finalizer.valid
                onClicked: {
                    txaccepted()
-                    if (!Daemon.currentWallet.isWatchOnly) {
-                        finalizer.send_onchain()
-                    }
                    dialog.close()
                }
            }
--- a/electrum/gui/qml/components/OpenChannel.qml
+++ b/electrum/gui/qml/components/OpenChannel.qml
@ -180,6 +180,9 @@ Pane {
            var dialog = confirmOpenChannelDialog.createObject(root, {
                'satoshis': channelopener.amount
            })
+            dialog.txaccepted.connect(function() {
+                dialog.finalizer.send_onchain()
+            })
            dialog.open()
        }
        onChannelOpening: {
--- a/electrum/gui/qml/components/Send.qml
+++ b/electrum/gui/qml/components/Send.qml
@ -171,6 +171,8 @@ Pane {
                        rootItem.clear()
                        if (Daemon.currentWallet.isWatchOnly) {
                            showUnsignedTx(dialog.finalizer.serializedTx())
+                        } else {
+                            dialog.finalizer.send_onchain()
                        }
                    })
                    dialog.open()
@ -281,6 +283,8 @@ Pane {
                    dialog.txaccepted.connect(function() {
                        if (Daemon.currentWallet.isWatchOnly) {
                            showUnsignedTx(dialog.finalizer.serializedTx())
+                        } else {
+                            dialog.finalizer.send_onchain()
                        }
                    })
                    dialog.open()