AaronFiore/electrum
1
0
Fork 0
Code Activity

the invoice/request key issue is annoying

Browse Source
This commit is contained in:
Sander van Grieken
2022-06-03 21:23:43 +02:00
parent 3fd33169f5
commit d7c8a1592e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ class QEAbstractInvoiceListModel(QAbstractListModel):
def invoice_to_model(self, invoice: Invoice): def invoice_to_model(self, invoice: Invoice):
item = self.get_invoice_as_dict(invoice) item = self.get_invoice_as_dict(invoice)
item['key'] = invoice.get_id() #item['key'] = invoice.get_id()
item['is_lightning'] = invoice.is_lightning() item['is_lightning'] = invoice.is_lightning()
if invoice.is_lightning() and 'address' not in item: if invoice.is_lightning() and 'address' not in item:
item['address'] = '' item['address'] = ''
@@ -132,6 +132,7 @@ class QEInvoiceListModel(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'] = 'invoice' item['type'] = 'invoice'
item['key'] = invoice.get_id()
return item return item
@@ -150,9 +151,10 @@ class QERequestListModel(QEAbstractInvoiceListModel):
_logger = get_logger(__name__) _logger = get_logger(__name__)
def invoice_to_model(self, req: Invoice): def invoice_to_model(self, invoice: Invoice):
item = super().invoice_to_model(req) 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()
return item return item
@@ -162,8 +164,8 @@ class QERequestListModel(QEAbstractInvoiceListModel):
def get_invoice_for_key(self, key: str): def get_invoice_for_key(self, key: str):
return self.wallet.get_request(key) return self.wallet.get_request(key)
def get_invoice_as_dict(self, req: Invoice): def get_invoice_as_dict(self, invoice: Invoice):
return self.wallet.export_request(req) return self.wallet.export_request(invoice)
@pyqtSlot(str, int) @pyqtSlot(str, int)
def updateRequest(self, key, status): def updateRequest(self, key, status):