Browse Source

qml: (clarity) use separate slots for sign and sign_and_broadcast.

master
ThomasV 3 years ago
parent
commit
f396d15146
  1. 7
      electrum/gui/qml/components/TxDetails.qml
  2. 10
      electrum/gui/qml/qetxdetails.py

7
electrum/gui/qml/components/TxDetails.qml

@ -460,11 +460,10 @@ Pane {
wallet: Daemon.currentWallet wallet: Daemon.currentWallet
txid: dialog.txid txid: dialog.txid
} }
onTxaccepted: { onTxaccepted: {
root.rawtx = rbffeebumper.getNewTx() root.rawtx = rbffeebumper.getNewTx()
if (txdetails.wallet.canSignWithoutCosigner) { if (txdetails.wallet.canSignWithoutCosigner) {
txdetails.sign(true) txdetails.sign_and_broadcast()
// close txdetails? // close txdetails?
} else { } else {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
@ -491,7 +490,7 @@ Pane {
// replaces parent tx with cpfp tx // replaces parent tx with cpfp tx
root.rawtx = cpfpfeebumper.getNewTx() root.rawtx = cpfpfeebumper.getNewTx()
if (txdetails.wallet.canSignWithoutCosigner) { if (txdetails.wallet.canSignWithoutCosigner) {
txdetails.sign(true) txdetails.sign_and_broadcast()
// close txdetails? // close txdetails?
} else { } else {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
@ -517,7 +516,7 @@ Pane {
onTxaccepted: { onTxaccepted: {
root.rawtx = txcanceller.getNewTx() root.rawtx = txcanceller.getNewTx()
if (txdetails.wallet.canSignWithoutCosigner) { if (txdetails.wallet.canSignWithoutCosigner) {
txdetails.sign(true) txdetails.sign_and_broadcast()
// close txdetails? // close txdetails?
} else { } else {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {

10
electrum/gui/qml/qetxdetails.py

@ -299,8 +299,14 @@ class QETxDetails(QObject, QtEventListener):
self._short_id = tx_mined_info.short_id() or "" self._short_id = tx_mined_info.short_id() or ""
@pyqtSlot() @pyqtSlot()
@pyqtSlot(bool) def sign_and_broadcast(self):
def sign(self, broadcast = False): self._sign(broadcast=True)
@pyqtSlot()
def sign(self):
self._sign(broadcast=False)
def _sign(self, broadcast):
# TODO: connecting/disconnecting signal handlers here is hmm # TODO: connecting/disconnecting signal handlers here is hmm
try: try:
self._wallet.transactionSigned.disconnect(self.onSigned) self._wallet.transactionSigned.disconnect(self.onSigned)

Loading…
Cancel
Save