diff --git a/electrum/gui/kivy/uix/screens.py b/electrum/gui/kivy/uix/screens.py
index b9f37f58f..53c19a57d 100644
--- a/electrum/gui/kivy/uix/screens.py
+++ b/electrum/gui/kivy/uix/screens.py
@@ -113,7 +113,6 @@ class HistoryScreen(CScreen):
         timestamp = tx_item['timestamp']
         key = tx_item.get('txid') or tx_item['payment_hash']
         if is_lightning:
-            status = 0
             status_str = 'unconfirmed' if timestamp is None else format_time(int(timestamp))
             icon = f'atlas://{KIVY_GUI_PATH}/theming/atlas/light/lightning'
             message = tx_item['label']
@@ -122,7 +121,6 @@ class HistoryScreen(CScreen):
             fee_text = '' if fee is None else 'fee: %d sat'%fee
         else:
             tx_hash = tx_item['txid']
-            conf = tx_item['confirmations']
             tx_mined_info = TxMinedInfo(height=tx_item['height'],
                                         conf=tx_item['confirmations'],
                                         timestamp=tx_item['timestamp'])
@@ -141,9 +139,11 @@ class HistoryScreen(CScreen):
         value = tx_item['value'].value
         if value is not None:
             ri['is_mine'] = value <= 0
-            ri['amount'] = self.app.format_amount(value, is_diff = True)
+            ri['amount'] = self.app.format_amount(value, is_diff=True)
+            ri['base_unit'] = self.app.base_unit
             if 'fiat_value' in tx_item:
                 ri['quote_text'] = str(tx_item['fiat_value'])
+                ri['fx_ccy'] = tx_item['fiat_value'].ccy
         return ri
 
     def update(self, see_all=False):
diff --git a/electrum/gui/kivy/uix/ui_screens/history.kv b/electrum/gui/kivy/uix/ui_screens/history.kv
index 146a01374..a3449fff2 100644
--- a/electrum/gui/kivy/uix/ui_screens/history.kv
+++ b/electrum/gui/kivy/uix/ui_screens/history.kv
@@ -22,11 +22,12 @@
     is_mine: True
     amount: '--'
     amount_color: '#FF6657' if self.is_mine else '#2EA442'
-    confirmations: 0
     date: ''
     quote_text: ''
     amount_str: self.quote_text if app.is_fiat else self.amount
-    unit_str: app.fx.ccy if app.is_fiat else app.base_unit
+    base_unit: ''
+    fx_ccy: ''
+    unit_str: self.fx_ccy if app.is_fiat else self.base_unit
     Image:
         id: icon
         source: root.icon