From e47059c96bfc0c4268e3be315dfbbcc054a36250 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Wed, 5 Apr 2023 14:01:45 +0000 Subject: [PATCH] qml: addresses list should not depend on wallet.use_change wallet.use_change is a weird preference using which a user can disable sending new change to change addresses. However the setting can be toggled at ~any time; and the user might have pre-existing balance on change addresses, which we should not hide. --- electrum/gui/qml/qeaddresslistmodel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electrum/gui/qml/qeaddresslistmodel.py b/electrum/gui/qml/qeaddresslistmodel.py index 2dd1c357b..ef12a8f94 100644 --- a/electrum/gui/qml/qeaddresslistmodel.py +++ b/electrum/gui/qml/qeaddresslistmodel.py @@ -73,7 +73,7 @@ class QEAddressListModel(QAbstractListModel): r_addresses = self.wallet.get_receiving_addresses() c_addresses = self.wallet.get_change_addresses() - n_addresses = len(r_addresses) + (len(c_addresses) if self.wallet.use_change else 0) + n_addresses = len(r_addresses) + len(c_addresses) def insert_row(atype, alist, address, iaddr): item = self.addr_to_model(address) @@ -88,7 +88,7 @@ class QEAddressListModel(QAbstractListModel): insert_row('receive', self.receive_addresses, address, i) i = i + 1 i = 0 - for address in c_addresses if self.wallet.use_change else []: + for address in c_addresses: insert_row('change', self.change_addresses, address, i) i = i + 1 self.endInsertRows()