Isaias soria

App/AppState.swift

@@ -1,22 +1,26 @@
-/* import SwiftUI
-
-final class AppState: ObservableObject {
-    @Published var plannerVM = MealPlannerViewModel()
-    @Published var goalsVM = GoalsViewModel()
-    @Published var historyVM = HistoryViewModel()
-} */
-
 import SwiftUI
+import Combine
 
 final class AppState: ObservableObject {
 
     let plannerVM: MealPlannerViewModel
     let goalsVM: GoalsViewModel
     let historyVM: HistoryViewModel
 
+    private var cancellables = Set<AnyCancellable>()
+
     init() {
         self.plannerVM = MealPlannerViewModel()
-        self.goalsVM = GoalsViewModel()
+        self.goalsVM   = GoalsViewModel()
         self.historyVM = HistoryViewModel()
+
+        // Keep GoalsViewModel in sync whenever plannerVM publishes any change.
+        plannerVM.objectWillChange
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                guard let self else { return }
+                self.goalsVM.sync(from: self.plannerVM)
+            }
+            .store(in: &cancellables)
     }
 }

ViewModels/Goals/GoalsViewModel.swift

@@ -13,5 +13,6 @@ final class GoalsViewModel: ObservableObject {
         currentProtein = planner.currentProtein
         currentCarbs = planner.currentCarbs
         currentFat = planner.currentFat
+        goals = planner.goals  
     }
 }