From 151afe3be30bea06ba38014d7a41abfe35ff5e35 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Fri, 4 Jul 2025 13:19:21 +0200
Subject: [PATCH] fix(frontend): make sure to set workspaceStore and token
 before mount in extension (#6129)

* fix(frontend): make sure to set workspaceStore and token before mount in extension

* nit
---
 frontend/src/lib/components/Dev.svelte | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/lib/components/Dev.svelte b/frontend/src/lib/components/Dev.svelte
index 0ee118010f..9908ed8af6 100644
--- a/frontend/src/lib/components/Dev.svelte
+++ b/frontend/src/lib/components/Dev.svelte
@@ -524,22 +524,21 @@
 	let workspace = $derived($page.url.searchParams.get('workspace') ?? undefined)
 	let themeDarkRaw = $derived($page.url.searchParams.get('activeColorTheme'))
 	let themeDark = $derived(themeDarkRaw == '2' || themeDarkRaw == '4')
-	$effect(() => {
+	$effect.pre(() => {
 		if (token) {
 			OpenAPI.WITH_CREDENTIALS = true
 			OpenAPI.TOKEN = token
-			untrack(() => loadUser())
 		}
 	})
-	$effect(() => {
+	$effect.pre(() => {
 		if (workspace) {
 			$workspaceStore = workspace
-			untrack(() => setupCopilotInfo())
 		}
 	})
-	$effect(() => {
+	$effect.pre(() => {
 		if (workspace && token) {
 			untrack(() => loadUser())
+			untrack(() => setupCopilotInfo())
 		}
 	})
 	$effect(() => {