From 5903846189be259f4b5f6847bb2b3c868eca5632 Mon Sep 17 00:00:00 2001 From: Matt Pua Date: Tue, 7 Jul 2026 12:36:12 -0400 Subject: [PATCH] fix(settings): use replace navigation to skip settings route when viewing usage Generated-By: PostHog Code --- .../src/features/settings/sections/PlanUsageSettings.tsx | 8 ++++---- packages/ui/src/router/navigationBridge.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/ui/src/features/settings/sections/PlanUsageSettings.tsx b/packages/ui/src/features/settings/sections/PlanUsageSettings.tsx index ae09e510b6..c9a6149139 100644 --- a/packages/ui/src/features/settings/sections/PlanUsageSettings.tsx +++ b/packages/ui/src/features/settings/sections/PlanUsageSettings.tsx @@ -13,7 +13,7 @@ import { useSeatStore } from "@posthog/ui/features/billing/seatStore"; import { UsageMeter } from "@posthog/ui/features/billing/UsageMeter"; import { useSeat } from "@posthog/ui/features/billing/useSeat"; import { useUsage } from "@posthog/ui/features/billing/useUsage"; -import { closeSettings } from "@posthog/ui/features/settings/hooks/useOpenSettings"; +import { useSettingsPageStore } from "@posthog/ui/features/settings/stores/settingsPageStore"; import { useSpendAnalysisEnabled } from "@posthog/ui/features/usage/useSpendAnalysisEnabled"; import { navigateToUsage } from "@posthog/ui/router/navigationBridge"; import { track } from "@posthog/ui/shell/analytics"; @@ -329,9 +329,9 @@ export function PlanUsageSettings() { size="1" variant="ghost" onClick={() => { - // Leave settings first so back from /usage skips the settings route. - closeSettings(); - navigateToUsage(); + // Replace the settings route so back from /usage skips it. + useSettingsPageStore.getState().reset(); + navigateToUsage({ replace: true }); }} > View usage & spend analysis diff --git a/packages/ui/src/router/navigationBridge.ts b/packages/ui/src/router/navigationBridge.ts index 396ab1628f..829b1c3d5f 100644 --- a/packages/ui/src/router/navigationBridge.ts +++ b/packages/ui/src/router/navigationBridge.ts @@ -185,8 +185,8 @@ export function navigateToMcpServers(): void { void getRouterOrNull()?.navigate({ to: "/mcp-servers" }); } -export function navigateToUsage(): void { - void getRouterOrNull()?.navigate({ to: "/usage" }); +export function navigateToUsage(options?: { replace?: boolean }): void { + void getRouterOrNull()?.navigate({ to: "/usage", replace: options?.replace }); } // Channels-space mirrors. These render the same shared views as their /code (or