AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9784 from f321x/allow_lnaddress_contacts

Browse Source 
qt: allow lightning addresses in contacts
This commit is contained in:
ThomasV
2025-05-15 19:09:48 +02:00
committed by GitHub
parent 6500788328 b6e1e527c2
commit 626264d24f
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/qt/contact_list.py
View File

@@ -34,6 +34,7 @@ from electrum.i18n import _
from electrum.bitcoin import is_address
from electrum.util import block_explorer_URL
from electrum.plugin import run_hook
from electrum.gui.qt.util import read_QIcon
from .util import webopen
from .my_treeview import MyTreeView
@@ -118,6 +119,9 @@ class ContactList(MyTreeView):
items[self.Columns.NAME].setEditable(contact_type != 'openalias')
items[self.Columns.ADDRESS].setEditable(False)
items[self.Columns.NAME].setData(key, self.ROLE_CONTACT_KEY)
items[self.Columns.NAME].setIcon(
read_QIcon("lightning" if contact_type == 'lnaddress' else "bitcoin")
)
row_count = self.model().rowCount()
self.model().insertRow(row_count, items)
if key == current_key:

15
electrum/gui/qt/main_window.py
View File

@@ -54,8 +54,10 @@ from electrum.bitcoin import COIN, is_address, DummyAddress
from electrum.plugin import run_hook
from electrum.i18n import _
from electrum.util import (format_time, UserCancelled, profiler, bfh, InvalidPassword,
UserFacingException, get_new_wallet_name, send_exception_to_crash_reporter,
AddTransactionException, os_chmod, UI_UNIT_NAME_TXSIZE_VBYTES, ChoiceItem)
UserFacingException, get_new_wallet_name,
send_exception_to_crash_reporter,
AddTransactionException, os_chmod, UI_UNIT_NAME_TXSIZE_VBYTES,
is_valid_email, ChoiceItem)
from electrum.bip21 import BITCOIN_BIP21_URI_SCHEME
from electrum.payment_identifier import PaymentIdentifier
from electrum.invoices import PR_PAID, Invoice
@@ -1614,11 +1616,12 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
self.send_tab.payto_contacts(labels)
def set_contact(self, label, address):
if not is_address(address):
if not (is_address(address) or is_valid_email(address)): # email = lightning address
self.show_error(_('Invalid Address'))
self.contact_list.update() # Displays original unchanged value
return False
self.contacts[address] = ('address', label)
address_type = 'address' if is_address(address) else 'lnaddress'
self.contacts[address] = (address_type, label)
self.contact_list.update()
self.history_list.update()
self.update_completions()
@@ -2008,7 +2011,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
line1.setFixedWidth(32 * char_width_in_lineedit())
line2 = QLineEdit()
line2.setFixedWidth(32 * char_width_in_lineedit())
grid.addWidget(QLabel(_("Address")), 1, 0)
address_label = QLabel(_("Address"))
address_label.setToolTip(_("Bitcoin- or Lightning address"))
grid.addWidget(address_label, 1, 0)
grid.addWidget(line1, 1, 1)
grid.addWidget(QLabel(_("Name")), 2, 0)
grid.addWidget(line2, 2, 1)

2
electrum/gui/qt/send_tab.py
View File

@@ -801,7 +801,7 @@ class SendTab(QWidget, MessageBoxMixin, Logger):
def payto_contacts(self, labels):
paytos = [self.window.get_contact_payto(label) for label in labels]
self.window.show_send_tab()
self.payto_e.do_clear()
self.do_clear()
if len(paytos) == 1:
self.logger.debug('payto_e setText 1')
self.payto_e.setText(paytos[0])