From 3d4c636de818b5e6da01a21740ccc9e3c4d8cbf1 Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Sun, 17 Sep 2023 20:32:57 +0200
Subject: [PATCH] Cleanup

---
 Packages/Env/Sources/Env/CustomEnvValues.swift           | 9 ---------
 .../Status/Sources/Status/Detail/StatusDetailView.swift  | 1 -
 .../Sources/Status/Detail/StatusDetailViewModel.swift    | 6 ++----
 Packages/Status/Sources/Status/Row/StatusRowView.swift   | 1 -
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Packages/Env/Sources/Env/CustomEnvValues.swift b/Packages/Env/Sources/Env/CustomEnvValues.swift
index a844a261..9b298ce5 100644
--- a/Packages/Env/Sources/Env/CustomEnvValues.swift
+++ b/Packages/Env/Sources/Env/CustomEnvValues.swift
@@ -21,10 +21,6 @@ private struct IsSupporter: EnvironmentKey {
   static let defaultValue: Bool = false
 }
 
-private struct IsStatusDetailLoaded: EnvironmentKey {
-  static let defaultValue: Bool = false
-}
-
 private struct IsStatusFocused: EnvironmentKey {
   static let defaultValue: Bool = false
 }
@@ -59,11 +55,6 @@ public extension EnvironmentValues {
     set { self[IsSupporter.self] = newValue }
   }
 
-  var isStatusDetailLoaded: Bool {
-    get { self[IsStatusDetailLoaded.self] }
-    set { self[IsStatusDetailLoaded.self] = newValue }
-  }
-
   var isStatusFocused: Bool {
     get { self[IsStatusFocused.self] }
     set { self[IsStatusFocused.self] = newValue }
diff --git a/Packages/Status/Sources/Status/Detail/StatusDetailView.swift b/Packages/Status/Sources/Status/Detail/StatusDetailView.swift
index 00d35cf1..3eb6b3bd 100644
--- a/Packages/Status/Sources/Status/Detail/StatusDetailView.swift
+++ b/Packages/Status/Sources/Status/Detail/StatusDetailView.swift
@@ -112,7 +112,6 @@ public struct StatusDetailView: View {
         .environment(\.extraLeadingInset, isReplyToPrevious ? 10 : 0)
         .environment(\.isStatusReplyToPrevious, isReplyToPrevious)
         .environment(\.isStatusFocused, isFocused)
-        .environment(\.isStatusDetailLoaded, isFocused ? !self.viewModel.isLoadingContext : false)
         .overlay {
           if isFocused {
             GeometryReader { reader in
diff --git a/Packages/Status/Sources/Status/Detail/StatusDetailViewModel.swift b/Packages/Status/Sources/Status/Detail/StatusDetailViewModel.swift
index 5ec0a4fe..d7e9c0e2 100644
--- a/Packages/Status/Sources/Status/Detail/StatusDetailViewModel.swift
+++ b/Packages/Status/Sources/Status/Detail/StatusDetailViewModel.swift
@@ -17,9 +17,10 @@ import SwiftUI
   }
 
   var state: State = .loading
-  var isLoadingContext = true
   var title: LocalizedStringKey = ""
   var scrollToId: String?
+  
+  @ObservationIgnored
   var isReplyToPreviousCache: [String: Bool] = [:]
 
   init(statusId: String) {
@@ -75,7 +76,6 @@ import SwiftUI
   private func fetchStatusDetail(animate: Bool) async {
     guard let client, let statusId else { return }
     do {
-      isLoadingContext = true
       let data = try await fetchContextData(client: client, statusId: statusId)
       title = "status.post-from-\(data.status.account.displayNameWithoutEmojis)"
       var statuses = data.context.ancestors
@@ -87,11 +87,9 @@ import SwiftUI
       if animate {
         withAnimation {
           state = .display(statuses: statuses)
-          isLoadingContext = false
         }
       } else {
         state = .display(statuses: statuses)
-        isLoadingContext = false
         scrollToId = statusId
       }
     } catch {
diff --git a/Packages/Status/Sources/Status/Row/StatusRowView.swift b/Packages/Status/Sources/Status/Row/StatusRowView.swift
index 61c89672..11510830 100644
--- a/Packages/Status/Sources/Status/Row/StatusRowView.swift
+++ b/Packages/Status/Sources/Status/Row/StatusRowView.swift
@@ -13,7 +13,6 @@ public struct StatusRowView: View {
   @Environment(\.isCompact) private var isCompact: Bool
   @Environment(\.accessibilityVoiceOverEnabled) private var accessibilityVoiceOverEnabled
   @Environment(\.isStatusFocused) private var isFocused
-  @Environment(\.isStatusDetailLoaded) private var isStatusDetailLoaded
   @Environment(\.isStatusReplyToPrevious) private var isStatusReplyToPrevious
 
   @Environment(QuickLook.self) private var quickLook