Keep the errorState free of IDs

Author: joshheald

Modules/Sources/PointOfSale/Models/PointOfSaleErrorState.swift

@@ -1,7 +1,7 @@
 import Foundation
 import enum Alamofire.AFError
 
-struct PointOfSaleErrorState: Equatable, Identifiable {
+struct PointOfSaleErrorState: Equatable {
     enum ErrorType: Equatable {
         case initialCatalogSyncError
         case refreshCatalogSyncError
@@ -17,7 +17,6 @@ struct PointOfSaleErrorState: Equatable, Identifiable {
         case ordersNextPageError
     }
 
-    let id = UUID()
     let errorType: ErrorType
     let title: String
     let subtitle: String

Modules/Sources/PointOfSale/Presentation/Settings/POSSettingsLocalCatalogDetailView.swift

@@ -29,8 +29,8 @@ struct POSSettingsLocalCatalogDetailView: View {
         .task {
             await viewModel.loadCatalogData()
         }
-        .posModal(item: $viewModel.catalogRefreshError) { errorState in
-            errorView(errorState: errorState)
+        .posModal(item: $viewModel.catalogRefreshError) { error in
+            errorView(errorState: error.errorState)
         }
     }
 }

Modules/Sources/PointOfSale/Presentation/Settings/POSSettingsLocalCatalogViewModel.swift

@@ -12,7 +12,7 @@ final class POSSettingsLocalCatalogViewModel {
     private(set) var isLoading: Bool = false
     private(set) var isRefreshingCatalog: Bool = false
 
-    var catalogRefreshError: PointOfSaleErrorState? = nil
+    var catalogRefreshError: POSIdentifiableErrorState? = nil
 
     private let siteID: Int64
     private let catalogSettingsService: POSCatalogSettingsServiceProtocol
@@ -89,7 +89,7 @@ final class POSSettingsLocalCatalogViewModel {
         } catch {
             DDLogError("⛔️ POSSettingsLocalCatalog: Failed to refresh catalog: \(error)")
             isRefreshingCatalog = false
-            catalogRefreshError = PointOfSaleErrorState.errorOnRefreshingCatalog(error: error)
+            catalogRefreshError = POSIdentifiableErrorState(errorState: .errorOnRefreshingCatalog(error: error))
         }
     }
 
@@ -177,3 +177,8 @@ private extension POSSettingsLocalCatalogViewModel {
         )
     }
 }
+
+struct POSIdentifiableErrorState: Identifiable, Equatable {
+    let errorState: PointOfSaleErrorState
+    let id = UUID()
+}

Modules/Tests/PointOfSaleTests/Presentation/Settings/POSSettingsLocalCatalogViewModelTests.swift

@@ -191,7 +191,7 @@ struct POSSettingsLocalCatalogViewModelTests {
 
         // Then
         let catalogRefreshError = try #require(sut.catalogRefreshError)
-        #expect(catalogRefreshError.errorType == .refreshCatalogSyncError)
+        #expect(catalogRefreshError.errorState.errorType == .refreshCatalogSyncError)
     }
 
     // MARK: - Test Concurrent Operations