AaronFiore/electrum
1
0
Fork 0
Code Activity

fix "max" button to account for 2fa fees in both Qt and kivy

Browse Source
This commit is contained in:
SomberNight
2018-06-08 18:45:20 +02:00
committed by ThomasV
parent cf80952071
commit 1b36dd7690
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/kivy/main_window.py
View File

@@ -694,6 +694,8 @@ class ElectrumWindow(App):
self.fiat_balance = self.fx.format_amount(c+u+x) + ' [size=22dp]%s[/size]'% self.fx.ccy
def get_max_amount(self):
if run_hook('abort_send', self):
return ''
inputs = self.wallet.get_spendable_coins(None, self.electrum_config)
if not inputs:
return ''
@@ -705,7 +707,9 @@ class ElectrumWindow(App):
Clock.schedule_once(lambda dt, bound_e=e: self.show_error(str(bound_e)))
return ''
amount = tx.output_value()
return format_satoshis_plain(amount, self.decimal_point())
__, x_fee_amount = run_hook('get_tx_extra_fee', self.wallet, tx) or (None, 0)
amount_after_all_fees = amount - x_fee_amount
return format_satoshis_plain(amount_after_all_fees, self.decimal_point())
def format_amount(self, x, is_diff=False, whitespaces=False):
return format_satoshis(x, 0, self.decimal_point(), is_diff=is_diff, whitespaces=whitespaces)