Fix crashes in MainTabBarControllerTests due to fatalError from accessing ServiceLocator.grdbManager when the feature flag is disabled.

Author: jaclync

WooCommerce/Classes/POS/Models/PointOfSaleSettingsController.swift

@@ -30,14 +30,14 @@ protocol PointOfSaleSettingsControllerProtocol {
          pluginsService: PluginsServiceProtocol,
          defaultSiteName: String?,
          siteSettings: [SiteSetting],
-         grdbManager: GRDBManagerProtocol,
+         grdbManager: GRDBManagerProtocol?,
          catalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol?) {
         self.storeViewModel = POSSettingsStoreViewModel(siteID: siteID,
                                                         settingsService: settingsService,
                                                         pluginsService: pluginsService,
                                                         defaultSiteName: defaultSiteName,
                                                         siteSettings: siteSettings)
-        if let catalogSyncCoordinator {
+        if let catalogSyncCoordinator, let grdbManager {
             self.localCatalogViewModel = POSSettingsLocalCatalogViewModel(
                 siteID: siteID,
                 catalogSettingsService: POSCatalogSettingsService(grdbManager: grdbManager),

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -31,8 +31,6 @@ final class POSTabCoordinator {
     private let currencySettings: CurrencySettings
     private let pushNotesManager: PushNotesManager
     private let eligibilityChecker: POSEntryPointEligibilityCheckerProtocol
-    private let grdbManager: GRDBManagerProtocol
-    private let catalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol?
 
     private lazy var posItemFetchStrategyFactory: PointOfSaleItemFetchStrategyFactory = {
         PointOfSaleItemFetchStrategyFactory(siteID: siteID, credentials: credentials)
@@ -69,9 +67,7 @@ final class POSTabCoordinator {
          storageManager: StorageManagerType = ServiceLocator.storageManager,
          currencySettings: CurrencySettings = ServiceLocator.currencySettings,
          pushNotesManager: PushNotesManager = ServiceLocator.pushNotesManager,
-         eligibilityChecker: POSEntryPointEligibilityCheckerProtocol,
-         grdbManager: GRDBManagerProtocol = ServiceLocator.grdbManager,
-         catalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol? = ServiceLocator.posCatalogSyncCoordinator) {
+         eligibilityChecker: POSEntryPointEligibilityCheckerProtocol) {
         self.siteID = siteID
         self.storesManager = storesManager
         self.tabContainerController = tabContainerController
@@ -81,8 +77,6 @@ final class POSTabCoordinator {
         self.currencySettings = currencySettings
         self.pushNotesManager = pushNotesManager
         self.eligibilityChecker = eligibilityChecker
-        self.grdbManager = grdbManager
-        self.catalogSyncCoordinator = catalogSyncCoordinator
 
         tabContainerController.wrappedController = POSTabViewController()
     }
@@ -107,6 +101,8 @@ private extension POSTabCoordinator {
             let pluginsService = PluginsService(storageManager: storageManager)
             let siteTimezone = storesManager.sessionManager.defaultSite?.siteTimezone ?? .current
 
+            let grdbManager: GRDBManagerProtocol? = serviceAdaptor.featureFlags.isFeatureFlagEnabled(.pointOfSaleLocalCatalogi1) ? ServiceLocator.grdbManager : nil
+            let catalogSyncCoordinator = ServiceLocator.posCatalogSyncCoordinator
 
             if let receiptService = POSReceiptService(siteID: siteID,
                                                       credentials: credentials),

WooCommerce/WooCommerceTests/POS/Controllers/PointOfSaleSettingsControllerTests.swift

@@ -19,8 +19,8 @@ struct PointOfSaleSettingsControllerTests {
                                                 pluginsService: mockPluginService,
                                                 defaultSiteName: "Test Store",
                                                 siteSettings: [],
-                                                grdbManager: ServiceLocator.grdbManager,
-                                                catalogSyncCoordinator: ServiceLocator.posCatalogSyncCoordinator)
+                                                grdbManager: nil,
+                                                catalogSyncCoordinator: nil)
 
         // When
         let cardReader = sut.connectedCardReader
@@ -38,8 +38,8 @@ struct PointOfSaleSettingsControllerTests {
                                                 pluginsService: mockPluginService,
                                                 defaultSiteName: "Test Store",
                                                 siteSettings: [],
-                                                grdbManager: ServiceLocator.grdbManager,
-                                                catalogSyncCoordinator: ServiceLocator.posCatalogSyncCoordinator)
+                                                grdbManager: nil,
+                                                catalogSyncCoordinator: nil)
 
         // Initially nil
         #expect(sut.connectedCardReader == nil)