Simplify itemList display

woocommerce · Oct 30, 2024 · 74f084d · 74f084d
1 parent 3c48363
commit 74f084d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 37 deletions.
diff --git a/WooCommerce/Classes/POS/PointOfSaleItemListState.swift b/WooCommerce/Classes/POS/PointOfSaleItemListState.swift
@@ -7,35 +7,6 @@ enum PointOfSaleItemListState: Equatable {
     case loaded([POSItem])
     case error(PointOfSaleErrorState)
 
-    var isLoaded: Bool {
-        switch self {
-        case .loaded:
-            return true
-        default:
-            return false
-        }
-    }
-
-    var isLoading: Bool {
-        switch self {
-        case .loading:
-            return true
-        default:
-            return false
-        }
-    }
-
-    var hasError: PointOfSaleErrorState {
-        switch self {
-        case .error(let errorModel):
-            return errorModel
-        default:
-            return PointOfSaleErrorState(title: "Unknown error",
-                                         subtitle: "Unknown error",
-                                         buttonText: "Retry")
-        }
-    }
-
     // Equatable conformance for testing:
     static func == (lhs: PointOfSaleItemListState, rhs: PointOfSaleItemListState) -> Bool {
         switch (lhs, rhs) {

diff --git a/WooCommerce/Classes/POS/Presentation/PointOfSaleDashboardView.swift b/WooCommerce/Classes/POS/Presentation/PointOfSaleDashboardView.swift
@@ -27,23 +27,24 @@ struct PointOfSaleDashboardView: View {
 
     var body: some View {
         ZStack(alignment: .bottomLeading) {
-            if posModel.itemListState == .initialLoading {
+            switch posModel.itemListState {
+            case .initialLoading:
                 PointOfSaleLoadingView()
                     .transition(.opacity)
                     .ignoresSafeArea()
-            } else if viewModel.isError {
-                let errorContents = posModel.itemListState.hasError
+            case .error(let errorContents):
                 PointOfSaleItemListErrorView(error: errorContents, onRetry: {
                     Task {
                         await posModel.reloadItems()
                     }
                 })
-            } else if viewModel.isEmpty {
+            case .empty:
                 PointOfSaleItemListEmptyView()
-            } else {
+            case .loading, .loaded:
                 contentView
                     .accessibilitySortPriority(2)
             }
+
             POSFloatingControlView(posModel: posModel,
                                    showExitPOSModal: $showExitPOSModal,
                                    showSupport: $showSupport)

diff --git a/WooCommerce/Classes/POS/ViewModels/ItemListViewModel.swift b/WooCommerce/Classes/POS/ViewModels/ItemListViewModel.swift
@@ -19,9 +19,7 @@ final class ItemListViewModel: ItemListViewModelProtocol {
         if UserDefaults.standard.bool(forKey: BannerState.isSimpleProductsOnlyBannerDismissedKey) == true {
             return false
         }
-        return !isHeaderBannerDismissed &&
-        (posModel.itemListState.isLoaded || posModel.itemListState.isLoading) &&
-        items.isNotEmpty
+        return !isHeaderBannerDismissed && items.isNotEmpty
     }
 
     init(posModel: PointOfSaleAggregateModel) {