From 638c896b119998c9e77423f2c0fa02b283e6335a Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Mon, 13 Mar 2023 15:54:52 +0000
Subject: [PATCH] qt: MyTreeView: make item labels independent of column order

---
 electrum/gui/qt/address_list.py |  3 ++-
 electrum/gui/qt/invoice_list.py | 10 +++++-----
 electrum/gui/qt/utxo_list.py    |  7 ++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/electrum/gui/qt/address_list.py b/electrum/gui/qt/address_list.py
index 4a5b3db38..e869ddfd5 100644
--- a/electrum/gui/qt/address_list.py
+++ b/electrum/gui/qt/address_list.py
@@ -187,7 +187,8 @@ class AddressList(MyTreeView):
             if self.show_used == AddressUsageStateFilter.FUNDED_OR_UNUSED and is_used_and_empty:
                 continue
             num_shown += 1
-            labels = ['', address, '', '', '', '']
+            labels = [""] * len(self.Columns)
+            labels[self.Columns.ADDRESS] = address
             address_item = [QStandardItem(e) for e in labels]
             # align text and set fonts
             for i, item in enumerate(address_item):
diff --git a/electrum/gui/qt/invoice_list.py b/electrum/gui/qt/invoice_list.py
index 6a5375ae9..87abf84e3 100644
--- a/electrum/gui/qt/invoice_list.py
+++ b/electrum/gui/qt/invoice_list.py
@@ -110,13 +110,13 @@ class InvoiceList(MyTreeView):
                 if item.bip70:
                     icon_name = 'seal.png'
             status = self.wallet.get_invoice_status(item)
-            status_str = item.get_status_str(status)
-            message = item.message
             amount = item.get_amount_sat()
             timestamp = item.time or 0
-            date_str = format_time(timestamp) if timestamp else _('Unknown')
-            amount_str = self.parent.format_amount(amount, whitespaces=True)
-            labels = [date_str, message, amount_str, status_str]
+            labels = [""] * len(self.Columns)
+            labels[self.Columns.DATE] = format_time(timestamp) if timestamp else _('Unknown')
+            labels[self.Columns.DESCRIPTION] = item.message
+            labels[self.Columns.AMOUNT] = self.parent.format_amount(amount, whitespaces=True)
+            labels[self.Columns.STATUS] = item.get_status_str(status)
             items = [QStandardItem(e) for e in labels]
             self.set_editability(items)
             items[self.Columns.DATE].setIcon(read_QIcon(icon_name))
diff --git a/electrum/gui/qt/utxo_list.py b/electrum/gui/qt/utxo_list.py
index 05987d7f3..f0a00cfa8 100644
--- a/electrum/gui/qt/utxo_list.py
+++ b/electrum/gui/qt/utxo_list.py
@@ -92,9 +92,10 @@ class UTXOList(MyTreeView):
         for idx, utxo in enumerate(utxos):
             name = utxo.prevout.to_str()
             self._utxo_dict[name] = utxo
-            address = utxo.address
-            amount_str = self.parent.format_amount(utxo.value_sats(), whitespaces=True)
-            labels = [str(utxo.short_id), address, '', amount_str, '']
+            labels = [""] * len(self.Columns)
+            labels[self.Columns.OUTPOINT] = str(utxo.short_id)
+            labels[self.Columns.ADDRESS] = utxo.address
+            labels[self.Columns.AMOUNT] = self.parent.format_amount(utxo.value_sats(), whitespaces=True)
             utxo_item = [QStandardItem(x) for x in labels]
             self.set_editability(utxo_item)
             utxo_item[self.Columns.OUTPOINT].setData(name, self.ROLE_CLIPBOARD_DATA)