AaronFiore/electrum
1
0
Fork 0
Code Activity

qt swap dialog: fix enabling OK button

Browse Source 
fixes #6831
This commit is contained in:
SomberNight
2020-12-09 08:20:46 +01:00
parent 6273b4808f
commit 2ebd844b31
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/gui/qt/swap_dialog.py
View File

@@ -34,7 +34,7 @@ class SwapDialog(WindowModalDialog):
self.lnworker = self.window.wallet.lnworker self.lnworker = self.window.wallet.lnworker
self.swap_manager = self.lnworker.swap_manager self.swap_manager = self.lnworker.swap_manager
self.network = window.network self.network = window.network
self.tx = None self.tx = None # for the forward-swap only
self.is_reverse = True self.is_reverse = True
vbox = QVBoxLayout(self) vbox = QVBoxLayout(self)
self.description_label = WWLabel(self.get_description()) self.description_label = WWLabel(self.get_description())
@@ -113,7 +113,6 @@ class SwapDialog(WindowModalDialog):
else: else:
self._spend_max_forward_swap() self._spend_max_forward_swap()
else: else:
self.tx = None
self.send_amount_e.setAmount(None) self.send_amount_e.setAmount(None)
self.update_fee() self.update_fee()
@@ -156,7 +155,8 @@ class SwapDialog(WindowModalDialog):
self.recv_amount_e.setStyleSheet(ColorScheme.BLUE.as_stylesheet()) self.recv_amount_e.setStyleSheet(ColorScheme.BLUE.as_stylesheet())
self.recv_amount_e.follows = False self.recv_amount_e.follows = False
self.send_follows = False self.send_follows = False
self.ok_button.setEnabled((recv_amount is not None) and (self.tx is not None)) self.ok_button.setEnabled((recv_amount is not None)
and (self.tx is not None or self.is_reverse))
def on_recv_edited(self): def on_recv_edited(self):
if self.recv_amount_e.follows: if self.recv_amount_e.follows:
@@ -171,7 +171,8 @@ class SwapDialog(WindowModalDialog):
self.send_amount_e.setStyleSheet(ColorScheme.BLUE.as_stylesheet()) self.send_amount_e.setStyleSheet(ColorScheme.BLUE.as_stylesheet())
self.send_amount_e.follows = False self.send_amount_e.follows = False
self.send_follows = True self.send_follows = True
self.ok_button.setEnabled((send_amount is not None) and (self.tx is not None)) self.ok_button.setEnabled((send_amount is not None)
and (self.tx is not None or self.is_reverse))
def update(self): def update(self):
sm = self.swap_manager sm = self.swap_manager
@@ -188,6 +189,7 @@ class SwapDialog(WindowModalDialog):
self.update_fee() self.update_fee()
def update_fee(self): def update_fee(self):
self.tx = None
is_max = self.max_button.isChecked() is_max = self.max_button.isChecked()
if self.is_reverse: if self.is_reverse:
if is_max: if is_max:
@@ -201,8 +203,8 @@ class SwapDialog(WindowModalDialog):
onchain_amount = self.send_amount_e.get_amount() onchain_amount = self.send_amount_e.get_amount()
self.update_tx(onchain_amount) self.update_tx(onchain_amount)
fee = self.tx.get_fee() if self.tx else None fee = self.tx.get_fee() if self.tx else None
if self.tx is None: if self.tx is None:
self.ok_button.setEnabled(False) self.ok_button.setEnabled(False)
fee_text = self.window.format_amount(fee) + ' ' + self.window.base_unit() if fee else '' fee_text = self.window.format_amount(fee) + ' ' + self.window.base_unit() if fee else ''
self.fee_label.setText(fee_text) self.fee_label.setText(fee_text)
self.fee_label.repaint() # macOS hack for #6269 self.fee_label.repaint() # macOS hack for #6269