From 5b586f487160c6cbe6fc179d707db0757e34b98c Mon Sep 17 00:00:00 2001
From: Henry <henry_ball@hotmail.co.uk>
Date: Wed, 29 Jul 2026 12:48:56 +0100
Subject: [PATCH] fix(cloud): default to active workspace on upgrade path

---
 apps/web/src/views/onboarding/select-plan/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/views/onboarding/select-plan/index.tsx b/apps/web/src/views/onboarding/select-plan/index.tsx
index d7ba7b7e..3109c9e7 100644
--- a/apps/web/src/views/onboarding/select-plan/index.tsx
+++ b/apps/web/src/views/onboarding/select-plan/index.tsx
@@ -48,7 +48,11 @@ export default function SelectPlanView() {
     (searchParams.get("billing") as Billing | null) ?? "annual",
   );
   const returnUrl = searchParams.get("returnUrl") ?? "/boards";
-  const workspacePublicId = searchParams.get("workspacePublicId");
+  const workspacePublicId =
+    searchParams.get("workspacePublicId") ??
+    (typeof window !== "undefined"
+      ? localStorage.getItem("workspacePublicId")
+      : null);
   const { data: workspaces } = api.workspace.all.useQuery();
   const { data: session } = authClient.useSession();
   const { data: user } = api.user.getUser.useQuery(undefined, {