Remove ServiceLocator.featureFlagService dependency from POS

Author: staskus

WooCommerce/Classes/POS/Controllers/POSEntryPointController.swift

@@ -5,10 +5,10 @@ import protocol Experiments.FeatureFlagService
 @Observable final class POSEntryPointController {
     private(set) var eligibilityState: POSEligibilityState?
     private let posEligibilityChecker: POSEntryPointEligibilityCheckerProtocol
-    private let featureFlagService: FeatureFlagService
+    private let featureFlagService: POSFeatureFlagProviding
 
     init(eligibilityChecker: POSEntryPointEligibilityCheckerProtocol,
-         featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {
+         featureFlagService: POSFeatureFlagProviding) {
         self.posEligibilityChecker = eligibilityChecker
         self.featureFlagService = featureFlagService
 

WooCommerce/Classes/POS/Controllers/PointOfSaleOrderController.swift

@@ -44,7 +44,7 @@ protocol PointOfSaleOrderControllerProtocol {
          receiptService: POSReceiptServiceProtocol,
          currencySettings: CurrencySettings,
          analytics: POSAnalyticsProviding,
-         featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService,
+         featureFlagService: POSFeatureFlagProviding,
          pluginsService: PluginsServiceProtocol = PluginsService(storageManager: ServiceLocator.storageManager),
          celebration: PaymentCaptureCelebrationProtocol = PaymentCaptureCelebration()) {
         self.orderService = orderService
@@ -64,7 +64,7 @@ protocol PointOfSaleOrderControllerProtocol {
     private let celebration: PaymentCaptureCelebrationProtocol
     private let storeCurrency: CurrencyCode
     private let analytics: POSAnalyticsProviding
-    private let featureFlagService: FeatureFlagService
+    private let featureFlagService: POSFeatureFlagProviding
     private let pluginsService: PluginsServiceProtocol
 
     private(set) var orderState: PointOfSaleInternalOrderState = .idle

WooCommerce/Classes/POS/Presentation/Barcode Scanning/BarcodeScanningModifier.swift

@@ -9,8 +9,10 @@ struct BarcodeScanningModifier: ViewModifier {
     /// Callback that is triggered when a barcode is successfully scanned
     let onScan: (Result<String, HIDBarcodeParserError>) -> Void
 
+    @Environment(\.posFeatureFlags) private var featureFlags
+
     private var isBarcodeScani1FeatureEnabled: Bool {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1)
+        featureFlags.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1)
     }
 
     func body(content: Content) -> some View {

WooCommerce/Classes/POS/Presentation/Item Selector/SimpleProductCardView.swift

@@ -6,13 +6,14 @@ struct SimpleProductCardView: View {
 
     @ScaledMetric private var scale: CGFloat = 1.0
     @Environment(\.dynamicTypeSize) var dynamicTypeSize
+    @Environment(\.posFeatureFlags) private var featureFlags
 
     private var dimension: CGFloat {
         min(Constants.productCardSize * scale, Constants.maximumProductCardSize)
     }
 
     private var shouldShowProductLabels: Bool {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.inventoryProductLabelsInPOS)
+        featureFlags.isFeatureFlagEnabled(.inventoryProductLabelsInPOS)
     }
 
     init(product: POSSimpleProduct) {

WooCommerce/Classes/POS/Presentation/ItemListView.swift

@@ -9,6 +9,7 @@ struct ItemListView: View {
 
     @Environment(PointOfSaleAggregateModel.self) private var posModel
     @Environment(\.keyboardObserver) private var keyboardObserver
+    @Environment(\.posFeatureFlags) private var featureFlags
     @EnvironmentObject var modalManager: POSModalManager
 
     @Binding var selectedItemListType: ItemListType
@@ -56,11 +57,11 @@ struct ItemListView: View {
     @State private var didFinishSearch = true
 
     private var isBarcodeScani1FeatureEnabled: Bool {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1)
+        featureFlags.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1)
     }
 
     private var isBarcodeScanSimulatorEnabled: Bool {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.showPointOfSaleBarcodeSimulator)
+        featureFlags.isFeatureFlagEnabled(.showPointOfSaleBarcodeSimulator)
     }
 
     private var isAddingCouponAllowed: Bool {

WooCommerce/Classes/POS/Presentation/POSFloatingControlView.swift

@@ -6,6 +6,7 @@ struct POSFloatingControlView: View {
     @Environment(PointOfSaleAggregateModel.self) private var posModel
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
     @Environment(\.posAnalytics) private var analytics
+    @Environment(\.posFeatureFlags) private var featureFlags
     @Binding private var showExitPOSModal: Bool
     @Binding private var showSupport: Bool
     @Binding private var showDocumentation: Bool
@@ -58,7 +59,7 @@ struct POSFloatingControlView: View {
                         title: { Text(Localization.productRestrictionsInfo) },
                         icon: { Image(systemName: "magnifyingglass") })
                 }
-                if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1) {
+                if featureFlags.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1) {
                     Button {
                         showBarcodeScanningModal = true
                         analytics.track(.pointOfSaleBarcodeScanningMenuItemTapped)
@@ -94,7 +95,7 @@ struct POSFloatingControlView: View {
             SimpleProductsOnlyInformation(isPresented: $showProductRestrictionsModal)
         }
         .posModal(isPresented: $showBarcodeScanningModal) {
-            if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi2) {
+            if featureFlags.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi2) {
                 PointOfSaleBarcodeScannerSetup(isPresented: $showBarcodeScanningModal, analytics: analytics)
             } else {
                 PointOfSaleBarcodeScannerInformationModal(isPresented: $showBarcodeScanningModal)

WooCommerce/Classes/POS/Presentation/PointOfSaleEntryPointView.swift

@@ -47,7 +47,8 @@ struct PointOfSaleEntryPointView: View {
         self.searchHistoryService = searchHistoryService
         self.popularPurchasableItemsController = popularPurchasableItemsController
         self.barcodeScanService = barcodeScanService
-        self.posEntryPointController = POSEntryPointController(eligibilityChecker: posEligibilityChecker)
+        self.posEntryPointController = POSEntryPointController(eligibilityChecker: posEligibilityChecker,
+                                                               featureFlagService: services.featureFlags)
         self.services = services
     }
 
@@ -81,6 +82,8 @@ struct PointOfSaleEntryPointView: View {
         .environmentObject(posModalManager)
         .environment(\.posAnalytics, services.analytics)
         .environment(\.posCurrencySettings, services.currency)
+        .environment(\.posStores, services.stores)
+        .environment(\.posFeatureFlags, services.featureFlags)
         .injectKeyboardObserver()
         .onAppear {
             onPointOfSaleModeActiveStateChange(true)

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -130,7 +130,8 @@ private extension POSTabCoordinator {
                     orderController: PointOfSaleOrderController(orderService: orderService,
                                                                 receiptService: receiptService,
                                                                 currencySettings: serviceAdaptor.currency,
-                                                                analytics: serviceAdaptor.analytics),
+                                                                analytics: serviceAdaptor.analytics,
+                                                                featureFlagService: serviceAdaptor.featureFlags),
                     collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker,
                     searchHistoryService: POSSearchHistoryService(siteID: siteID),
                     popularPurchasableItemsController: PointOfSaleItemsController(

WooCommerce/Classes/POS/Utils/PreviewHelpers.swift

@@ -222,7 +222,8 @@ struct POSPreviewHelpers {
         barcodeScanService: PointOfSaleBarcodeScanServiceProtocol = PointOfSalePreviewBarcodeScanService()
     ) -> PointOfSaleAggregateModel {
         return PointOfSaleAggregateModel(
-            entryPointController: POSEntryPointController(eligibilityChecker: LegacyPOSTabEligibilityChecker(siteID: 0)),
+            entryPointController: POSEntryPointController(eligibilityChecker: LegacyPOSTabEligibilityChecker(siteID: 0),
+                                                          featureFlagService: POSPreviewFeatureFlags()),
             itemsController: itemsController,
             purchasableItemsSearchController: purchasableItemsSearchController,
             couponsController: couponsController,

WooCommerce/WooCommerceTests/Mocks/MockFeatureFlagService.swift

@@ -1,7 +1,7 @@
 @testable import WooCommerce
 import Experiments
 
-final class MockFeatureFlagService: FeatureFlagService {
+final class MockFeatureFlagService: FeatureFlagService, POSFeatureFlagProviding {
     var isInboxOn: Bool
     var isShowInboxCTAEnabled: Bool
     var isUpdateOrderOptimisticallyOn: Bool