From 26cc1b83084e38c07b07a5623584e790ebe6b21b Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 3 Mar 2023 15:34:36 +0000 Subject: [PATCH] follow-up invoice changes: fix qt lightning_tx_dialog follow-up 719b468eee8b3e13680f6e7b90194d618181fe0c Traceback (most recent call last): File "...\electrum\electrum\gui\qt\history_list.py", line 673, in mouseDoubleClickEvent self.parent.show_lightning_transaction(tx_item) File "...\electrum\electrum\gui\qt\main_window.py", line 1082, in show_lightning_transaction d = LightningTxDialog(self, tx_item) File "...\electrum\electrum\gui\qt\lightning_tx_dialog.py", line 60, in __init__ self.invoice = invoice.lightning_invoice AttributeError: 'Request' object has no attribute 'lightning_invoice' --- electrum/gui/qt/lightning_tx_dialog.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/electrum/gui/qt/lightning_tx_dialog.py b/electrum/gui/qt/lightning_tx_dialog.py index e51411796..34a9ffacf 100644 --- a/electrum/gui/qt/lightning_tx_dialog.py +++ b/electrum/gui/qt/lightning_tx_dialog.py @@ -32,6 +32,7 @@ from PyQt5.QtWidgets import QVBoxLayout, QLabel, QGridLayout from electrum.i18n import _ from electrum.lnworker import PaymentDirection +from electrum.invoices import Invoice from .util import WindowModalDialog, ShowQRLineEdit, ColorScheme, Buttons, CloseButton, font_height from .qrtextedit import ShowQRTextEdit @@ -53,13 +54,11 @@ class LightningTxDialog(WindowModalDialog): self.amount = Decimal(tx_item['amount_msat']) / 1000 self.payment_hash = tx_item['payment_hash'] self.preimage = tx_item['preimage'] - invoice = (self.parent.wallet.get_invoice(self.payment_hash) - or self.parent.wallet.get_request(self.payment_hash)) + self.invoice = "" + invoice = self.parent.wallet.get_invoice(self.payment_hash) # only check outgoing invoices if invoice: assert invoice.is_lightning(), f"{self.invoice!r}" self.invoice = invoice.lightning_invoice - else: - self.invoice = '' self.setMinimumWidth(700) vbox = QVBoxLayout() self.setLayout(vbox) @@ -78,9 +77,10 @@ class LightningTxDialog(WindowModalDialog): vbox.addWidget(QLabel(_("Preimage") + ":")) self.preimage_e = ShowQRLineEdit(self.preimage, self.config, title=_("Preimage")) vbox.addWidget(self.preimage_e) - vbox.addWidget(QLabel(_("Lightning Invoice") + ":")) - self.invoice_e = ShowQRTextEdit(self.invoice, config=self.config) - self.invoice_e.setMaximumHeight(max(150, 10 * font_height())) - self.invoice_e.addCopyButton() - vbox.addWidget(self.invoice_e) + if self.invoice: + vbox.addWidget(QLabel(_("Lightning Invoice") + ":")) + self.invoice_e = ShowQRTextEdit(self.invoice, config=self.config) + self.invoice_e.setMaximumHeight(max(150, 10 * font_height())) + self.invoice_e.addCopyButton() + vbox.addWidget(self.invoice_e) vbox.addLayout(Buttons(CloseButton(self)))