From 506a2130b838f3e925ee59682cc97fff71634d1d Mon Sep 17 00:00:00 2001
From: Grace <grace@microbit.org>
Date: Wed, 2 Jul 2025 13:21:47 +0100
Subject: [PATCH 1/2] Flags override default

---
 src/common/use-storage.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/use-storage.ts b/src/common/use-storage.ts
index 71e9d8a97..50ba04a69 100644
--- a/src/common/use-storage.ts
+++ b/src/common/use-storage.ts
@@ -23,6 +23,7 @@ export function useStorage<T extends object>(
         ? localStorageIfPossible()
         : sessionStorageIfPossible();
     const value = storage ? storage.getItem(key) : null;
+    const overiddenDefault = {...defaultValue, ...overrides}
     if (value !== null) {
       try {
         let parsed = JSON.parse(value);
@@ -44,10 +45,10 @@ export function useStorage<T extends object>(
         return parsed;
       } catch (e) {
         // Better than exploding forever.
-        return defaultValue;
+        return overiddenDefault;
       }
     }
-    return defaultValue;
+    return overiddenDefault;
   });
   const setAndSaveState = useCallback(
     (value: T) => {

From e7d48a8361f74d511fa10c1a77185be09037f1a9 Mon Sep 17 00:00:00 2001
From: Grace <grace@microbit.org>
Date: Wed, 2 Jul 2025 13:28:36 +0100
Subject: [PATCH 2/2] Format changes

---
 src/common/use-storage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/use-storage.ts b/src/common/use-storage.ts
index 50ba04a69..282f407f5 100644
--- a/src/common/use-storage.ts
+++ b/src/common/use-storage.ts
@@ -23,7 +23,7 @@ export function useStorage<T extends object>(
         ? localStorageIfPossible()
         : sessionStorageIfPossible();
     const value = storage ? storage.getItem(key) : null;
-    const overiddenDefault = {...defaultValue, ...overrides}
+    const overiddenDefault = { ...defaultValue, ...overrides };
     if (value !== null) {
       try {
         let parsed = JSON.parse(value);