AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9824 from accumulator/qml_bip21_request_if_label_or_amount

Browse Source 
invoices: only skip generating BIP21 URI for payment request if both …
This commit is contained in:
ThomasV
2025-05-28 11:05:34 +02:00
committed by GitHub
parent 04da854291 acaaaa00ca
commit fb9e300165
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,8 +4,9 @@ from typing import Optional
from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QTimer, pyqtEnum from PyQt6.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QTimer, pyqtEnum
from electrum.logging import get_logger from electrum.logging import get_logger
from electrum.invoices import (PR_UNPAID, PR_EXPIRED, PR_UNKNOWN, PR_PAID, PR_INFLIGHT, from electrum.invoices import (
PR_FAILED, PR_ROUTING, PR_UNCONFIRMED, LN_EXPIRY_NEVER) PR_UNPAID, PR_EXPIRED, PR_UNKNOWN, PR_PAID, PR_INFLIGHT, PR_FAILED, PR_ROUTING, PR_UNCONFIRMED, LN_EXPIRY_NEVER
)
from electrum.lnutil import MIN_FUNDING_SAT from electrum.lnutil import MIN_FUNDING_SAT
from .qewallet import QEWallet from .qewallet import QEWallet

7
electrum/invoices.py
View File

@@ -344,10 +344,11 @@ class Request(BaseInvoice):
) -> Optional[str]: ) -> Optional[str]:
addr = self.get_address() addr = self.get_address()
amount = self.get_amount_sat() amount = self.get_amount_sat()
if amount is None:
return
amount = int(amount)
message = self.message message = self.message
if amount is None and not message:
return
if amount:
amount = int(amount)
extra = {} extra = {}
if self.time and self.exp: if self.time and self.exp:
extra['time'] = str(int(self.time)) extra['time'] = str(int(self.time))