[POS as a tab i1] Cache POS tab visibility per site for initial value while checking eligibility async

Storage/Storage/Model/Copiable/Models+Copiable.generated.swift

@@ -114,7 +114,8 @@ extension Storage.GeneralStoreSettings {
         lastSelectedStockType: NullableCopiableProp<String> = .copy,
         lastSelectedOrderStatus: NullableCopiableProp<String> = .copy,
         favoriteProductIDs: CopiableProp<[Int64]> = .copy,
-        searchTermsByKey: CopiableProp<[String: [String]]> = .copy
+        searchTermsByKey: CopiableProp<[String: [String]]> = .copy,
+        isPOSTabVisible: NullableCopiableProp<Bool> = .copy
     ) -> Storage.GeneralStoreSettings {
         let storeID = storeID ?? self.storeID
         let isTelemetryAvailable = isTelemetryAvailable ?? self.isTelemetryAvailable
@@ -135,6 +136,7 @@ extension Storage.GeneralStoreSettings {
         let lastSelectedOrderStatus = lastSelectedOrderStatus ?? self.lastSelectedOrderStatus
         let favoriteProductIDs = favoriteProductIDs ?? self.favoriteProductIDs
         let searchTermsByKey = searchTermsByKey ?? self.searchTermsByKey
+        let isPOSTabVisible = isPOSTabVisible ?? self.isPOSTabVisible
 
         return Storage.GeneralStoreSettings(
             storeID: storeID,
@@ -155,7 +157,8 @@ extension Storage.GeneralStoreSettings {
             lastSelectedStockType: lastSelectedStockType,
             lastSelectedOrderStatus: lastSelectedOrderStatus,
             favoriteProductIDs: favoriteProductIDs,
-            searchTermsByKey: searchTermsByKey
+            searchTermsByKey: searchTermsByKey,
+            isPOSTabVisible: isPOSTabVisible
         )
     }
 }

Storage/Storage/Model/GeneralStoreSettings.swift

@@ -82,6 +82,10 @@ public struct GeneralStoreSettings: Codable, Equatable, GeneratedCopiable {
     ///
     public var searchTermsByKey: [String: [String]]
 
+    /// Whether the POS tab is visible for this store.
+    ///
+    public var isPOSTabVisible: Bool?
+
     public init(storeID: String? = nil,
                 isTelemetryAvailable: Bool = false,
                 telemetryLastReportedTime: Date? = nil,
@@ -100,7 +104,8 @@ public struct GeneralStoreSettings: Codable, Equatable, GeneratedCopiable {
                 lastSelectedStockType: String? = nil,
                 lastSelectedOrderStatus: String? = nil,
                 favoriteProductIDs: [Int64] = [],
-                searchTermsByKey: [String: [String]] = [:]) {
+                searchTermsByKey: [String: [String]] = [:],
+                isPOSTabVisible: Bool? = nil) {
         self.storeID = storeID
         self.isTelemetryAvailable = isTelemetryAvailable
         self.telemetryLastReportedTime = telemetryLastReportedTime
@@ -120,6 +125,7 @@ public struct GeneralStoreSettings: Codable, Equatable, GeneratedCopiable {
         self.lastSelectedOrderStatus = lastSelectedOrderStatus
         self.favoriteProductIDs = favoriteProductIDs
         self.searchTermsByKey = searchTermsByKey
+        self.isPOSTabVisible = isPOSTabVisible
     }
 
     public func erasingSelectedTaxRateID() -> GeneralStoreSettings {
@@ -140,7 +146,8 @@ public struct GeneralStoreSettings: Codable, Equatable, GeneratedCopiable {
                              lastSelectedStockType: lastSelectedStockType,
                              lastSelectedOrderStatus: lastSelectedOrderStatus,
                              favoriteProductIDs: favoriteProductIDs,
-                             searchTermsByKey: searchTermsByKey)
+                             searchTermsByKey: searchTermsByKey,
+                             isPOSTabVisible: isPOSTabVisible)
     }
 }
 
@@ -174,6 +181,8 @@ extension GeneralStoreSettings {
                                                                 forKey: .favoriteProductIDs) ?? []
         self.searchTermsByKey = try container.decodeIfPresent([String: [String]].self, forKey: .searchTermsByKey) ?? [:]
 
+        self.isPOSTabVisible = try container.decodeIfPresent(Bool.self, forKey: .isPOSTabVisible)
+
         // Decode new properties with `decodeIfPresent` and provide a default value if necessary.
     }
 }

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -87,6 +87,7 @@ private extension POSTabCoordinator {
             guard let self else { return }
             let collectOrderPaymentAnalyticsTracker = POSCollectOrderPaymentAnalytics()
             let cardPresentPaymentService = await CardPresentPaymentService(siteID: siteID,
+                                                                            stores: storesManager,
                                                                             collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker)
             if let receiptService = POSReceiptService(siteID: siteID,
                                                       credentials: credentials),

WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabEligibilityChecker.swift

@@ -5,9 +5,10 @@ import enum WooFoundation.CountryCode
 import enum WooFoundation.CurrencyCode
 import protocol Experiments.FeatureFlagService
 import struct Yosemite.SiteSetting
+import protocol Yosemite.POSEligibilityServiceProtocol
 import protocol Yosemite.StoresManager
+import class Yosemite.POSEligibilityService
 import struct Yosemite.SystemPlugin
-import enum Yosemite.SystemStatusAction
 import enum Yosemite.FeatureFlagAction
 import enum Yosemite.SettingAction
 import protocol Yosemite.PluginsServiceProtocol
@@ -35,6 +36,8 @@ enum POSEligibilityState: Equatable {
 }
 
 protocol POSEntryPointEligibilityCheckerProtocol {
+    /// Checks the initial visibility of the POS tab.
+    func checkInitialVisibility() -> Bool
     /// Determines whether the site is eligible for POS.
     func checkEligibility() async -> POSEligibilityState
 }
@@ -45,6 +48,7 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
     private let siteSettings: SelectedSiteSettings
     private let currencySettings: CurrencySettings
     private let pluginsService: PluginsServiceProtocol
+    private let eligibilityService: POSEligibilityServiceProtocol
     private let stores: StoresManager
     private let featureFlagService: FeatureFlagService
 
@@ -53,17 +57,24 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
          siteSettings: SelectedSiteSettings = ServiceLocator.selectedSiteSettings,
          currencySettings: CurrencySettings = ServiceLocator.currencySettings,
          pluginsService: PluginsServiceProtocol = PluginsService(storageManager: ServiceLocator.storageManager),
+         eligibilityService: POSEligibilityServiceProtocol = POSEligibilityService(),
          stores: StoresManager = ServiceLocator.stores,
          featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService) {
         self.siteID = siteID
         self.userInterfaceIdiom = userInterfaceIdiom
         self.siteSettings = siteSettings
         self.currencySettings = currencySettings
         self.pluginsService = pluginsService
+        self.eligibilityService = eligibilityService
         self.stores = stores
         self.featureFlagService = featureFlagService
     }
 
+    /// Checks the initial visibility of the POS tab without dependance on network requests.
+    func checkInitialVisibility() -> Bool {
+        eligibilityService.loadCachedPOSTabVisibility(siteID: siteID) ?? false
+    }
+
     /// Determines whether the POS entry point can be shown based on the selected store and feature gates.
     func checkEligibility() async -> POSEligibilityState {
         guard #available(iOS 17.0, *) else {

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuCoordinator.swift

@@ -60,6 +60,7 @@ final class HubMenuCoordinator {
     ///
     func activate(siteID: Int64) {
         hubMenuController = HubMenuViewController(siteID: siteID,
+                                                  stores: storesManager,
                                                   tapToPayBadgePromotionChecker: tapToPayBadgePromotionChecker)
         if let hubMenuController = hubMenuController {
             let navigationController = UINavigationController(rootViewController: hubMenuController)

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewController.swift

@@ -13,9 +13,11 @@ final class HubMenuViewController: UIHostingController<HubMenu> {
     private var shouldShowNavigationBar = false
 
     init(siteID: Int64,
+         stores: StoresManager = ServiceLocator.stores,
          tapToPayBadgePromotionChecker: TapToPayBadgePromotionChecker) {
         self.viewModel = HubMenuViewModel(siteID: siteID,
-                                          tapToPayBadgePromotionChecker: tapToPayBadgePromotionChecker)
+                                          tapToPayBadgePromotionChecker: tapToPayBadgePromotionChecker,
+                                          stores: stores)
 
         self.tapToPayBadgePromotionChecker = tapToPayBadgePromotionChecker
         super.init(rootView: HubMenu(viewModel: viewModel))

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift

@@ -309,6 +309,7 @@ private extension HubMenuViewModel {
     func createCardPresentPaymentService() {
         Task {
             self.cardPresentPaymentService = await CardPresentPaymentService(siteID: siteID,
+                                                                             stores: stores,
                                                                              collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker)
         }
     }

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -123,6 +123,7 @@ final class MainTabBarController: UITabBarController {
     private let stores: StoresManager
     private let analytics: Analytics
     private let posEligibilityCheckerFactory: ((_ siteID: Int64) -> POSEntryPointEligibilityCheckerProtocol)
+    private let posEligibilityService: POSEligibilityServiceProtocol
 
     private var productImageUploadErrorsSubscription: AnyCancellable?
 
@@ -139,7 +140,8 @@ final class MainTabBarController: UITabBarController {
           productImageUploader: ProductImageUploaderProtocol = ServiceLocator.productImageUploader,
           analytics: Analytics = ServiceLocator.analytics,
           stores: StoresManager = ServiceLocator.stores,
-          posEligibilityCheckerFactory: ((Int64) -> POSEntryPointEligibilityCheckerProtocol)? = nil) {
+          posEligibilityCheckerFactory: ((Int64) -> POSEntryPointEligibilityCheckerProtocol)? = nil,
+          posEligibilityService: POSEligibilityServiceProtocol = POSEligibilityService()) {
         self.featureFlagService = featureFlagService
         self.noticePresenter = noticePresenter
         self.productImageUploader = productImageUploader
@@ -148,6 +150,7 @@ final class MainTabBarController: UITabBarController {
         self.posEligibilityCheckerFactory = posEligibilityCheckerFactory ?? { siteID in
             POSTabEligibilityChecker(siteID: siteID)
         }
+        self.posEligibilityService = posEligibilityService
         super.init(coder: coder)
     }
 
@@ -160,6 +163,7 @@ final class MainTabBarController: UITabBarController {
         self.posEligibilityCheckerFactory = { siteID in
             POSTabEligibilityChecker(siteID: siteID)
         }
+        self.posEligibilityService = POSEligibilityService()
         super.init(coder: coder)
     }
 
@@ -650,29 +654,34 @@ extension MainTabBarController: DeepLinkNavigator {
 //
 private extension MainTabBarController {
     func observePOSEligibilityForPOSTabVisibility(siteID: Int64) {
-        guard featureFlagService.isFeatureFlagEnabled(.pointOfSaleAsATabi1) else {
+        guard let posEligibilityChecker, featureFlagService.isFeatureFlagEnabled(.pointOfSaleAsATabi1) else {
             updateTabViewControllers(isPOSTabVisible: false)
             viewModel.loadHubMenuTabBadge()
             return
         }
 
-        // Hides POS tab initially.
-        updateTabViewControllers(isPOSTabVisible: false)
+        // Sets POS tab initial visibility based on cached value if available.
+        let initialVisibility = posEligibilityChecker.checkInitialVisibility()
+        updateTabViewControllers(isPOSTabVisible: initialVisibility)
 
         // Cancels any existing task.
         posEligibilityCheckTask?.cancel()
 
         // Starts observing the POS eligibility state.
         posEligibilityCheckTask = Task { @MainActor [weak self] in
-            guard let self, let posEligibilityChecker else { return }
+            guard let self, let posEligibilityChecker = self.posEligibilityChecker else { return }
             let eligibility = await posEligibilityChecker.checkEligibility()
             let isPOSTabVisible = eligibility == .eligible
+            cachePOSTabVisibility(siteID: siteID, isPOSTabVisible: isPOSTabVisible)
             updateTabViewControllers(isPOSTabVisible: isPOSTabVisible)
             viewModel.loadHubMenuTabBadge()
         }
     }
 
     func updateTabViewControllers(isPOSTabVisible: Bool) {
+        guard isPOSTabVisible != self.isPOSTabVisible || (viewControllers?.count ?? 0) == 0 else {
+            return
+        }
         var controllers = [UIViewController]()
         let tabs = WooTab.visibleTabs(isPOSTabVisible: isPOSTabVisible)
         tabs.forEach { tab in
@@ -736,7 +745,8 @@ private extension MainTabBarController {
         posTabCoordinator = POSTabCoordinator(
             siteID: siteID,
             tabContainerController: posContainerController,
-            viewControllerToPresent: self
+            viewControllerToPresent: self,
+            storesManager: stores
         )
 
         // Configure hub menu tab coordinator once per logged in session potentially with multiple sites.
@@ -923,6 +933,12 @@ private extension MainTabBarController {
     }
 }
 
+private extension MainTabBarController {
+    func cachePOSTabVisibility(siteID: Int64, isPOSTabVisible: Bool) {
+        posEligibilityService.cachePOSTabVisibility(siteID: siteID, isVisible: isPOSTabVisible)
+    }
+}
+
 private extension MainTabBarController {
     enum Constants {
         // Used to delay a second navigation after the previous one is called,

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

@@ -626,6 +626,7 @@
 		02EEB5C52424AFAA00B8A701 /* TextFieldTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 02EEB5C32424AFAA00B8A701 /* TextFieldTableViewCell.xib */; };
 		02EFF81A2ABC28BA0015ABB2 /* GiftCardInputViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02EFF8192ABC28BA0015ABB2 /* GiftCardInputViewModelTests.swift */; };
 		02F1E6BD2A39805C00C3E4C7 /* ProductDescriptionAICoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F1E6BC2A39805C00C3E4C7 /* ProductDescriptionAICoordinatorTests.swift */; };
+		02F36C402E0130EF00DD8CB6 /* MockPOSEligibilityService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F36C3F2E0130E900DD8CB6 /* MockPOSEligibilityService.swift */; };
 		02F3884C2D6C38BB00619396 /* POSErrorAndAlertIconSize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F3884B2D6C38BB00619396 /* POSErrorAndAlertIconSize.swift */; };
 		02F3A6842A618CD7004CD2E8 /* WordPressMediaLibraryPickerCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F3A6832A618CD7004CD2E8 /* WordPressMediaLibraryPickerCoordinator.swift */; };
 		02F3A6862A619270004CD2E8 /* WordPressMediaLibraryImagePickerCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02F3A6852A619270004CD2E8 /* WordPressMediaLibraryImagePickerCoordinatorTests.swift */; };
@@ -3871,6 +3872,7 @@
 		02EEB5C32424AFAA00B8A701 /* TextFieldTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TextFieldTableViewCell.xib; sourceTree = "<group>"; };
 		02EFF8192ABC28BA0015ABB2 /* GiftCardInputViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GiftCardInputViewModelTests.swift; sourceTree = "<group>"; };
 		02F1E6BC2A39805C00C3E4C7 /* ProductDescriptionAICoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDescriptionAICoordinatorTests.swift; sourceTree = "<group>"; };
+		02F36C3F2E0130E900DD8CB6 /* MockPOSEligibilityService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPOSEligibilityService.swift; sourceTree = "<group>"; };
 		02F3884B2D6C38BB00619396 /* POSErrorAndAlertIconSize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = POSErrorAndAlertIconSize.swift; sourceTree = "<group>"; };
 		02F3A6832A618CD7004CD2E8 /* WordPressMediaLibraryPickerCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressMediaLibraryPickerCoordinator.swift; sourceTree = "<group>"; };
 		02F3A6852A619270004CD2E8 /* WordPressMediaLibraryImagePickerCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WordPressMediaLibraryImagePickerCoordinatorTests.swift; sourceTree = "<group>"; };
@@ -10056,6 +10058,7 @@
 		746791642108D853007CF1DC /* Mocks */ = {
 			isa = PBXGroup;
 			children = (
+				02F36C3F2E0130E900DD8CB6 /* MockPOSEligibilityService.swift */,
 				02B8E41A2DFBC33C001D01FD /* MockPOSEligibilityChecker.swift */,
 				01F067EC2D0C5D56001C5805 /* MockLocationService.swift */,
 				0182C8BD2CE3B10E00474355 /* MockReceiptEligibilityUseCase.swift */,
@@ -17442,6 +17445,7 @@
 				D82DFB4C225F303200EFE2CB /* EmptyListMessageWithActionTests.swift in Sources */,
 				0242CFB829F278B70080F500 /* ProductFormAIEligibilityCheckerTests.swift in Sources */,
 				E10DFC78267331590083AFF2 /* ApplicationLogViewModelTests.swift in Sources */,
+				02F36C402E0130EF00DD8CB6 /* MockPOSEligibilityService.swift in Sources */,
 				CE6A8FB82B7291760063564D /* AnalyticsReportLinkViewModelTests.swift in Sources */,
 				B98968572A98F227007A2FBE /* TaxEducationalDialogViewModelTests.swift in Sources */,
 				CE63024A2BAC46A200E3325C /* CustomerDetailViewModelTests.swift in Sources */,

WooCommerce/WooCommerceTests/Mocks/MockPOSEligibilityChecker.swift

@@ -2,8 +2,13 @@ import Foundation
 @testable import WooCommerce
 
 final class MockPOSEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
+    var initialVisibility: Bool = false
     var result: POSEligibilityState = .eligible
 
+    func checkInitialVisibility() -> Bool {
+        initialVisibility
+    }
+
     @MainActor
     func checkEligibility() async -> POSEligibilityState {
         result

WooCommerce/WooCommerceTests/Mocks/MockPOSEligibilityService.swift

@@ -0,0 +1,14 @@
+import Foundation
+import protocol Yosemite.POSEligibilityServiceProtocol
+
+final class MockPOSEligibilityService: POSEligibilityServiceProtocol {
+    var cachedTabVisibility: [Int64: Bool] = [:]
+
+    func loadCachedPOSTabVisibility(siteID: Int64) -> Bool? {
+        cachedTabVisibility[siteID]
+    }
+
+    func cachePOSTabVisibility(siteID: Int64, isVisible: Bool) {
+        cachedTabVisibility[siteID] = isVisible
+    }
+}