AaronFiore/electrum
1
0
Fork 0
Code Activity

kivy: improve openchannel dialog for trampoline

Browse Source
This commit is contained in:
bitromortac
2021-04-30 09:03:32 +02:00
parent 2b05615995
commit 97b31880d7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/gui/kivy/uix/dialogs/lightning_open_channel.py
View File

@@ -10,7 +10,7 @@ from electrum.util import bh2u
from electrum.bitcoin import COIN from electrum.bitcoin import COIN
import electrum.simple_config as config import electrum.simple_config as config
from electrum.logging import Logger from electrum.logging import Logger
from electrum.lnutil import ln_dummy_address, extract_nodeid from electrum.lnutil import ln_dummy_address, extract_nodeid, ConnStringFormatError
from .label_dialog import LabelDialog from .label_dialog import LabelDialog
from .confirm_tx_dialog import ConfirmTxDialog from .confirm_tx_dialog import ConfirmTxDialog
@@ -76,11 +76,13 @@ Builder.load_string('''
size_hint: 0.5, None size_hint: 0.5, None
height: '48dp' height: '48dp'
on_release: s.do_paste() on_release: s.do_paste()
disabled: not app.use_gossip
IconButton: IconButton:
icon: f'atlas://{KIVY_GUI_PATH}/theming/light/camera' icon: f'atlas://{KIVY_GUI_PATH}/theming/light/camera'
size_hint: 0.5, None size_hint: 0.5, None
height: '48dp' height: '48dp'
on_release: app.scan_qr(on_complete=s.on_qr) on_release: app.scan_qr(on_complete=s.on_qr)
disabled: not app.use_gossip
Button: Button:
text: _('Suggest') text: _('Suggest')
size_hint: 1, None size_hint: 1, None
@@ -180,7 +182,11 @@ class LightningOpenChannelDialog(Factory.Popup, Logger):
amount = '!' if self.is_max else self.app.get_amount(self.amount) amount = '!' if self.is_max else self.app.get_amount(self.amount)
self.dismiss() self.dismiss()
lnworker = self.app.wallet.lnworker lnworker = self.app.wallet.lnworker
node_id, rest = extract_nodeid(conn_str) try:
node_id, rest = extract_nodeid(conn_str)
except ConnStringFormatError as e:
self.app.show_error(_('Problem opening channel: ') + '\n' + str(e))
return
if lnworker.has_conflicting_backup_with(node_id): if lnworker.has_conflicting_backup_with(node_id):
msg = messages.MGS_CONFLICTING_BACKUP_INSTANCE msg = messages.MGS_CONFLICTING_BACKUP_INSTANCE
d = Question(msg, lambda x: self._open_channel(x, conn_str, amount)) d = Question(msg, lambda x: self._open_channel(x, conn_str, amount))