Base fixes and test harness

PortfolioJournal/Views/Goals/GoalEditorView.swift

@@ -17,13 +17,31 @@ struct GoalEditorView: View {
         self.goal = goal
     }
 
+    private var currencySymbol: String {
+        if let account = account, let code = account.currency, !code.isEmpty {
+            return CurrencyFormatter.symbol(for: code)
+        }
+        return AppSettings.getOrCreate(in: CoreDataStack.shared.viewContext).currencySymbol
+    }
+
+    private var currencyCode: String {
+        if let account = account, let code = account.currency, !code.isEmpty {
+            return code
+        }
+        return AppSettings.getOrCreate(in: CoreDataStack.shared.viewContext).currency
+    }
+
     var body: some View {
         NavigationStack {
             Form {
                 Section {
                     TextField("Goal name", text: $name)
-                    TextField("Target amount", text: $targetAmount)
-                        .keyboardType(.decimalPad)
+                    HStack {
+                        Text(currencySymbol)
+                            .foregroundColor(.secondary)
+                        TextField("Target amount", text: $targetAmount)
+                            .keyboardType(.decimalPad)
+                    }
 
                     Toggle("Add target date", isOn: $includeTargetDate)
                     if includeTargetDate {
@@ -51,7 +69,7 @@ struct GoalEditorView: View {
             guard let goal, !didLoadGoal else { return }
             name = goal.name ?? ""
             if let amount = goal.targetAmount?.decimalValue {
-                targetAmount = NSDecimalNumber(decimal: amount).stringValue
+                targetAmount = formatDecimalForInput(amount)
             }
             if let target = goal.targetDate {
                 includeTargetDate = true
@@ -87,10 +105,39 @@ struct GoalEditorView: View {
     }
 
     private func parseDecimal(_ value: String) -> Decimal? {
+        let locale = CurrencyFormatter.locale(for: currencyCode)
         let cleaned = value
+            .replacingOccurrences(of: currencySymbol, with: "")
+            .replacingOccurrences(of: locale.groupingSeparator ?? "", with: "")
+            .trimmingCharacters(in: .whitespaces)
+
+        guard !cleaned.isEmpty else { return nil }
+
+        let formatter = NumberFormatter()
+        formatter.numberStyle = .decimal
+        formatter.locale = locale
+
+        if let result = formatter.number(from: cleaned)?.decimalValue {
+            return result
+        }
+
+        // Fallback for mixed locale input
+        let normalized = cleaned
+            .replacingOccurrences(of: locale.decimalSeparator ?? ",", with: ".")
             .replacingOccurrences(of: ",", with: ".")
-            .replacingOccurrences(of: " ", with: "")
-        return Decimal(string: cleaned)
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        return formatter.number(from: normalized)?.decimalValue
+    }
+
+    private func formatDecimalForInput(_ decimal: Decimal) -> String {
+        let locale = CurrencyFormatter.locale(for: currencyCode)
+        let formatter = NumberFormatter()
+        formatter.numberStyle = .decimal
+        formatter.locale = locale
+        formatter.minimumFractionDigits = 0
+        formatter.maximumFractionDigits = 2
+        formatter.groupingSeparator = ""
+        return formatter.string(from: decimal as NSDecimalNumber) ?? ""
     }
 }