fix: Crash on TokenTab when masterKey is cleared

joeldavidw · Jun 19, 2024 · 28fd891 · 28fd891
1 parent e8fe81b
commit 28fd891
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Chronos/App/Tabs/Tokens/TokensTab.swift b/Chronos/App/Tabs/Tokens/TokensTab.swift
@@ -26,6 +26,8 @@ let sortOptions: [(title: String, criteria: TokenSortOrder)] = [
 struct TokensTab: View {
     @Query private var vaults: [Vault]
 
+    @EnvironmentObject var loginStatus: LoginStatus
+
     @State private var showTokenAddSheet = false
     @State private var showTokenUpdateSheet = false
     @State private var showTokenDeleteSheet = false
@@ -39,6 +41,11 @@ struct TokensTab: View {
     let stateService = Container.shared.stateService()
 
     private var tokenPairs: [TokenPair] {
+        // This is necessary because tokenPairs is a computed property. It gets recomputed whenever stateService changes, such as when stateService.masterKey gets cleared.
+        if !loginStatus.loggedIn {
+            return []
+        }
+
         let vaultId = stateService.getVaultId()
         guard let vault = vaults.filter({ $0.vaultId == vaultId }).first else {
             return []