Merge branch 'main' into front/setting_page_theme

huggingface · Feb 6, 2024 · 28e325f · 28e325f
2 parents 41f24b2 + bbbedb7
commit 28e325f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/routes/assistant/[assistantId]/+page.svelte b/src/routes/assistant/[assistantId]/+page.svelte
@@ -15,7 +15,7 @@
 
 	afterNavigate(({ from }) => {
 		if (!from?.url.pathname.includes("settings")) {
-			previousPage = from?.url.pathname || previousPage;
+			previousPage = from?.url.toString() || previousPage;
 		}
 	});
 

diff --git a/src/routes/settings/+layout.svelte b/src/routes/settings/+layout.svelte
@@ -25,7 +25,7 @@
 
 	afterNavigate(({ from }) => {
 		if (!from?.url.pathname.includes("settings")) {
-			previousPage = from?.url.pathname || previousPage;
+			previousPage = from?.url.toString() || previousPage;
 		}
 	});