diff --git a/src/components/ConnectInstructions.svelte b/src/components/ConnectInstructions.svelte index 35391a3b4..98d749b55 100644 --- a/src/components/ConnectInstructions.svelte +++ b/src/components/ConnectInstructions.svelte @@ -1,8 +1,9 @@ diff --git a/src/lib/router.ts b/src/lib/router.ts index 246a01e7b..ed1474d75 100644 --- a/src/lib/router.ts +++ b/src/lib/router.ts @@ -16,10 +16,11 @@ import { nodePath } from "@app/views/nodes/router"; export { type Route }; +const InitialStore = { resource: "booting" as const }; + export const isLoading = writable(true); -export const activeRouteStore = writable({ - resource: "booting", -}); +export const activeRouteStore = writable(InitialStore); +export const activeUnloadedRouteStore = writable(InitialStore); let currentUrl: URL | undefined; @@ -112,6 +113,7 @@ async function navigate( setTitle(loadedRoute); activeRouteStore.set(loadedRoute); + activeUnloadedRouteStore.set(newRoute); isLoading.set(false); } @@ -189,7 +191,7 @@ function extractBaseUrl(hostAndPort: string): BaseUrl { } } -export function urlToRoute(url: URL): Route | null { +function urlToRoute(url: URL): Route | null { const segments = url.pathname.substring(1).split("/"); const resource = segments.shift(); diff --git a/src/views/projects/Header/ShareButton.svelte b/src/views/projects/Header/ShareButton.svelte index 2548cb9db..f26e2e1a8 100644 --- a/src/views/projects/Header/ShareButton.svelte +++ b/src/views/projects/Header/ShareButton.svelte @@ -4,7 +4,7 @@ import { queryProject } from "@app/lib/projects"; import { config } from "@app/lib/config"; import { formatPublicExplorer } from "@app/lib/utils"; - import { routeToPath, urlToRoute } from "@app/lib/router"; + import { activeUnloadedRouteStore, routeToPath } from "@app/lib/router"; import Clipboard from "@app/components/Clipboard.svelte"; import Command from "@app/components/Command.svelte"; @@ -17,7 +17,7 @@ let usedFallbackSeed = false; - const route = urlToRoute(new URL(window.location.href)) as ProjectRoute; + const route = $activeUnloadedRouteStore as ProjectRoute; const seedRoutes = preferredSeeds.reduce((acc, seed) => { const [, address] = seed.split("@"); acc.push({ diff --git a/src/views/projects/Sidebar/ContextHelp.svelte b/src/views/projects/Sidebar/ContextHelp.svelte index 960ae8c34..504c8fd71 100644 --- a/src/views/projects/Sidebar/ContextHelp.svelte +++ b/src/views/projects/Sidebar/ContextHelp.svelte @@ -1,6 +1,8 @@