diff --git a/apps/user-ui/src/hooks/useRegionNeo.ts b/apps/user-ui/src/hooks/useRegionNeo.ts index dbb9417..7117cbd 100644 --- a/apps/user-ui/src/hooks/useRegionNeo.ts +++ b/apps/user-ui/src/hooks/useRegionNeo.ts @@ -72,6 +72,15 @@ export function useNeoRegionBootstrap(): void { const [timedOut, setTimedOut] = useState(false) const [decisionTick, setDecisionTick] = useState(0) const lastAuthRef = useRef(null) + // The recovery poll below is torn down by the status flip it causes, so its + // own `cancelled` flag cannot guard the re-arm. This tracks a real unmount. + const mountedRef = useRef(true) + useEffect(() => { + mountedRef.current = true + return () => { + mountedRef.current = false + } + }, []) const addressesQuery = trpc.user.address.getUserAddresses.useQuery(undefined, { enabled: isAuthenticated, @@ -347,7 +356,12 @@ export function useNeoRegionBootstrap(): void { const usable = await probeLocation() if (cancelled || !usable) return await refreshLocation() - if (cancelled) return + // Do NOT gate this on `cancelled`: refresh() flips the status to + // 'locating', which makes locationIsUnusable false and runs this + // effect's cleanup while the fix is still being read. Only a real + // unmount (or a fix that still isn't there) should skip the re-arm. + if (!mountedRef.current) return + if (useLocationStore.getState().coords == null) return decisionStarted = false useNeoRegionStore.getState().closeAddressFlow() setDecisionTick((tick) => tick + 1) diff --git a/change-log.txt b/change-log.txt index 643e649..59b48f2 100644 --- a/change-log.txt +++ b/change-log.txt @@ -1248,3 +1248,19 @@ address flow reads that flag and shows a notice; previously the user only got --- apps/user-ui/src/components/location/neo/NeoAddressFlow.tsx ~ "Login to use saved addresses" -> "Sign in to use saved addresses" + +[2026-11-08 15:54:56 IST] location gate: recover after the user enables location. + +The recovery poll awaited refreshLocation() and then re-armed the decision, but +refresh() flips the status to 'locating' first. That made locationIsUnusable +false, so this effect's cleanup ran (cancelled = true) while the fix was still +being read; the post-await `if (cancelled) return` then skipped the re-arm. The +notice disappeared (status granted) but decisionStarted stayed true, so no region +was ever published and the address flow stayed up. + +--- apps/user-ui/src/hooks/useRegionNeo.ts ++ mountedRef so the re-arm is gated on the hook still being mounted, not on the + effect cleanup (which the status flip itself triggers) ++ after refreshLocation(), re-arm only when the fix actually arrived + (coords != null); a failed re-read leaves the poll subscribed +~ keep polling on failure (the effect re-subscribes when the status is unusable)