From 0219da29956f6c18ba866d17c3f3f0e30d67b35f Mon Sep 17 00:00:00 2001
From: Thomas Farstrike <thomasverstreken@protonmail.com>
Date: Sat, 31 May 2025 22:11:24 +0200
Subject: [PATCH] Piggy wallet: simplify

---
 .../assets/displaywallet.py                   | 30 ++++---------------
 .../assets/wallet.py                          |  4 ++-
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py b/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py
index bbdb5547..add31b6a 100644
--- a/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py
+++ b/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py
@@ -117,36 +117,16 @@ class SettingsScreen():
                     setting["cont"].remove_flag(lv.obj.FLAG.HIDDEN)
 
     def radio_event_handler(self, event):
-        code = event.get_code()
-        if code != lv.EVENT.CLICKED:
-            return
-        targetblob = event.get_target()
-        #target = self.radio_container
-        #obj = e.get_target()
-        target = lv.obj(targetblob)
-        #pos = lvobj.get_pos()  # 
-        if target == self.radio_container:
-            print("it's the container")
-            return  # Ignore clicks on the container itself
-        else:
-            print("it's not the container")
         old_cb = self.radio_container.get_child(self.active_radio_index)
         old_cb.remove_state(lv.STATE.CHECKED)
-        #target.add_state(lv.STATE.CHECKED)
-        # 19 = lv.STATE.HOVERED, lv.STATE.CHECKED and lv.STATE.FOCUSED
-        radio_index = -1
-        for childnr in range(2):
+        self.active_radio_index = -1
+        for childnr in range(self.radio_container.get_child_count()):
             child = self.radio_container.get_child(childnr)
             state = child.get_state()
-            print(f"state: {state}")
-            if state != lv.STATE.DEFAULT:
-                print("found checked child!")
-                radio_index = childnr
+            print(f"radio_container child's state: {state}")
+            if state != lv.STATE.DEFAULT: # State can be something like 19 = lv.STATE.HOVERED & lv.STATE.CHECKED & lv.STATE.FOCUSED
+                self.active_radio_index = childnr
                 break
-            else:
-                print("skipping child...")
-        #self.active_radio_index = self.radio_container.get_child_by_id(target)
-        self.active_radio_index = radio_index
         print(f"active_radio_index is now {self.active_radio_index}")
 
     def create_radio_button(self, parent, text, index):
diff --git a/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/wallet.py b/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/wallet.py
index aef19990..90a07240 100644
--- a/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/wallet.py
+++ b/internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/wallet.py
@@ -230,6 +230,7 @@ class LNBitsWallet(Wallet):
             "X-Api-Key": self.lnbits_readkey,
         }
         try:
+            print(f"Fetching balance with GET to {walleturl}")
             response = requests.get(walleturl, timeout=10, headers=headers)
         except Exception as e:
             print("fetch_balance: get request failed:", e)
@@ -253,6 +254,7 @@ class LNBitsWallet(Wallet):
             "X-Api-Key": self.lnbits_readkey,
         }
         try:
+            print(f"Fetching payments with GET to {paymentsurl}")
             response = requests.get(paymentsurl, timeout=10, headers=headers)
         except Exception as e:
             print("fetch_payments: get request failed:", e)
@@ -418,7 +420,7 @@ class NWCWallet(Wallet):
             #cleartext_content='{"params":{"limit": 4 },"method":"list_transactions"}'
         )
         self.private_key.sign_event(dm) # sign also does encryption if it's a encrypted dm
-        print("\n\nPublishing DM to fetch payments...\n\n")
+        print("Publishing DM to fetch payments...")
         self.relay_manager.publish_event(dm)
 
     def parse_nwc_url(self, nwc_url):