From 3ff537465b4e06a1527860b847b51e6c879e0acf Mon Sep 17 00:00:00 2001
From: Chris <cdednam+github@gmail.com>
Date: Sat, 7 Dec 2019 16:31:15 +0100
Subject: [PATCH 1/2] qt addresses list: add "funded or unused" filter option

---
 electrum/gui/qt/address_list.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/electrum/gui/qt/address_list.py b/electrum/gui/qt/address_list.py
index 1af567134..8f235c87f 100644
--- a/electrum/gui/qt/address_list.py
+++ b/electrum/gui/qt/address_list.py
@@ -43,6 +43,7 @@ class AddressUsageStateFilter(IntEnum):
     UNUSED = 1
     FUNDED = 2
     USED_AND_EMPTY = 3
+    FUNDED_OR_UNUSED = 4
 
     def ui_text(self) -> str:
         return {
@@ -50,6 +51,7 @@ class AddressUsageStateFilter(IntEnum):
             self.UNUSED: _('Unused'),
             self.FUNDED: _('Funded'),
             self.USED_AND_EMPTY: _('Used'),
+            self.FUNDED_OR_UNUSED: _('Funded or Unused'),
         }[self]
 
 
@@ -173,6 +175,8 @@ class AddressList(MyTreeView):
                 continue
             if self.show_used == AddressUsageStateFilter.USED_AND_EMPTY and not is_used_and_empty:
                 continue
+            if self.show_used == AddressUsageStateFilter.FUNDED_OR_UNUSED and is_used_and_empty:
+                continue
             balance_text = self.parent.format_amount(balance, whitespaces=True)
             # create item
             if fx and fx.get_fiat_address_config():

From ba8af9310f2843afd56a41db2618c37a6eab06b1 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Sat, 19 Jun 2021 15:44:01 +0200
Subject: [PATCH 2/2] kivy addresses list: add "funded or unused" filter option

note: "Funded or Unused" shortened to "Funded|Unused" to save horizontal space
---
 electrum/gui/kivy/uix/dialogs/addresses.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/electrum/gui/kivy/uix/dialogs/addresses.py b/electrum/gui/kivy/uix/dialogs/addresses.py
index 5029ad0fe..e6648c8a5 100644
--- a/electrum/gui/kivy/uix/dialogs/addresses.py
+++ b/electrum/gui/kivy/uix/dialogs/addresses.py
@@ -102,9 +102,9 @@ Builder.load_string('''
                 spacing: '5dp'
                 AddressButton:
                     id: search
-                    text: {0:_('All'), 1:_('Unused'), 2:_('Funded'), 3:_('Used')}[root.show_used]
+                    text: {0:_('All'), 1:_('Unused'), 2:_('Funded'), 3:_('Used'), 4:(_('Funded')+'|'+_('Unused'))}[root.show_used]
                     on_release:
-                        root.show_used = (root.show_used + 1) % 4
+                        root.show_used = (root.show_used + 1) % 5
                         Clock.schedule_once(lambda dt: root.update())
             AddressFilter:
                 opacity: 1
@@ -271,6 +271,8 @@ class AddressesDialog(Factory.Popup):
                 continue
             if self.show_used == 3 and not is_used_and_empty:
                 continue
+            if self.show_used == 4 and is_used_and_empty:
+                continue
             card = self.get_card(address, balance, is_used_and_empty, label)
             if search and not self.ext_search(card, search):
                 continue