2 files changed, 24 insertions, 14 deletions
diff --git a/Shared/NeedsAttentionSnapshot.swift b/Shared/NeedsAttentionSnapshot.swift
index d4c581c..5f584c3 100644
--- a/Shared/NeedsAttentionSnapshot.swift
+++ b/Shared/NeedsAttentionSnapshot.swift
@@ -58,11 +58,11 @@ enum NeedsAttentionSnapshotStore {
     private static let snapshotKey = "needsAttention.snapshot"
 
     static func load(
-        accountID: String? = ActiveAccountContextStore.load(),
+        accountID: String? = nil,
         defaults: UserDefaults? = sharedDefaults()
     ) -> NeedsAttentionSnapshot? {
         guard let defaults,
-              let data = defaults.data(forKey: scopedKey(for: accountID)) else {
+              let data = defaults.data(forKey: scopedKey(for: resolvedAccountID(accountID, defaults: defaults))) else {
             return nil
         }
 
@@ -71,7 +71,7 @@ enum NeedsAttentionSnapshotStore {
 
     static func save(
         _ snapshot: NeedsAttentionSnapshot,
-        accountID: String? = ActiveAccountContextStore.load(),
+        accountID: String? = nil,
         defaults: UserDefaults? = sharedDefaults()
     ) {
         guard let defaults,
@@ -79,7 +79,7 @@ enum NeedsAttentionSnapshotStore {
             return
         }
 
-        defaults.set(data, forKey: scopedKey(for: accountID))
+        defaults.set(data, forKey: scopedKey(for: resolvedAccountID(accountID, defaults: defaults)))
         reloadWidgetTimelines()
     }
 
@@ -87,7 +87,7 @@ enum NeedsAttentionSnapshotStore {
         unreadInboxThreads: Int? = nil,
         assignedOpenTickets: Int? = nil,
         failedBuilds: Int? = nil,
-        accountID: String? = ActiveAccountContextStore.load(),
+        accountID: String? = nil,
         defaults: UserDefaults? = sharedDefaults()
     ) {
         let existing = load(accountID: accountID, defaults: defaults)
@@ -102,7 +102,7 @@ enum NeedsAttentionSnapshotStore {
 
     static func adjustUnreadInboxThreads(
         by delta: Int,
-        accountID: String? = ActiveAccountContextStore.load(),
+        accountID: String? = nil,
         defaults: UserDefaults? = sharedDefaults()
     ) {
         guard let existing = load(accountID: accountID, defaults: defaults),
@@ -123,10 +123,11 @@ enum NeedsAttentionSnapshotStore {
     }
 
     static func clear(
-        accountID: String? = ActiveAccountContextStore.load(),
+        accountID: String? = nil,
         defaults: UserDefaults? = sharedDefaults()
     ) {
-        defaults?.removeObject(forKey: scopedKey(for: accountID))
+        guard let defaults else { return }
+        defaults.removeObject(forKey: scopedKey(for: resolvedAccountID(accountID, defaults: defaults)))
         reloadWidgetTimelines()
     }
 
@@ -139,6 +140,10 @@ enum NeedsAttentionSnapshotStore {
         return "\(snapshotKey).\(accountID)"
     }
 
+    private static func resolvedAccountID(_ accountID: String?, defaults: UserDefaults) -> String? {
+        accountID ?? ActiveAccountContextStore.load(defaults: defaults)
+    }
+
     private static func reloadWidgetTimelines() {
         #if canImport(WidgetKit)
         WidgetCenter.shared.reloadTimelines(ofKind: NeedsAttentionWidgetConfiguration.kind)
diff --git a/Shared/SystemStatusWidgetSnapshot.swift b/Shared/SystemStatusWidgetSnapshot.swift
index 0b19365..025e58c 100644
--- a/Shared/SystemStatusWidgetSnapshot.swift
+++ b/Shared/SystemStatusWidgetSnapshot.swift
@@ -34,11 +34,11 @@ enum SystemStatusWidgetSnapshotStore {
     private static let snapshotKey = "systemStatus.widgetSnapshot"
 
     static func load(
-        accountID: String? = ActiveAccountContextStore.load(),
+        accountID: String? = nil,
         defaults: UserDefaults? = sharedDefaults()
     ) -> SystemStatusWidgetSnapshot? {
         guard let defaults,
-              let data = defaults.data(forKey: scopedKey(for: accountID)) else {
+              let data = defaults.data(forKey: scopedKey(for: resolvedAccountID(accountID, defaults: defaults))) else {
             return nil
         }
         return try? JSONDecoder().decode(SystemStatusWidgetSnapshot.self, from: data)
@@ -46,22 +46,23 @@ enum SystemStatusWidgetSnapshotStore {
 
     static func save(
         _ snapshot: SystemStatusWidgetSnapshot,
-        accountID: String? = ActiveAccountContextStore.load(),
+        accountID: String? = nil,
         defaults: UserDefaults? = sharedDefaults()
     ) {
         guard let defaults,
               let data = try? JSONEncoder().encode(snapshot) else {
             return
         }
-        defaults.set(data, forKey: scopedKey(for: accountID))
+        defaults.set(data, forKey: scopedKey(for: resolvedAccountID(accountID, defaults: defaults)))
         reloadWidgetTimelines()
     }
 
     static func clear(
-        accountID: String? = ActiveAccountContextStore.load(),
+        accountID: String? = nil,
         defaults: UserDefaults? = sharedDefaults()
     ) {
-        defaults?.removeObject(forKey: scopedKey(for: accountID))
+        guard let defaults else { return }
+        defaults.removeObject(forKey: scopedKey(for: resolvedAccountID(accountID, defaults: defaults)))
         reloadWidgetTimelines()
     }
 
@@ -74,6 +75,10 @@ enum SystemStatusWidgetSnapshotStore {
         return "\(snapshotKey).\(accountID)"
     }
 
+    private static func resolvedAccountID(_ accountID: String?, defaults: UserDefaults) -> String? {
+        accountID ?? ActiveAccountContextStore.load(defaults: defaults)
+    }
+
     private static func reloadWidgetTimelines() {
         #if canImport(WidgetKit)
         WidgetCenter.shared.reloadTimelines(ofKind: SystemStatusWidgetConfiguration.kind)