AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: factor out "what key to use for invoice"

Browse Source 
fix: qt request list was not using the correct key
This commit is contained in:
SomberNight
2021-03-12 17:29:54 +01:00
parent 1a4e55a911
commit 897f90d6e8
4 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/gui/qt/invoice_list.py
View File

@@ -99,11 +99,10 @@ class InvoiceList(MyTreeView):
self.std_model.clear()
self.update_headers(self.__class__.headers)
for idx, item in enumerate(self.parent.wallet.get_unpaid_invoices()):
key = self.parent.wallet.get_key_for_outgoing_invoice(item)
if item.is_lightning():
key = item.rhash
icon_name = 'lightning.png'
else:
key = item.id
icon_name = 'bitcoin.png'
if item.bip70:
icon_name = 'seal.png'

11
electrum/gui/qt/request_list.py
View File

@@ -148,12 +148,7 @@ class RequestList(MyTreeView):
self.std_model.clear()
self.update_headers(self.__class__.headers)
for req in self.wallet.get_unpaid_requests():
if req.is_lightning():
assert isinstance(req, LNInvoice)
key = req.rhash
else:
assert isinstance(req, OnchainInvoice)
key = req.id
key = self.wallet.get_key_for_receive_request(req)
status = self.parent.wallet.get_request_status(key)
status_str = req.get_status_str(status)
request_type = req.type
@@ -164,13 +159,9 @@ class RequestList(MyTreeView):
amount_str = self.parent.format_amount(amount) if amount else ""
labels = [date, message, amount_str, status_str]
if req.is_lightning():
assert isinstance(req, LNInvoice)
key = req.rhash
icon = read_QIcon("lightning.png")
tooltip = 'lightning request'
else:
assert isinstance(req, OnchainInvoice)
key = req.get_address()
icon = read_QIcon("bitcoin.png")
tooltip = 'onchain request'
items = [QStandardItem(e) for e in labels]