fix pagination issue when refreshing mastodon feed (#532)

Author: mltbnz

CriticalMapsKit/Sources/MastodonFeedFeature/TootFeedFeature.swift

@@ -58,13 +58,13 @@ public struct TootFeedFeature: Sendable {
       case .refresh:
         state.isRefreshing = true
         return .send(.fetchData)
-        
+
       case .fetchData:
         state.isLoading = true
-        return .run { [lastId = state.toots.last?.id] send in
+        return .run { send in
           await send(
             .fetchDataResponse(
-              Result { try await tootService.getToots(lastId) }
+              Result { try await tootService.getToots(nil) }
             )
           )
         }
@@ -88,8 +88,7 @@ public struct TootFeedFeature: Sendable {
         state.isLoading = false
         state.error = .init(
           title: L10n.ErrorState.title,
-          body: L10n.ErrorState.message,
-          error: .init(error: error)
+          body: L10n.ErrorState.message
         )
         return .none
 
@@ -121,8 +120,7 @@ public struct TootFeedFeature: Sendable {
         state.hasMore = false
         state.error = .init(
           title: L10n.ErrorState.title,
-          body: L10n.ErrorState.message,
-          error: .init(error: error)
+          body: L10n.ErrorState.message
         )
         return .none
 

CriticalMapsKit/Sources/MastodonFeedFeature/TootsListView.swift

@@ -29,15 +29,12 @@ public struct TootsListView: View {
 
 private struct LoadingView: View {
   var body: some View {
-    VStack {
-      Spacer()
-      ProgressView {
-        Text("Loading")
-          .foregroundColor(.textPrimary)
-          .font(.bodyOne)
-      }
-      Spacer()
+    ProgressView {
+      Text(L10n.Social.Feed.loading)
+        .foregroundColor(.textPrimary)
+        .font(.bodyOne)
     }
+    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
   }
 }
 

CriticalMapsKit/Sources/Styleguide/ErrorStateView.swift

@@ -21,7 +21,7 @@ public struct ErrorState: Equatable, Sendable {
 
     public init(
       error: Error,
-      file: StaticString = #fileID,
+      file: StaticString = #filePath,
       line: UInt = #line
     ) {
       var string = ""