proper env

Author: Dimillian

App/IcySkyApp.swift

@@ -21,6 +21,7 @@ struct IcySkyApp: App {
   @State var currentUser: CurrentUser?
   @State var router: Router = .init()
   @State var isLoadingInitialSession: Bool = true
+  @State var postDataControllerProvider: PostDataControllerProvider = .init()
 
   init() {
     ImagePipeline.shared = ImagePipeline(configuration: .withDataCache)
@@ -44,6 +45,7 @@ struct IcySkyApp: App {
       .environment(currentUser)
       .environment(auth)
       .environment(router)
+      .environment(postDataControllerProvider)
       .modelContainer(for: RecentFeedItem.self)
       .sheet(
         item: $router.presentedSheet,

Packages/Features/Sources/NotificationsUI/Rows/SingleNotificationRow.swift

@@ -1,13 +1,14 @@
 import ATProtoKit
 import Models
+import Network
 import PostUI
 import Router
 import SwiftUI
-import Network
 
 struct SingleNotificationRow: View {
   @Environment(Router.self) var router
   @Environment(BSkyClient.self) var client
+  @Environment(PostDataControllerProvider.self) var postDataControllerProvider
 
   let notification: AppBskyLexicon.Notification.Notification
   let postItem: PostItem?
@@ -56,7 +57,7 @@ struct SingleNotificationRow: View {
           .onTapGesture {
             router.navigateTo(RouterDestination.post(postItem))
           }
-          .environment(PostDataController(post: postItem, client: client))
+          .environment(postDataControllerProvider.getController(for: postItem, client: client))
         }
       }
 

Packages/Features/Sources/PostUI/Row/PostRowView.swift

@@ -15,6 +15,7 @@ public struct PostRowView: View {
   @Environment(\.isFocused) var isFocused
   @Environment(\.sizeCategory) var sizeCategory
 
+  @Environment(PostDataControllerProvider.self) var postDataControllerProvider
   @Environment(Router.self) var router
   @Environment(BSkyClient.self) var client
 
@@ -35,7 +36,7 @@ public struct PostRowView: View {
       mainView
         .padding(.bottom, 18)
     }
-    .environment(PostDataController(post: post, client: client))
+    .environment(postDataControllerProvider.getController(for: post, client: client))
     .listRowSeparator(.hidden)
     .listRowInsets(.init(top: 0, leading: 18, bottom: 0, trailing: 18))
   }
@@ -186,5 +187,24 @@ public struct PostRowView: View {
     }
     .listStyle(.plain)
     .environment(Router())
+    .environment(PostDataControllerProvider())
+    .environment(
+      BSkyClient(
+        session: .init(
+          handle: "",
+          sessionDID: "",
+          email: nil,
+          isEmailConfirmed: nil,
+          isEmailAuthenticationFactorEnabled: nil,
+          accessToken: "",
+          refreshToken: "",
+          didDocument: nil,
+          isActive: nil,
+          status: nil,
+          pdsURL: nil,
+          logger: nil
+        )
+      )
+    )
   }
 }