Skip to content

The agent that grows with you

fix(usage-window): one billing row dismissing its step-up no longer resumes refetches mid-approval

Tekniume4dc019e1f2a
diff --git a/apps/desktop/src/app/settings/billing/use-step-up.test.tsx b/apps/desktop/src/app/settings/billing/use-step-up.test.tsx
index ee90129e5b8..a33be5c851c 100644
--- a/apps/desktop/src/app/settings/billing/use-step-up.test.tsx
+++ b/apps/desktop/src/app/settings/billing/use-step-up.test.tsx
@@ -52,7 +52,7 @@ vi.mock('./api', () => ({
})
}))
-import { useStepUpFlow } from './use-step-up'
+import { $stepUpInFlight, useStepUpFlow } from './use-step-up'
function createWrapper(client: QueryClient) {
return function wrapper({ children }: PropsWithChildren) {
@@ -129,4 +129,30 @@ describe('useStepUpFlow', () => {
unmount()
expect(gatewayMock.count('billing.step_up.verification')).toBe(0)
})
+
+ it("one flow dismissing never resumes billing refetches during another flow's approval", async () => {
+ const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+
+ let resolveStepUp: (value: unknown) => void = () => {}
+
+ apiMocks.stepUp.mockReturnValue(new Promise(resolve => (resolveStepUp = resolve)))
+
+ const owner = renderHook(() => useStepUpFlow(), { wrapper: createWrapper(client) })
+ const other = renderHook(() => useStepUpFlow(), { wrapper: createWrapper(client) })
+
+ act(() => {
+ void owner.result.current.start()
+ })
+ expect($stepUpInFlight.get()).toBe(true)
+
+ act(() => other.result.current.dismiss())
+ expect($stepUpInFlight.get()).toBe(true)
+
+ other.unmount()
+ expect($stepUpInFlight.get()).toBe(true)
+
+ await act(async () => resolveStepUp({ data: { granted: false, ok: true }, ok: true }))
+ expect($stepUpInFlight.get()).toBe(false)
+ owner.unmount()
+ })
})
diff --git a/apps/desktop/src/app/settings/billing/use-step-up.ts b/apps/desktop/src/app/settings/billing/use-step-up.ts
index 2ccab2a9a79..ae3619a7b8c 100644
--- a/apps/desktop/src/app/settings/billing/use-step-up.ts
+++ b/apps/desktop/src/app/settings/billing/use-step-up.ts
@@ -31,6 +31,21 @@ export interface StepUpMessage {
*/
export const $stepUpInFlight = atom(false)
+// Billing mounts several step-up flows (the Remote Spending card, refusal inlines, Keep going on credits).
+// Each holds the pause under its own token, so one row dismissing its idle flow never resumes refetches
+// while another row's approval is still in flight.
+const stepUpHolders = new Set<object>()
+
+function holdStepUp(holder: object, held: boolean) {
+ if (held) {
+ stepUpHolders.add(holder)
+ } else {
+ stepUpHolders.delete(holder)
+ }
+
+ $stepUpInFlight.set(stepUpHolders.size > 0)
+}
+
export function useStepUpFlow({ autoOpen = false }: { autoOpen?: boolean } = {}) {
const { t } = useI18n()
const b = t.settings.billing
@@ -56,7 +71,7 @@ export function useStepUpFlow({ autoOpen = false }: { autoOpen?: boolean } = {})
const dismiss = useCallback(() => {
runIdRef.current += 1
runningRef.current = false
- $stepUpInFlight.set(false)
+ holdStepUp(runningRef, false)
unsubscribe()
setMessage(null)
setPhase('idle')
@@ -65,10 +80,7 @@ export function useStepUpFlow({ autoOpen = false }: { autoOpen?: boolean } = {})
useEffect(
() => () => {
- if (runningRef.current) {
- $stepUpInFlight.set(false)
- }
-
+ holdStepUp(runningRef, false)
runIdRef.current += 1
runningRef.current = false
unsubscribe()
@@ -91,7 +103,7 @@ export function useStepUpFlow({ autoOpen = false }: { autoOpen?: boolean } = {})
}
runningRef.current = true
- $stepUpInFlight.set(true)
+ holdStepUp(runningRef, true)
const runId = runIdRef.current + 1
runIdRef.current = runId
@@ -129,7 +141,7 @@ export function useStepUpFlow({ autoOpen = false }: { autoOpen?: boolean } = {})
}
runningRef.current = false
- $stepUpInFlight.set(false)
+ holdStepUp(runningRef, false)
unsubscribe()
setPhase('idle')
setVerification(null)