Pass catalog eligibility value when presenting POS

joshheald · joshheald · commit d402747ca74c · 2025-10-24T10:53:29.000+01:00
diff --git a/Modules/Sources/PointOfSale/Controllers/POSEntryPointController.swift b/Modules/Sources/PointOfSale/Controllers/POSEntryPointController.swift
@@ -5,8 +5,6 @@ public protocol POSEntryPointEligibilityCheckerProtocol {
     func checkEligibility() async -> POSEligibilityState
     /// Refreshes the eligibility state based on the provided ineligible reason.
     func refreshEligibility(ineligibleReason: POSIneligibleReason) async throws -> POSEligibilityState
-
-    var localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol? { get }
 }
 
 @Observable final class POSEntryPointController {
diff --git a/Modules/Sources/PointOfSale/Models/PointOfSaleSettingsController.swift b/Modules/Sources/PointOfSale/Models/PointOfSaleSettingsController.swift
@@ -24,11 +24,7 @@ protocol PointOfSaleSettingsControllerProtocol {
 
     let storeViewModel: POSSettingsStoreViewModel
     let localCatalogViewModel: POSSettingsLocalCatalogViewModel?
-    private let localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol?
-
-    var isLocalCatalogEligible: Bool {
-        localCatalogEligibilityService?.eligibilityState == .eligible
-    }
+    let isLocalCatalogEligible: Bool
 
     init(siteID: Int64,
          settingsService: PointOfSaleSettingsServiceProtocol,
@@ -38,13 +34,13 @@ protocol PointOfSaleSettingsControllerProtocol {
          siteSettings: [SiteSetting],
          grdbManager: GRDBManagerProtocol?,
          catalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol?,
-         localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol?) {
+         isLocalCatalogEligible: Bool) {
         self.storeViewModel = POSSettingsStoreViewModel(siteID: siteID,
                                                         settingsService: settingsService,
                                                         pluginsService: pluginsService,
                                                         defaultSiteName: defaultSiteName,
                                                         siteSettings: siteSettings)
-        self.localCatalogEligibilityService = localCatalogEligibilityService
+        self.isLocalCatalogEligible = isLocalCatalogEligible
 
         if let catalogSyncCoordinator, let grdbManager {
             self.localCatalogViewModel = POSSettingsLocalCatalogViewModel(
diff --git a/Modules/Sources/PointOfSale/Presentation/PointOfSaleEntryPointView.swift b/Modules/Sources/PointOfSale/Presentation/PointOfSaleEntryPointView.swift
@@ -63,12 +63,12 @@ public struct PointOfSaleEntryPointView: View {
          siteSettings: [SiteSetting],
          grdbManager: GRDBManagerProtocol?,
          catalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol?,
+         isLocalCatalogEligible: Bool,
          services: POSDependencyProviding) {
         self.onPointOfSaleModeActiveStateChange = onPointOfSaleModeActiveStateChange
 
         // Use observable controller with GRDB if local catalog is eligible,
         // otherwise fall back to standard controller.
-        let isLocalCatalogEligible = services.localCatalogEligibility.localCatalogEligibilityService?.eligibilityState == .eligible
         if isLocalCatalogEligible, let grdbManager = grdbManager {
             self.itemsController = PointOfSaleObservableItemsController(
                 siteID: siteID,
@@ -113,7 +113,7 @@ public struct PointOfSaleEntryPointView: View {
                                                                 siteSettings: siteSettings,
                                                                 grdbManager: grdbManager,
                                                                 catalogSyncCoordinator: catalogSyncCoordinator,
-                                                                localCatalogEligibilityService: services.localCatalogEligibility.localCatalogEligibilityService)
+                                                                isLocalCatalogEligible: isLocalCatalogEligible)
         self.collectOrderPaymentAnalyticsTracker = collectOrderPaymentAnalyticsTracker
         self.searchHistoryService = searchHistoryService
         self.popularPurchasableItemsController = PointOfSaleItemsController(
@@ -203,6 +203,7 @@ public struct PointOfSaleEntryPointView: View {
         siteSettings: [],
         grdbManager: nil,
         catalogSyncCoordinator: nil,
+        isLocalCatalogEligible: false,
         services: POSPreviewServices()
     )
 }
diff --git a/Modules/Sources/PointOfSale/Protocols/POSDependencyProviding.swift b/Modules/Sources/PointOfSale/Protocols/POSDependencyProviding.swift
@@ -64,11 +64,6 @@ public protocol POSExternalViewProviding {
     func createWCWebView(adminUrl: URL, completion: @escaping () -> Void) -> AnyView
 }
 
-/// Protocol that provides local catalog eligibility service for POS
-public protocol POSLocalCatalogEligibilityProviding {
-    var localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol? { get }
-}
-
 /// Main protocol that combines all POS dependency providers
 /// This enables dependency injection for POS code while maintaining clean separation from ServiceLocator
 public protocol POSDependencyProviding {
@@ -78,5 +73,4 @@ public protocol POSDependencyProviding {
     var connectivity: POSConnectivityProviding { get }
     var externalNavigation: POSExternalNavigationProviding { get }
     var externalViews: POSExternalViewProviding { get }
-    var localCatalogEligibility: POSLocalCatalogEligibilityProviding { get }
 }
diff --git a/Modules/Sources/PointOfSale/Utils/POSEnvironmentKeys.swift b/Modules/Sources/PointOfSale/Utils/POSEnvironmentKeys.swift
@@ -160,8 +160,3 @@ struct EmptyPOSExternalView: POSExternalViewProviding {
     }
     init() {}
 }
-
-struct EmptyPOSLocalCatalogEligibility: POSLocalCatalogEligibilityProviding {
-    var localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol? = nil
-    init() {}
-}
diff --git a/Modules/Sources/PointOfSale/Utils/PreviewHelpers.swift b/Modules/Sources/PointOfSale/Utils/PreviewHelpers.swift
@@ -471,7 +471,6 @@ final class PointOfSalePreviewBarcodeScanService: PointOfSaleBarcodeScanServiceP
 }
 
 final class PointOfSalePreviewTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
-    var localCatalogEligibilityService: (any POSLocalCatalogEligibilityServiceProtocol)? = nil
     func checkEligibility() async -> POSEligibilityState { .eligible }
     func refreshEligibility(ineligibleReason: POSIneligibleReason) async throws -> POSEligibilityState { .eligible }
 }
@@ -591,7 +590,6 @@ final class POSPreviewServices: POSDependencyProviding {
     var connectivity: POSConnectivityProviding = EmptyPOSConnectivityProvider()
     var externalNavigation: POSExternalNavigationProviding = EmptyPOSExternalNavigation()
     var externalViews: POSExternalViewProviding = EmptyPOSExternalView()
-    var localCatalogEligibility: POSLocalCatalogEligibilityProviding = EmptyPOSLocalCatalogEligibility()
 }
 
 // MARK: - Preview Catalog Services
diff --git a/Modules/Tests/PointOfSaleTests/Controllers/PointOfSaleSettingsControllerTests.swift b/Modules/Tests/PointOfSaleTests/Controllers/PointOfSaleSettingsControllerTests.swift
@@ -21,7 +21,7 @@ struct PointOfSaleSettingsControllerTests {
                                                 siteSettings: [],
                                                 grdbManager: nil,
                                                 catalogSyncCoordinator: nil,
-                                                localCatalogEligibilityService: MockPOSLocalCatalogEligibilityService())
+                                                isLocalCatalogEligible: true)
 
         // When
         let cardReader = sut.connectedCardReader
@@ -41,7 +41,7 @@ struct PointOfSaleSettingsControllerTests {
                                                 siteSettings: [],
                                                 grdbManager: nil,
                                                 catalogSyncCoordinator: nil,
-                                                localCatalogEligibilityService: MockPOSLocalCatalogEligibilityService())
+                                                isLocalCatalogEligible: true)
 
         // Initially nil
         #expect(sut.connectedCardReader == nil)
diff --git a/Modules/Tests/PointOfSaleTests/Mocks/MockPOSEligibilityChecker.swift b/Modules/Tests/PointOfSaleTests/Mocks/MockPOSEligibilityChecker.swift
@@ -2,7 +2,6 @@ import Foundation
 @testable import PointOfSale
 
 final class MockPOSEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
-    var localCatalogEligibilityService: (any POSLocalCatalogEligibilityServiceProtocol)? = nil
     var initialVisibility: Bool = false
     var visibility: Bool = false
     var eligibility: POSEligibilityState = .eligible
diff --git a/WooCommerce/Classes/POS/Adaptors/POSServiceLocatorAdaptor.swift b/WooCommerce/Classes/POS/Adaptors/POSServiceLocatorAdaptor.swift
@@ -12,14 +12,9 @@ import protocol PointOfSale.POSFeatureFlagProviding
 import protocol PointOfSale.POSConnectivityProviding
 import protocol PointOfSale.POSExternalNavigationProviding
 import protocol PointOfSale.POSExternalViewProviding
-import protocol PointOfSale.POSLocalCatalogEligibilityProviding
-import protocol PointOfSale.POSLocalCatalogEligibilityServiceProtocol
 
 final class POSServiceLocatorAdaptor: POSDependencyProviding {
-    private let _localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol?
-
-    init(localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol?) {
-        self._localCatalogEligibilityService = localCatalogEligibilityService
+    init() {
     }
 
     var analytics: POSAnalyticsProviding {
@@ -45,10 +40,6 @@ final class POSServiceLocatorAdaptor: POSDependencyProviding {
     var externalViews: POSExternalViewProviding {
         POSExternalViewAdaptor()
     }
-
-    var localCatalogEligibility: POSLocalCatalogEligibilityProviding {
-        POSLocalCatalogEligibilityAdaptor(service: _localCatalogEligibilityService)
-    }
 }
 
 // MARK: - Individual Service Adaptors
@@ -141,11 +132,3 @@ private struct POSExternalViewAdaptor: POSExternalViewProviding {
         AnyView(WCSettingsWebView(adminUrl: adminUrl, completion: completion))
     }
 }
-
-private struct POSLocalCatalogEligibilityAdaptor: POSLocalCatalogEligibilityProviding {
-    let localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol?
-
-    init(service: POSLocalCatalogEligibilityServiceProtocol?) {
-        self.localCatalogEligibilityService = service
-    }
-}
diff --git a/WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift b/WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift
@@ -42,6 +42,9 @@ final class POSTabCoordinator {
     private let pushNotesManager: PushNotesManager
     private let eligibilityChecker: POSEntryPointEligibilityCheckerProtocol
 
+    /// Local catalog eligibility service - created asynchronously during init
+    private(set) var localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol?
+
     private lazy var posItemFetchStrategyFactory: PointOfSaleItemFetchStrategyFactory = {
         PointOfSaleItemFetchStrategyFactory(siteID: siteID,
                                             credentials: credentials,
@@ -123,6 +126,26 @@ final class POSTabCoordinator {
         self.eligibilityChecker = eligibilityChecker
 
         tabContainerController.wrappedController = POSTabViewController()
+
+        // Create local catalog eligibility service asynchronously
+        // Check POS tab eligibility first, then create service with that state
+        Task { @MainActor [weak self] in
+            guard let self else { return }
+
+            let posEligibility = await eligibilityChecker.checkEligibility()
+
+            let service = await POSLocalCatalogEligibilityService(
+                siteID: siteID,
+                catalogSizeChecker: POSCatalogSizeChecker(
+                    credentials: credentials,
+                    selectedSite: defaultSitePublisher,
+                    appPasswordSupportState: isAppPasswordSupported
+                ),
+                posTabEligibilityState: posEligibility
+            )
+
+            self.localCatalogEligibilityService = service
+        }
     }
 
     func onTabSelected() {
@@ -143,35 +166,24 @@ private extension POSTabCoordinator {
         Task { @MainActor [weak self] in
             guard let self else { return }
 
-            // Check local catalog eligibility before initializing infrastructure
-            // Try to use pre-created service from eligibility checker, otherwise create it now
-            let localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol
-            if let preCreatedService = eligibilityChecker.localCatalogEligibilityService {
-                localCatalogEligibilityService = preCreatedService
+            // Get local catalog eligibility as bool from service
+            // Service is created asynchronously in init, might not be ready yet
+            let isLocalCatalogEligible: Bool
+            if let service = localCatalogEligibilityService {
+                // Retry transient failures before using the value
+                switch service.eligibilityState {
+                case .ineligible(reason: .catalogSizeCheckFailed), .ineligible(reason: .posTabNotEligible):
+                    await service.refreshEligibilityState()
+                default:
+                    break
+                }
+                isLocalCatalogEligible = service.eligibilityState == .eligible
             } else {
-                // Fallback: assume we're POS eligible and create service
-                localCatalogEligibilityService = await POSLocalCatalogEligibilityService(
-                    siteID: siteID,
-                    catalogSizeChecker: POSCatalogSizeChecker(credentials: credentials,
-                                                              selectedSite: defaultSitePublisher,
-                                                              appPasswordSupportState: isAppPasswordSupported
-                    ),
-                    posTabEligibilityState: .eligible
-                )
+                // Service not ready yet (rare race condition), assume ineligible
+                isLocalCatalogEligible = false
             }
 
-            switch localCatalogEligibilityService.eligibilityState {
-            case .ineligible(reason: .catalogSizeCheckFailed):
-                // If we cached a failed check, we can recover by refreshing the value before we next open POS
-                await localCatalogEligibilityService.refreshEligibilityState()
-            case .eligible, .ineligible:
-                break
-            }
-
-            let isLocalCatalogEligible = localCatalogEligibilityService.eligibilityState == .eligible
-
-            // Create service adaptor with eligibility service
-            let serviceAdaptor = POSServiceLocatorAdaptor(localCatalogEligibilityService: localCatalogEligibilityService)
+            let serviceAdaptor = POSServiceLocatorAdaptor()
             let collectPaymentAnalyticsAdaptor = POSCollectOrderPaymentAnalyticsAdaptor(analytics: serviceAdaptor.analytics)
             let cardPresentPaymentService = await CardPresentPaymentService(siteID: siteID,
                                                                             stores: storesManager,
@@ -233,6 +245,7 @@ private extension POSTabCoordinator {
                     siteSettings: ServiceLocator.selectedSiteSettings.siteSettings,
                     grdbManager: grdbManager,
                     catalogSyncCoordinator: catalogSyncCoordinator,
+                    isLocalCatalogEligible: isLocalCatalogEligible,
                     services: serviceAdaptor
                 )
 
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabEligibilityChecker.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabEligibilityChecker.swift
@@ -20,9 +20,7 @@ import class WooFoundation.VersionHelpers
 import protocol PointOfSale.POSEntryPointEligibilityCheckerProtocol
 import enum PointOfSale.POSEligibilityState
 import enum PointOfSale.POSIneligibleReason
-import protocol PointOfSale.POSLocalCatalogEligibilityServiceProtocol
 import enum Yosemite.POSCountryCurrencyValidator
-import struct Yosemite.POSCatalogSizeChecker
 
 final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
     private let siteID: Int64
@@ -32,9 +30,6 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
     private let siteSettingService: POSSiteSettingServiceProtocol
     private let appPasswordSupportState: ApplicationPasswordsExperimentState
 
-    /// Local catalog eligibility service - created asynchronously on init
-    private(set) var localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol?
-
     init(siteID: Int64,
          siteSettings: SelectedSiteSettingsProtocol = ServiceLocator.selectedSiteSettings,
          stores: StoresManager = ServiceLocator.stores,
@@ -59,23 +54,6 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
             selectedSite: selectedSite,
             appPasswordSupportState: appPasswordSupport
         )
-
-        // Create local catalog eligibility service asynchronously in the background
-        // First check POS tab eligibility, then create the catalog eligibility service with that state
-        Task { @MainActor in
-            let posEligibility = await self.checkEligibility()
-
-            let eligibilityService = await POSLocalCatalogEligibilityService(
-                siteID: siteID,
-                catalogSizeChecker: POSCatalogSizeChecker(
-                    credentials: credentials,
-                    selectedSite: selectedSite,
-                    appPasswordSupportState: appPasswordSupport
-                ),
-                posTabEligibilityState: posEligibility
-            )
-            self.localCatalogEligibilityService = eligibilityService
-        }
     }
 
     /// Determines whether the POS entry point can be shown based on the selected store and feature gates.
diff --git a/WooCommerce/WooCommerceTests/Mocks/MockPOSEligibilityChecker.swift b/WooCommerce/WooCommerceTests/Mocks/MockPOSEligibilityChecker.swift
@@ -2,11 +2,9 @@ import Foundation
 import enum PointOfSale.POSEligibilityState
 import enum PointOfSale.POSIneligibleReason
 import protocol PointOfSale.POSEntryPointEligibilityCheckerProtocol
-import protocol PointOfSale.POSLocalCatalogEligibilityServiceProtocol
 @testable import WooCommerce
 
 final class MockPOSEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
-    var localCatalogEligibilityService: (any POSLocalCatalogEligibilityServiceProtocol)? = nil
     var eligibility: POSEligibilityState = .eligible
 
     @MainActor

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ public protocol POSEntryPointEligibilityCheckerProtocol {`
`5`	`5`	`func checkEligibility() async -> POSEligibilityState`
`6`	`6`	`/// Refreshes the eligibility state based on the provided ineligible reason.`
`7`	`7`	`func refreshEligibility(ineligibleReason: POSIneligibleReason) async throws -> POSEligibilityState`
`8`		`-`
`9`		`- var localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol? { get }`
`10`	`8`	`}`
`11`	`9`
`12`	`10`	`@Observable final class POSEntryPointController {`
Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,3 @@ struct EmptyPOSExternalView: POSExternalViewProviding {`
`160`	`160`	`}`
`161`	`161`	`init() {}`
`162`	`162`	`}`
`163`		`-`
`164`		`-struct EmptyPOSLocalCatalogEligibility: POSLocalCatalogEligibilityProviding {`
`165`		`- var localCatalogEligibilityService: POSLocalCatalogEligibilityServiceProtocol? = nil`
`166`		`- init() {}`
`167`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,6 @@ final class PointOfSalePreviewBarcodeScanService: PointOfSaleBarcodeScanServiceP`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`final class PointOfSalePreviewTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {`
`474`		`- var localCatalogEligibilityService: (any POSLocalCatalogEligibilityServiceProtocol)? = nil`
`475`	`474`	`func checkEligibility() async -> POSEligibilityState { .eligible }`
`476`	`475`	`func refreshEligibility(ineligibleReason: POSIneligibleReason) async throws -> POSEligibilityState { .eligible }`
`477`	`476`	`}`
`@@ -591,7 +590,6 @@ final class POSPreviewServices: POSDependencyProviding {`
`591`	`590`	`var connectivity: POSConnectivityProviding = EmptyPOSConnectivityProvider()`
`592`	`591`	`var externalNavigation: POSExternalNavigationProviding = EmptyPOSExternalNavigation()`
`593`	`592`	`var externalViews: POSExternalViewProviding = EmptyPOSExternalView()`
`594`		`- var localCatalogEligibility: POSLocalCatalogEligibilityProviding = EmptyPOSLocalCatalogEligibility()`
`595`	`593`	`}`
`596`	`594`
`597`	`595`	`// MARK: - Preview Catalog Services`