wip

pointfreeco · stephencelis · Apr 9, 2024 · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023
commit 7b9ae18a1029c080a280aa8a663c072137c585c0
diff --git a/App/isowords.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/App/isowords.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -114,7 +114,7 @@
       "location" : "https://github.com/pointfreeco/swift-composable-architecture",
       "state" : {
         "branch" : "observation-beta",
-        "revision" : "06ca7d94b4d2d60c437e9c5b577dc4ae56e6c57f"
+        "revision" : "4e572f3be218d404b9d8e1347c8bc2aa46dd4b0c"
       }
     },
     {

diff --git a/Sources/MultiplayerFeature/PastGamesView.swift b/Sources/MultiplayerFeature/PastGamesView.swift
@@ -6,6 +6,7 @@ import SwiftUI
 
 @Reducer
 public struct PastGames {
+  @ObservableState
   public struct State: Equatable {
     public var pastGames: IdentifiedArrayOf<PastGame.State> = []
   }
@@ -60,18 +61,10 @@ public struct PastGames {
 struct PastGamesView: View {
   @Environment(\.colorScheme) var colorScheme
   let store: StoreOf<PastGames>
-  @ObservedObject var viewStore: ViewStoreOf<PastGames>
-
-  init(store: StoreOf<PastGames>) {
-    self.store = store
-    self.viewStore = ViewStore(self.store, observe: { $0 })
-  }
 
   var body: some View {
     ScrollView {
-      ForEachStore(
-        self.store.scope(state: \.pastGames, action: \.pastGames)
-      ) { store in
+      ForEach(store.scope(state: \.pastGames, action: \.pastGames)) { store in
         Group {
           PastGameRow(store: store)
 
@@ -83,7 +76,7 @@ struct PastGamesView: View {
       }
       .padding()
     }
-    .task { await viewStore.send(.task).finish() }
+    .task { await store.send(.task).finish() }
     .navigationStyle(
       backgroundColor: self.colorScheme == .dark ? .isowordsBlack : .multiplayer,
       foregroundColor: self.colorScheme == .dark ? .multiplayer : .isowordsBlack,