tx window: let prent do the broadcast
This commit is contained in:
parent
26d133c20a
commit
d9db7771f9
|
@ -843,7 +843,6 @@ class ElectrumWindow(QMainWindow):
|
||||||
if label:
|
if label:
|
||||||
self.wallet.set_label(tx.hash(), label)
|
self.wallet.set_label(tx.hash(), label)
|
||||||
|
|
||||||
if not self.gui_object.payment_request:
|
|
||||||
if not tx.is_complete() or self.config.get('show_before_broadcast'):
|
if not tx.is_complete() or self.config.get('show_before_broadcast'):
|
||||||
self.show_transaction(tx)
|
self.show_transaction(tx)
|
||||||
self.do_clear()
|
self.do_clear()
|
||||||
|
|
|
@ -80,7 +80,8 @@ class TxDialog(QDialog):
|
||||||
buttons.addWidget(b)
|
buttons.addWidget(b)
|
||||||
|
|
||||||
self.broadcast_button = b = QPushButton(_("Broadcast"))
|
self.broadcast_button = b = QPushButton(_("Broadcast"))
|
||||||
b.clicked.connect(self.broadcast)
|
b.clicked.connect(lambda: self.parent.broadcast_transaction(self.tx))
|
||||||
|
|
||||||
b.hide()
|
b.hide()
|
||||||
buttons.addWidget(b)
|
buttons.addWidget(b)
|
||||||
|
|
||||||
|
@ -214,14 +215,6 @@ class TxDialog(QDialog):
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def broadcast(self):
|
|
||||||
result, result_message = self.wallet.sendtx( self.tx )
|
|
||||||
if result:
|
|
||||||
self.show_message(_("Transaction successfully sent")+': %s' % (result_message))
|
|
||||||
else:
|
|
||||||
self.show_message(_("There was a problem sending your transaction:") + '\n %s' % (result_message))
|
|
||||||
|
|
||||||
def show_message(self, msg):
|
def show_message(self, msg):
|
||||||
QMessageBox.information(self, _('Message'), msg, _('OK'))
|
QMessageBox.information(self, _('Message'), msg, _('OK'))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue