AaronFiore/electrum
1
0
Fork 0
Code Activity

fix request_status callback not passing the correct request key

Browse Source
This commit is contained in:
Sander van Grieken
2022-09-22 11:54:14 +02:00
parent 79bcedd064
commit 5681311fc2
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/gui/qml/qeinvoicelistmodel.py
View File

@@ -155,7 +155,7 @@ class QERequestListModel(QEAbstractInvoiceListModel):
def invoice_to_model(self, invoice: Invoice): def invoice_to_model(self, invoice: Invoice):
item = super().invoice_to_model(invoice) item = super().invoice_to_model(invoice)
item['type'] = 'request' item['type'] = 'request'
item['key'] = invoice.get_id() if invoice.is_lightning() else invoice.get_address() item['key'] = invoice.get_id()
return item return item

3
electrum/gui/qml/qerequestdetails.py
View File

@@ -67,8 +67,7 @@ class QERequestDetails(QObject):
req = self._wallet.wallet.get_request(self._key) req = self._wallet.wallet.get_request(self._key)
return self._wallet.wallet.get_invoice_status(req) return self._wallet.wallet.get_invoice_status(req)
statusStringChanged = pyqtSignal() @pyqtProperty(str, notify=statusChanged)
@pyqtProperty(str, notify=statusStringChanged)
def status_str(self): def status_str(self):
return self._req.get_status_str(self.status) return self._req.get_status_str(self.status)

2
electrum/wallet.py
View File

@@ -2446,7 +2446,7 @@ class Abstract_Wallet(ABC, Logger, EventListener):
addr = txo.address addr = txo.address
if request:=self.get_request_by_addr(addr): if request:=self.get_request_by_addr(addr):
status = self.get_invoice_status(request) status = self.get_invoice_status(request)
util.trigger_callback('request_status', self, addr, status) util.trigger_callback('request_status', self, request.get_id(), status)
for invoice_key in self._invoices_from_scriptpubkey_map.get(txo.scriptpubkey, set()): for invoice_key in self._invoices_from_scriptpubkey_map.get(txo.scriptpubkey, set()):
relevant_invoice_keys.add(invoice_key) relevant_invoice_keys.add(invoice_key)
self._update_onchain_invoice_paid_detection(relevant_invoice_keys) self._update_onchain_invoice_paid_detection(relevant_invoice_keys)