From 28cd59916ae516245624cc6d379e4350d12faf4b Mon Sep 17 00:00:00 2001
From: "shakespeare.diy" <assistant@shakespeare.diy>
Date: Mon, 7 Sep 2026 19:15:00 +0700
Subject: [PATCH] fix(amber): stop global SasquatchGuide from decrypting the
 stash on every page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

usePersonalContext (consumed by SasquatchGuide, mounted in the app-wide Layout)
eagerly called useStash(), firing the encrypted-stash NIP-44 decrypt on EVERY
page load — one Amber popup per navigation. useStash now accepts { enabled },
and usePersonalContext passes enabled:false so it only reads the stash from
cache (populated when the user actually opens the Stash page). The AI's
getMyStash tool degrades gracefully to cached data. No behaviour change for
silent signers.

Co-authored-by: shakespeare.diy <assistant@shakespeare.diy>
---
 src/hooks/usePersonalContext.ts |  8 +++++++-
 src/hooks/useStash.ts           | 15 +++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/hooks/usePersonalContext.ts b/src/hooks/usePersonalContext.ts
index cf407e6..b11c875 100644
--- a/src/hooks/usePersonalContext.ts
+++ b/src/hooks/usePersonalContext.ts
@@ -50,7 +50,13 @@ function dedupeAddressable<T extends { pubkey: string; kind: number; tags: strin
 export function usePersonalContext() {
   const { nostr } = useNostr();
   const { user } = useCurrentUser();
-  const { stash } = useStash();
+  // IMPORTANT: pass enabled:false. This hook is consumed by the Sasquatch guide,
+  // which is mounted in the GLOBAL Layout — so eagerly running useStash() here
+  // fired the encrypted-stash decrypt on EVERY page. With Amber that's a popup
+  // per navigation (the "Amber flashes when I move around" bug). We only read
+  // the stash from cache (populated when the user actually visits the Stash
+  // page); the AI's getMyStash tool degrades gracefully to whatever is cached.
+  const { stash } = useStash({ enabled: false });
 
   const pubkey = user?.pubkey;
 
diff --git a/src/hooks/useStash.ts b/src/hooks/useStash.ts
index 6b92a90..e849348 100644
--- a/src/hooks/useStash.ts
+++ b/src/hooks/useStash.ts
@@ -46,13 +46,24 @@ const STASH_D_TAG = 'skatespots-stash';
  * Hook to manage user's private gear stash
  * Uses NIP-44 encryption to store items privately
  */
-export function useStash() {
+/**
+ * @param options.enabled  When false, the stash is NOT fetched/decrypted. Used
+ *   by callers that mount this hook only for its data-access API (e.g. the
+ *   global Sasquatch assistant via usePersonalContext) but must NOT trigger a
+ *   decrypt — with Amber every decrypt is a popup, and this hook used to fire on
+ *   every page because Sasquatch is mounted in the app-wide Layout. Defaults to
+ *   true so the actual Stash page still loads normally. When disabled, `stash`
+ *   still resolves from any previously-cached decrypt (React Query cache).
+ */
+export function useStash(options?: { enabled?: boolean }) {
   const { nostr } = useNostr();
   const { user } = useCurrentUser();
   const { logins } = useNostrLogin();
   const queryClient = useQueryClient();
   const { mutateAsync: createEvent } = useNostrPublish();
 
+  const callerEnabled = options?.enabled ?? true;
+
   // Determine if nip44 is safely available WITHOUT touching any throwing getter.
   const hasNip44 = useMemo(() => checkNip44(user, logins), [user, logins]);
   // Amber prompts on the stash decrypt — keep it from re-running on window focus
@@ -97,7 +108,7 @@ export function useStash() {
         return { items: [], updatedAt: 0 };
       }
     },
-    enabled: !!user?.pubkey && hasNip44,
+    enabled: callerEnabled && !!user?.pubkey && hasNip44,
     staleTime: interactive ? Infinity : 60000,
     refetchOnWindowFocus: false,
   });