Merge pull request spesmilo#7258 from bitromortac/2104-openchannel-7219

kivy: improve openchannel dialog for trampoline
reddingit · Apr 30, 2021 · 1e34b96 · 1e34b96
2 parents 7789497 + 97b3188
commit 1e34b96
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/electrum/gui/kivy/uix/dialogs/lightning_open_channel.py b/electrum/gui/kivy/uix/dialogs/lightning_open_channel.py
@@ -10,7 +10,7 @@
 from electrum.bitcoin import COIN
 import electrum.simple_config as config
 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 .confirm_tx_dialog import ConfirmTxDialog
@@ -76,11 +76,13 @@
                 size_hint: 0.5, None
                 height: '48dp'
                 on_release: s.do_paste()
+                disabled: not app.use_gossip
             IconButton:
                 icon: f'atlas://{KIVY_GUI_PATH}/theming/light/camera'
                 size_hint: 0.5, None
                 height: '48dp'
                 on_release: app.scan_qr(on_complete=s.on_qr)
+                disabled: not app.use_gossip
             Button:
                 text: _('Suggest')
                 size_hint: 1, None
@@ -180,7 +182,11 @@ def open_channel(self):
         amount = '!' if self.is_max else self.app.get_amount(self.amount)
         self.dismiss()
         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):
             msg = messages.MGS_CONFLICTING_BACKUP_INSTANCE
             d = Question(msg, lambda x: self._open_channel(x, conn_str, amount))