AaronFiore/electrum
1
0
Fork 0
Code Activity

minor: use wallet.has_lightning()

Browse Source
This commit is contained in:
ThomasV
2020-06-22 16:48:14 +02:00
parent 599797c966
commit d870778a1b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,7 +487,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
def load_wallet(self, wallet): def load_wallet(self, wallet):
wallet.thread = TaskThread(self, self.on_error) wallet.thread = TaskThread(self, self.on_error)
self.update_recently_visited(wallet.storage.path) self.update_recently_visited(wallet.storage.path)
if wallet.lnworker: if wallet.has_lightning():
util.trigger_callback('channels_updated', wallet) util.trigger_callback('channels_updated', wallet)
self.need_update.set() self.need_update.set()
# Once GUI has been initialized check if we want to announce something since the callback has been called before the GUI was initialized # Once GUI has been initialized check if we want to announce something since the callback has been called before the GUI was initialized
@@ -597,7 +597,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
backup_dir = self.config.get('backup_dir') backup_dir = self.config.get('backup_dir')
backup_dir_label = HelpLabel(_('Backup directory') + ':', backup_help) backup_dir_label = HelpLabel(_('Backup directory') + ':', backup_help)
msg = _('Please select a backup directory') msg = _('Please select a backup directory')
if self.wallet.lnworker and self.wallet.lnworker.channels: if self.wallet.has_lightning() and self.wallet.lnworker.channels:
msg += '\n\n' + ' '.join([ msg += '\n\n' + ' '.join([
_("Note that lightning channels will be converted to channel backups."), _("Note that lightning channels will be converted to channel backups."),
_("You cannot use channel backups to perform lightning payments."), _("You cannot use channel backups to perform lightning payments."),
@@ -962,10 +962,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
text += " [%s unconfirmed]"%(self.format_amount(u, is_diff=True).strip()) text += " [%s unconfirmed]"%(self.format_amount(u, is_diff=True).strip())
if x: if x:
text += " [%s unmatured]"%(self.format_amount(x, is_diff=True).strip()) text += " [%s unmatured]"%(self.format_amount(x, is_diff=True).strip())
if self.wallet.lnworker: if self.wallet.has_lightning():
l = self.wallet.lnworker.get_balance() l = self.wallet.lnworker.get_balance()
text += u' \U0001f5f2 %s'%(self.format_amount_and_units(l).strip()) text += u' \U0001f5f2 %s'%(self.format_amount_and_units(l).strip())
# append fiat balance and price # append fiat balance and price
if self.fx.is_enabled(): if self.fx.is_enabled():
text += self.fx.get_fiat_status_text(c + u + x, text += self.fx.get_fiat_status_text(c + u + x,
@@ -1520,7 +1519,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
invoice_str = self.payto_e.lightning_invoice invoice_str = self.payto_e.lightning_invoice
if not invoice_str: if not invoice_str:
return return
if not self.wallet.lnworker: if not self.wallet.has_lightning():
self.show_error(_('Lightning is disabled')) self.show_error(_('Lightning is disabled'))
return return
invoice = LNInvoice.from_bech32(invoice_str) invoice = LNInvoice.from_bech32(invoice_str)