From 189a455308de083a24d382205b58d9645efef2cc Mon Sep 17 00:00:00 2001
From: h <h@kotikot.com>
Date: Fri, 16 Oct 2026 03:53:34 +0000
Subject: [PATCH] fix(shell): return to the saved page before the period takes
 the url

---
 caddy/fireflyiii.site.caddy | 12 ++++++------
 src/lib/period.svelte.ts    |  1 +
 src/routes/+layout.svelte   |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/caddy/fireflyiii.site.caddy b/caddy/fireflyiii.site.caddy
index 3031742..c4d0324 100644
--- a/caddy/fireflyiii.site.caddy
+++ b/caddy/fireflyiii.site.caddy
@@ -30,12 +30,12 @@
 		path / /home /accounts /budgets /categories /tags
 		path /bills /subscriptions /piggy-banks /groups /reports /search
 		path /currencies /exchange-rates /attachments /preferences /export /administrations
-		path /recurring /webhooks/index /settings/links /accounts/* /inactive-accounts/* /transactions/*
-		path /budgets/* /categories/* /tags/* /bills/* /subscriptions/* /piggy-banks/*
-		path /groups/* /reports/* /currencies/* /exchange-rates/* /attachments/* /administrations/*
-		path /recurring/show/* /webhooks/show/* /settings/links/show/*
-		not path /accounts/reconcile/* /attachments/download/* /attachments/view/* /transactions/convert/* /transactions/debug/* /transactions/link/*
-		not path /transactions/mass/* /transactions/bulk/* /transactions/show-by-journal/* /piggy-banks/add/* /piggy-banks/remove/* /reports/options/*
+		path /recurring /webhooks/index /settings/links /settings/links/create /accounts/* /inactive-accounts/*
+		path /transactions/* /budgets/* /categories/* /tags/* /bills/* /subscriptions/*
+		path /piggy-banks/* /groups/* /reports/* /currencies/* /exchange-rates/* /attachments/*
+		path /administrations/* /recurring/show/* /webhooks/show/* /settings/links/show/* /settings/links/edit/*
+		not path /attachments/download/* /attachments/view/* /transactions/convert/* /transactions/debug/* /transactions/link/* /transactions/mass/*
+		not path /transactions/bulk/* /transactions/show-by-journal/* /piggy-banks/add/* /piggy-banks/remove/* /reports/options/*
 		not expression `{query.ffui} in ["off", "old"] || ({cookie.ffui} == "off" && {query.ffui} != "on")`
 	}
 	handle @ffui_pages {
diff --git a/src/lib/period.svelte.ts b/src/lib/period.svelte.ts
index 727a670..ece5428 100644
--- a/src/lib/period.svelte.ts
+++ b/src/lib/period.svelte.ts
@@ -69,6 +69,7 @@ class Period {
     const range = rangeFromUrl(url) ?? stored() ?? periodOf(today(), view);
     this.start = range.start;
     this.end = range.end;
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(range));
     this.ready = true;
   }
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index b5b79fe..2884872 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -19,11 +19,11 @@
   onMount(async () => {
     try {
       const back = await session.boot();
-      period.init(session.viewRange, page.url);
-      period.loadFirst().catch(() => undefined);
       if (back) {
         await goto(back, { replace: true });
       }
+      period.init(session.viewRange, page.url);
+      period.loadFirst().catch(() => undefined);
     } catch (error) {
       session.failed = error instanceof Error ? error.message : String(error);
     }