LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 07:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor qt send tab fixes. notably 'send max' was broken

Browse source 
follow-up aaed594772
This commit is contained in:
SomberNight 2019-09-16 02:54:32 +02:00
parent 5e04f084b7
commit 0b87ce426f
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -148,6 +148,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
self.app = gui_object.app self.app = gui_object.app
self.cleaned_up = False self.cleaned_up = False
self.payment_request = None # type: Optional[paymentrequest.PaymentRequest] self.payment_request = None # type: Optional[paymentrequest.PaymentRequest]
self.payto_URI = None
self.checking_accounts = False self.checking_accounts = False
self.qr_window = None self.qr_window = None
self.not_enough_funds = False self.not_enough_funds = False
@ -1734,9 +1735,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
elif invoice['type'] == PR_TYPE_ONCHAIN: elif invoice['type'] == PR_TYPE_ONCHAIN:
message = invoice['message'] message = invoice['message']
outputs = invoice['outputs'] outputs = invoice['outputs']
amount = sum(map(lambda x:x[2], outputs))
else: else:
raise Exception('unknowwn invoicce type') raise Exception('unknown invoice type')
if run_hook('abort_send', self): if run_hook('abort_send', self):
return return
@ -1760,7 +1760,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
self.show_message(str(e)) self.show_message(str(e))
return return
amount = tx.output_value() if self.max_button.isChecked() else sum(map(lambda x:x[2], outputs)) amount = tx.output_value() if self.max_button.isChecked() else sum(map(lambda x: x.value, outputs))
fee = tx.get_fee() fee = tx.get_fee()
use_rbf = bool(self.config.get('use_rbf', True)) use_rbf = bool(self.config.get('use_rbf', True))

6
electrum/util.py
View file

@ -585,12 +585,14 @@ def format_satoshis_plain(x, decimal_point = 8):
return "{:.8f}".format(Decimal(x) / scale_factor).rstrip('0').rstrip('.') return "{:.8f}".format(Decimal(x) / scale_factor).rstrip('0').rstrip('.')
DECIMAL_POINT = localeconv()['decimal_point'] DECIMAL_POINT = localeconv()['decimal_point'] # type: str
def format_satoshis(x, num_zeros=0, decimal_point=8, precision=None, is_diff=False, whitespaces=False): def format_satoshis(x, num_zeros=0, decimal_point=8, precision=None, is_diff=False, whitespaces=False) -> str:
if x is None: if x is None:
return 'unknown' return 'unknown'
if x == '!':
return 'max'
if precision is None: if precision is None:
precision = decimal_point precision = decimal_point
# format string # format string

7
electrum/wallet.py
View file

@ -512,8 +512,11 @@ class Abstract_Wallet(AddressSynchronizer):
'txpos_in_block': hist_item.tx_mined_status.txpos, 'txpos_in_block': hist_item.tx_mined_status.txpos,
} }
def create_invoice(self, outputs, message, pr, URI): def create_invoice(self, outputs: List[TxOutput], message, pr, URI):
amount = sum(x[2] for x in outputs) if '!' in (x.value for x in outputs):
amount = '!'
else:
amount = sum(x.value for x in outputs)
invoice = { invoice = {
'type': PR_TYPE_ONCHAIN, 'type': PR_TYPE_ONCHAIN,
'message': message, 'message': message,