lightning: GUI improvements

electrum/gui/qt/channels_list.py

@@ -90,7 +90,7 @@ class ChannelsList(MyTreeView):
     @QtCore.pyqtSlot()
     def do_update_rows(self):
         self.model().clear()
-        self.update_headers([_('Node ID'), _('Balance'), _('Remote'), _('Status')])
+        self.update_headers([_('Node ID'), _('Local'), _('Remote'), _('Status')])
         for chan in self.parent.wallet.lnworker.channels.values():
             items = [QtGui.QStandardItem(x) for x in self.format_fields(chan)]
             items[0].setData(chan.channel_id, QtCore.Qt.UserRole)

electrum/gui/qt/history_list.py

@@ -81,8 +81,8 @@ class HistoryColumns(IntEnum):
     STATUS = 0
     DESCRIPTION = 1
     AMOUNT = 2
-    LN_AMOUNT = 3
+    BALANCE = 3
-    BALANCE = 4
+    LN_AMOUNT = 4
     LN_BALANCE = 5
     FIAT_VALUE = 6
     FIAT_ACQ_PRICE = 7
@@ -390,9 +390,9 @@ class HistoryModel(QAbstractItemModel, Logger):
             HistoryColumns.STATUS: _('Date'),
             HistoryColumns.DESCRIPTION: _('Description'),
             HistoryColumns.AMOUNT: _('Amount'),
-            HistoryColumns.LN_AMOUNT: u'\U0001f5f2',
+            HistoryColumns.LN_AMOUNT: u'\U0001f5f2 ' + _('Amount'),
             HistoryColumns.BALANCE: _('Balance'),
-            HistoryColumns.LN_BALANCE: u'\U0001f5f2',
+            HistoryColumns.LN_BALANCE: u'\U0001f5f2 ' + _('Balance'),
             HistoryColumns.FIAT_VALUE: fiat_title,
             HistoryColumns.FIAT_ACQ_PRICE: fiat_acq_title,
             HistoryColumns.FIAT_CAP_GAINS: fiat_cg_title,

electrum/lnworker.py

@@ -346,7 +346,7 @@ class LNWallet(LNWorker):
                 'txid': closing_txid,
                 'label': _('Close channel'),
                 'type': 'channel_closure',
-                'amount_msat': -chan.balance(LOCAL),
+                'amount_msat': -chan.balance_minus_outgoing_htlcs(LOCAL),
                 'direction': 'sent',
                 'timestamp': closing_timestamp,
             }