From 2e81a71f1987e768590dda860e681e333dcbc9df Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sat, 27 Jun 2026 22:32:44 +0000
Subject: [PATCH] refactor(napplet): replace newEventBundles with
 LocalCache.observeEvents for manifest updates

LocalCache.observeEvents<Event>(filter) handles both the initial snapshot and
subsequent insertions via the observables registry, replacing the manual
bundle-scan over newEventBundles. Fewer moving parts and the filter is scoped
to manifest kinds rather than scanning every arriving event bundle.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013hTFpoExYYLYEGGtXBx6ZT
---
 .../loggedIn/napplets/ConnectedAppsScreen.kt  | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/ConnectedAppsScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/ConnectedAppsScreen.kt
index d837f092e0..783dcc88fa 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/ConnectedAppsScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/napplets/ConnectedAppsScreen.kt
@@ -68,6 +68,7 @@ import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
 import com.vitorpamplona.amethyst.ui.navigation.topbars.TopBarWithBackButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.fetchAll
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
 import com.vitorpamplona.quartz.nip19Bech32.entities.NPub
@@ -108,22 +109,22 @@ fun ConnectedAppsScreen(
             }
     }
 
-    // Fetch missing manifests from relays, then watch cache for arrivals
+    // Watch manifest events in LocalCache and fetch missing ones from relays
     LaunchedEffect(Unit) {
-        // Watch for napplet manifest events arriving in LocalCache from any source
+        val manifestFilter =
+            Filter(kinds = listOf(RootNappletEvent.KIND, NamedNappletEvent.KIND))
+
+        // observeEvents emits immediately with cached events, then re-emits on each insertion
         launch(Dispatchers.Default) {
-            val manifestKinds = setOf(RootNappletEvent.KIND, NamedNappletEvent.KIND)
-            LocalCache.live.newEventBundles.collect { bundle ->
-                if (bundle.any { it.event?.kind in manifestKinds }) {
-                    val current = items ?: return@collect
-                    items =
-                        current.map { entry ->
-                            val author = entry.coordinate.substringBefore(':')
-                            val identifier = entry.coordinate.substringAfter(':', "")
-                            val (title, iconUrl) = resolveNappletMeta(author, identifier, untitled)
-                            entry.copy(title = title, iconUrl = iconUrl)
-                        }
-                }
+            LocalCache.observeEvents<Event>(manifestFilter).collect {
+                val current = items ?: return@collect
+                items =
+                    current.map { entry ->
+                        val author = entry.coordinate.substringBefore(':')
+                        val identifier = entry.coordinate.substringAfter(':', "")
+                        val (title, iconUrl) = resolveNappletMeta(author, identifier, untitled)
+                        entry.copy(title = title, iconUrl = iconUrl)
+                    }
             }
         }
 
@@ -151,7 +152,7 @@ fun ConnectedAppsScreen(
                         filters = relays.associateWith { listOf(filter) },
                         timeoutMs = 15_000L,
                     )
-                // Inject into LocalCache so the newEventBundles observer above can re-resolve
+                // Inject into LocalCache; the observeEvents collector above re-resolves metadata
                 events.forEach { LocalCache.justConsume(it, null, false) }
             }
         }