From 10fb7ab7589e24135f5863317a72b363100b15b2 Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Sat, 31 Oct 2026 14:52:40 +0100
Subject: [PATCH] fix: keep a saturday week start after a restart

---
 src/stores/__tests__/settings-store.test.ts | 7 +++++++
 src/stores/settings-store.ts                | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/stores/__tests__/settings-store.test.ts b/src/stores/__tests__/settings-store.test.ts
index a9cb4780..992bbc6e 100644
--- a/src/stores/__tests__/settings-store.test.ts
+++ b/src/stores/__tests__/settings-store.test.ts
@@ -28,6 +28,13 @@ describe('settings-store', () => {
     });
   });
 
+  describe('week start', () => {
+    it('keeps a Saturday week start across a restart', () => {
+      expect(mergeWithDefaults({ calendarFirstDayOfWeek: 6 } as never).calendarFirstDayOfWeek).toBe(6);
+      expect(mergeWithDefaults({ calendarFirstDayOfWeek: 3 } as never).calendarFirstDayOfWeek).not.toBe(3);
+    });
+  });
+
   describe('mergeWithDefaults', () => {
     it('rejects values outside the allowed set', () => {
       const out = mergeWithDefaults({
diff --git a/src/stores/settings-store.ts b/src/stores/settings-store.ts
index 4403619e..0d4c1ac2 100644
--- a/src/stores/settings-store.ts
+++ b/src/stores/settings-store.ts
@@ -642,7 +642,7 @@ const VALIDATORS: Partial<Record<keyof PersistedSettings, (v: unknown) => boolea
   swipeMode: oneOf(['instant', 'reveal']),
   archiveMode: oneOf(['single', 'year', 'month']),
   calendarDefaultView: oneOf(['month', 'week', 'day', 'agenda']),
-  calendarFirstDayOfWeek: oneOf([0, 1]),
+  calendarFirstDayOfWeek: oneOf([0, 1, 6]),
   calendarTimeFormat: oneOf(['12h', '24h']),
   calendarHoverPreview: oneOf(['instant', 'delay-500ms', 'delay-1s', 'delay-2s', 'off']),
   filesFolderLayout: oneOf(['inline', 'sidebar']),