LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

qt CPFP: handle empty fee field

Browse source 
fixes #5875
This commit is contained in:
SomberNight 2020-01-07 17:59:17 +01:00
parent 1059191ebc
commit 29cf01524a
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
electrum/gui/qt/main_window.py
View file

@ -2908,10 +2908,13 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
combined_fee = QLabel('') combined_fee = QLabel('')
combined_feerate = QLabel('') combined_feerate = QLabel('')
def on_fee_edit(x): def on_fee_edit(x):
out_amt = max_fee - fee_e.get_amount() fee_for_child = fee_e.get_amount()
if fee_for_child is None:
return
out_amt = max_fee - fee_for_child
out_amt_str = (self.format_amount(out_amt) + ' ' + self.base_unit()) if out_amt else '' out_amt_str = (self.format_amount(out_amt) + ' ' + self.base_unit()) if out_amt else ''
output_amount.setText(out_amt_str) output_amount.setText(out_amt_str)
comb_fee = parent_fee + fee_e.get_amount() comb_fee = parent_fee + fee_for_child
comb_fee_str = (self.format_amount(comb_fee) + ' ' + self.base_unit()) if comb_fee else '' comb_fee_str = (self.format_amount(comb_fee) + ' ' + self.base_unit()) if comb_fee else ''
combined_fee.setText(comb_fee_str) combined_fee.setText(comb_fee_str)
comb_feerate = comb_fee / total_size * 1000 comb_feerate = comb_fee / total_size * 1000
@ -2946,6 +2949,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
if not d.exec_(): if not d.exec_():
return return
fee = fee_e.get_amount() fee = fee_e.get_amount()
if fee is None:
return # fee left empty, treat is as "cancel"
if fee > max_fee: if fee > max_fee:
self.show_error(_('Max fee exceeded')) self.show_error(_('Max fee exceeded'))
return return