Primera build enviada

PortfolioJournal/Views/Accounts/AccountEditorView.swift

@@ -18,7 +18,18 @@ struct AccountEditorView: View {
         NavigationStack {
             Form {
                 Section {
-                    TextField("Account name", text: $name)
+                    if isEditingDefaultAccount {
+                        HStack {
+                            Text(Account.defaultAccountName)
+                                .foregroundColor(.secondary)
+                            Spacer()
+                            Image(systemName: "lock.fill")
+                                .font(.caption)
+                                .foregroundColor(.secondary)
+                        }
+                    } else {
+                        TextField("Account name", text: $name)
+                    }
                     Picker("Currency", selection: $currencyCode) {
                         ForEach(CurrencyPicker.commonCodes, id: \.self) { code in
                             Text(code).tag(code)
@@ -30,6 +41,8 @@ struct AccountEditorView: View {
                     if let errorMessage {
                         Text(errorMessage)
                             .foregroundColor(.negativeRed)
+                    } else if isEditingDefaultAccount {
+                        Text("The Default account name cannot be changed.")
                     }
                 }
 
@@ -67,9 +80,16 @@ struct AccountEditorView: View {
         .presentationDetents([.large])
     }
 
+    private var isEditingDefaultAccount: Bool {
+        account?.isDefaultAccount == true
+    }
+
     private var isValid: Bool {
+        if isEditingDefaultAccount {
+            return true // Can only edit currency/inputMode for Default account
+        }
         let trimmed = name.trimmingCharacters(in: .whitespaces)
-        return !trimmed.isEmpty && !isDuplicateName(trimmed)
+        return !trimmed.isEmpty && errorMessage == nil
     }
 
     private func validateName() {
@@ -78,17 +98,24 @@ struct AccountEditorView: View {
             errorMessage = nil
             return
         }
-        errorMessage = isDuplicateName(trimmed) ? "An account with this name already exists." : nil
-    }
 
-    private func isDuplicateName(_ trimmed: String) -> Bool {
-        let normalized = trimmed.lowercased()
-        return accountRepository.accounts.contains { existing in
-            if let account, existing.id == account.id {
-                return false
+        // Check if trying to use reserved "Default" name for a non-default account
+        if trimmed.lowercased() == Account.defaultAccountName.lowercased() {
+            let isCreatingNew = account == nil
+            let isEditingNonDefault = account != nil && !account!.isDefaultAccount
+            if isCreatingNew || isEditingNonDefault {
+                errorMessage = "The name '\(Account.defaultAccountName)' is reserved."
+                return
             }
-            return (existing.name).trimmingCharacters(in: .whitespaces).lowercased() == normalized
         }
+
+        // Check for duplicate names
+        if !accountRepository.isNameAvailable(trimmed, excludingAccountId: account?.safeId) {
+            errorMessage = "An account with this name already exists."
+            return
+        }
+
+        errorMessage = nil
     }
 
     private func loadAccount() {
@@ -102,15 +129,17 @@ struct AccountEditorView: View {
     }
 
     private func saveAccount() {
-        validateName()
-        guard errorMessage == nil else { return }
-        let trimmedName = name.trimmingCharacters(in: .whitespaces)
+        if !isEditingDefaultAccount {
+            validateName()
+            guard errorMessage == nil else { return }
+        }
+        let trimmedName = isEditingDefaultAccount ? Account.defaultAccountName : name.trimmingCharacters(in: .whitespaces)
         let enforcedFrequency: NotificationFrequency = .monthly
         let enforcedCustomMonths = 1
         if let account {
             accountRepository.updateAccount(
                 account,
-                name: trimmedName,
+                name: isEditingDefaultAccount ? nil : trimmedName, // Don't update name for Default account
                 currency: currencyCode,
                 inputMode: inputMode,
                 notificationFrequency: enforcedFrequency,

PortfolioJournal/Views/Accounts/AccountsView.swift

@@ -8,6 +8,11 @@ struct AccountsView: View {
     @State private var selectedAccount: Account?
     @State private var showingPaywall = false
     @State private var accountToDelete: Account?
+    @State private var showingDeleteBlocked = false
+
+    private var availableAccounts: [Account] {
+        accountRepository.accounts.filter { $0.safeId != nil }
+    }
 
     var body: some View {
         ZStack {
@@ -15,37 +20,47 @@ struct AccountsView: View {
 
             List {
                 Section {
-                    ForEach(accountRepository.accounts) { account in
+                    ForEach(availableAccounts, id: \.objectID) { account in
+                        let canDelete = accountRepository.canDeleteAccount(account)
                         Button {
                             selectedAccount = account
                         } label: {
                             HStack {
                                 VStack(alignment: .leading) {
-                                    Text(account.name)
-                                        .font(.headline)
+                                    HStack(spacing: 4) {
+                                        Text(account.name)
+                                            .font(.headline)
+                                        if account.isDefaultAccount {
+                                            Image(systemName: "star.fill")
+                                                .font(.caption2)
+                                                .foregroundColor(.appWarning)
+                                        }
+                                    }
                                     Text(account.currencyCode ?? AppSettings.getOrCreate(in: CoreDataStack.shared.viewContext).currency)
                                         .font(.caption)
                                         .foregroundColor(.secondary)
                                 }
                                 Spacer()
-                                if accountStore.selectedAccount?.id == account.id && !accountStore.showAllAccounts {
+                                if accountStore.selectedAccount?.safeId == account.safeId && !accountStore.showAllAccounts {
                                     Image(systemName: "checkmark.circle.fill")
                                         .foregroundColor(.appPrimary)
                                 }
                             }
                         }
                         .swipeActions(edge: .trailing) {
-                            Button(role: .destructive) {
-                                accountToDelete = account
-                            } label: {
-                                Label("Delete", systemImage: "trash")
+                            if canDelete {
+                                Button(role: .destructive) {
+                                    accountToDelete = account
+                                } label: {
+                                    Label("Delete", systemImage: "trash")
+                                }
                             }
                         }
                     }
                 } header: {
                     Text("Accounts")
                 } footer: {
-                    Text(iapService.isPremium ? "Create multiple accounts for business, family, or goals." : "Free users can create one account.")
+                    Text(iapService.isPremium ? "Create multiple accounts for business, family, or goals. The Default account cannot be deleted." : "Free users can create one account.")
                 }
             }
             .scrollContentBackground(.hidden)
@@ -61,14 +76,20 @@ struct AccountsView: View {
         ) {
             Button("Delete", role: .destructive) {
                 guard let accountToDelete else { return }
-                if accountStore.selectedAccount?.id == accountToDelete.id {
-                    accountStore.selectAllAccounts()
+                if accountRepository.canDeleteAccount(accountToDelete) {
+                    accountRepository.deleteAccount(accountToDelete)
+                } else {
+                    showingDeleteBlocked = true
                 }
-                accountRepository.deleteAccount(accountToDelete)
                 self.accountToDelete = nil
             }
         } message: {
-            Text("This will remove the account and unlink its sources.")
+            Text("This will remove the account and all its sources and snapshots.")
+        }
+        .alert("Cannot Delete Account", isPresented: $showingDeleteBlocked) {
+            Button("OK") {}
+        } message: {
+            Text("The Default account cannot be deleted. You must keep at least one account.")
         }
         .toolbar {
             ToolbarItem(placement: .navigationBarTrailing) {