[POS as a tab i2] Enable POS tab for stores in eligible countries behind i2 feature flag

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -93,6 +93,8 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return false
         case .pointOfSaleAsATabi1:
             return true
+        case .pointOfSaleAsATabi2:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .pointOfSaleOrdersi1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         default:

Modules/Sources/Experiments/FeatureFlag.swift

@@ -196,6 +196,10 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSaleAsATabi1
 
+    /// Enables displaying POS as a tab in the tab bar for stores in eligible countries
+    ///
+    case pointOfSaleAsATabi2
+
     /// Enables displaying Point Of Sale details in order list and order details
     ///
     case pointOfSaleOrdersi1

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

@@ -38,6 +38,8 @@ enum POSEligibilityState: Equatable {
 protocol POSEntryPointEligibilityCheckerProtocol {
     /// Checks the initial visibility of the POS tab.
     func checkInitialVisibility() -> Bool
+    /// Checks the final visibility of the POS tab.
+    func checkVisibility() async -> Bool
     /// Determines whether the site is eligible for POS.
     func checkEligibility() async -> POSEligibilityState
 }
@@ -74,12 +76,11 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
 
     /// 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 {
-            return .ineligible(reason: .unsupportedIOSVersion)
-        }
-
-        guard userInterfaceIdiom == .pad else {
-            return .ineligible(reason: .notTablet)
+        switch checkDeviceEligibility() {
+        case .eligible:
+            break
+        case .ineligible(let reason):
+            return .ineligible(reason: reason)
         }
 
         async let siteSettingsEligibility = checkSiteSettingsEligibility()
@@ -110,8 +111,61 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
             return .ineligible(reason: reason)
         }
     }
+
+    /// Checks the final visibility of the POS tab.
+    func checkVisibility() async -> Bool {
+        if featureFlagService.isFeatureFlagEnabled(.pointOfSaleAsATabi2) {
+            return await checkVisibilityBasedOnCountryAndRemoteFeatureFlag()
+        } else {
+            let eligibility = await checkEligibility()
+            return eligibility == .eligible
+        }
+    }
+}
+
+private extension POSTabEligibilityChecker {
+    func checkDeviceEligibility() -> POSEligibilityState {
+        guard #available(iOS 17.0, *) else {
+            return .ineligible(reason: .unsupportedIOSVersion)
+        }
+
+        guard userInterfaceIdiom == .pad else {
+            return .ineligible(reason: .notTablet)
+        }
+
+        return .eligible
+    }
+
+    func checkVisibilityBasedOnCountryAndRemoteFeatureFlag() async -> Bool {
+        guard checkDeviceEligibility() == .eligible else {
+            return false
+        }
+
+        async let siteSettingsEligibility = checkSiteSettingsEligibility()
+        async let featureFlagEligibility = checkRemoteFeatureEligibility()
+
+        switch await siteSettingsEligibility {
+        case .eligible:
+            break
+        case let .ineligible(reason):
+            if reason == .unsupportedCurrency {
+                break
+            } else {
+                return false
+            }
+        }
+
+        switch await featureFlagEligibility {
+        case .eligible:
+            return true
+        case .ineligible:
+            return false
+        }
+    }
 }
 
+// MARK: - WC Plugin Related Eligibility Check
+
 private extension POSTabEligibilityChecker {
     func checkPluginEligibility() async -> POSEligibilityState {
         let wcPlugin = await fetchWooCommercePlugin(siteID: siteID)
@@ -157,6 +211,8 @@ private extension POSTabEligibilityChecker {
     }
 }
 
+// MARK: - Site Settings Related Eligibility Check
+
 private extension POSTabEligibilityChecker {
     func checkSiteSettingsEligibility() async -> POSEligibilityState {
         // Waits for the first site settings that matches the given site ID.
@@ -202,6 +258,8 @@ private extension POSTabEligibilityChecker {
     }
 }
 
+// MARK: - Remote Feature Flag Eligibility Check
+
 private extension POSTabEligibilityChecker {
     @MainActor
     func checkRemoteFeatureEligibility() async -> POSEligibilityState {

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -670,8 +670,7 @@ private extension MainTabBarController {
         // Starts observing the POS eligibility state.
         posEligibilityCheckTask = Task { @MainActor [weak self] in
             guard let self, let posEligibilityChecker = self.posEligibilityChecker else { return }
-            let eligibility = await posEligibilityChecker.checkEligibility()
-            let isPOSTabVisible = eligibility == .eligible
+            let isPOSTabVisible = await posEligibilityChecker.checkVisibility()
             analytics.track(.pointOfSaleTabVisibilityChecked, withProperties: ["is_visible": isPOSTabVisible])
             cachePOSTabVisibility(siteID: siteID, isPOSTabVisible: isPOSTabVisible)
             updateTabViewControllers(isPOSTabVisible: isPOSTabVisible)

WooCommerce/WooCommerceTests/Mocks/MockFeatureFlagService.swift

@@ -14,6 +14,7 @@ final class MockFeatureFlagService: FeatureFlagService {
     var isSubscriptionsInOrderCreationCustomersEnabled: Bool
     var isSubscriptionsInOrderCreationUIEnabled: Bool
     var isPointOfSaleEnabled: Bool
+    var isPointOfSaleAsATabi2Enabled: Bool
     var googleAdsCampaignCreationOnWebView: Bool
     var blazeEvergreenCampaigns: Bool
     var blazeCampaignObjective: Bool
@@ -37,6 +38,7 @@ final class MockFeatureFlagService: FeatureFlagService {
          isSubscriptionsInOrderCreationCustomersEnabled: Bool = false,
          isSubscriptionsInOrderCreationUIEnabled: Bool = false,
          isPointOfSaleEnabled: Bool = false,
+         isPointOfSaleAsATabi2Enabled: Bool = false,
          googleAdsCampaignCreationOnWebView: Bool = false,
          blazeEvergreenCampaigns: Bool = false,
          blazeCampaignObjective: Bool = false,
@@ -58,6 +60,7 @@ final class MockFeatureFlagService: FeatureFlagService {
         self.isSubscriptionsInOrderCreationCustomersEnabled = isSubscriptionsInOrderCreationCustomersEnabled
         self.isSubscriptionsInOrderCreationUIEnabled = isSubscriptionsInOrderCreationUIEnabled
         self.isPointOfSaleEnabled = isPointOfSaleEnabled
+        self.isPointOfSaleAsATabi2Enabled = isPointOfSaleAsATabi2Enabled
         self.googleAdsCampaignCreationOnWebView = googleAdsCampaignCreationOnWebView
         self.blazeEvergreenCampaigns = blazeEvergreenCampaigns
         self.blazeCampaignObjective = blazeCampaignObjective
@@ -101,6 +104,8 @@ final class MockFeatureFlagService: FeatureFlagService {
             return isSubscriptionsInOrderCreationUIEnabled
         case .pointOfSale:
             return isPointOfSaleEnabled
+        case .pointOfSaleAsATabi2:
+            return isPointOfSaleAsATabi2Enabled
         case .googleAdsCampaignCreationOnWebView:
             return googleAdsCampaignCreationOnWebView
         case .blazeEvergreenCampaigns:

WooCommerce/WooCommerceTests/Mocks/MockPOSEligibilityChecker.swift

@@ -3,14 +3,20 @@ import Foundation
 
 final class MockPOSEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
     var initialVisibility: Bool = false
-    var result: POSEligibilityState = .eligible
+    var visibility: Bool = false
+    var eligibility: POSEligibilityState = .eligible
 
     func checkInitialVisibility() -> Bool {
         initialVisibility
     }
 
+    @MainActor
+    func checkVisibility() async -> Bool {
+        visibility
+    }
+
     @MainActor
     func checkEligibility() async -> POSEligibilityState {
-        result
+        eligibility
     }
 }

WooCommerce/WooCommerceTests/ViewRelated/MainTabBarController+TabsTests.swift

@@ -42,13 +42,13 @@ final class MainTabBarController_TabsTests: XCTestCase {
                    isAnInstanceOf: HubMenuViewController.self)
     }
 
-    func test_tab_view_controllers_include_pos_tab_when_pos_is_eligible() throws {
+    func test_tab_view_controllers_include_pos_tab_when_pos_tab_is_visible() throws {
         // Given
         let featureFlagService = MockFeatureFlagService()
         featureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleAsATabi1] = true
 
         let mockPOSEligibilityChecker = MockPOSEligibilityChecker()
-        mockPOSEligibilityChecker.result = .eligible
+        mockPOSEligibilityChecker.visibility = true
 
         let storesManager = MockStoresManager(sessionManager: .makeForTesting())
 
@@ -85,13 +85,13 @@ final class MainTabBarController_TabsTests: XCTestCase {
                    isAnInstanceOf: HubMenuViewController.self)
     }
 
-    func test_tab_view_controllers_exclude_pos_tab_when_pos_is_not_eligible() throws {
+    func test_tab_view_controllers_exclude_pos_tab_when_pos_tab_is_not_visible() throws {
         // Given
         let featureFlagService = MockFeatureFlagService()
         featureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleAsATabi1] = true
 
         let mockPOSEligibilityChecker = MockPOSEligibilityChecker()
-        mockPOSEligibilityChecker.result = .ineligible(reason: .notTablet)
+        mockPOSEligibilityChecker.visibility = false
 
         let storesManager = MockStoresManager(sessionManager: .makeForTesting())
 
@@ -132,7 +132,7 @@ final class MainTabBarController_TabsTests: XCTestCase {
         featureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleAsATabi1] = false
 
         let mockPOSEligibilityChecker = MockPOSEligibilityChecker()
-        mockPOSEligibilityChecker.result = .eligible
+        mockPOSEligibilityChecker.visibility = true
 
         let storesManager = MockStoresManager(sessionManager: .makeForTesting())
 
@@ -165,13 +165,13 @@ final class MainTabBarController_TabsTests: XCTestCase {
                    isAnInstanceOf: HubMenuViewController.self)
     }
 
-    func test_tab_view_controllers_do_not_change_when_pos_eligibility_changes() throws {
+    func test_tab_view_controllers_do_not_change_when_pos_visibility_changes() throws {
         // Given
         let featureFlagService = MockFeatureFlagService()
         featureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleAsATabi1] = true
 
         let mockPOSEligibilityChecker = MockPOSEligibilityChecker()
-        mockPOSEligibilityChecker.result = .ineligible(reason: .featureFlagDisabled)
+        mockPOSEligibilityChecker.visibility = false
 
         let storesManager = MockStoresManager(sessionManager: .makeForTesting())
 
@@ -196,7 +196,7 @@ final class MainTabBarController_TabsTests: XCTestCase {
         }
 
         // When - change POS eligibility
-        mockPOSEligibilityChecker.result = .eligible
+        mockPOSEligibilityChecker.visibility = true
 
         // Then tabs remain the same
         XCTAssertEqual(tabBarController.tabRootViewControllers.count, 4)

WooCommerce/WooCommerceTests/ViewRelated/MainTabBarControllerTests.swift

@@ -76,7 +76,7 @@ final class MainTabBarControllerTests: XCTestCase {
 
         // Hides POS tab.
         let mockPOSEligibilityChecker = MockPOSEligibilityChecker()
-        mockPOSEligibilityChecker.result = .ineligible(reason: .featureFlagDisabled)
+        mockPOSEligibilityChecker.visibility = false
 
         let storesManager = MockStoresManager(sessionManager: .testingInstance)
         // Reset `receivedActions`
@@ -504,8 +504,8 @@ final class MainTabBarControllerTests: XCTestCase {
             posTabContainerController.presentedViewController is UIHostingController<PointOfSaleEntryPointView>
         }
 
-        // When returning POS eligibility as ineligible
-        mockPOSEligibilityChecker.setEligibilityResult(.ineligible(reason: .featureFlagDisabled))
+        // When POS tab becomes invisible
+        mockPOSEligibilityChecker.setVisibilityResult(false)
 
         // Then POS tab is hidden
         waitUntil {
@@ -551,7 +551,7 @@ final class MainTabBarControllerTests: XCTestCase {
 
         // When POS tab initial visibility is set to true
         stores.updateDefaultStore(storeID: 1216)
-        mockPOSEligibilityChecker.setEligibilityResult(.eligible)
+        mockPOSEligibilityChecker.setVisibilityResult(true)
 
         waitUntil {
             tabBarController.tabRootViewControllers.count == 5
@@ -567,7 +567,7 @@ final class MainTabBarControllerTests: XCTestCase {
         featureFlagService.isFeatureFlagEnabledReturnValue[.pointOfSaleAsATabi1] = true
 
         let mockPOSEligibilityChecker = MockPOSEligibilityChecker()
-        mockPOSEligibilityChecker.result = .eligible
+        mockPOSEligibilityChecker.visibility = true
 
         let storesManager = MockStoresManager(sessionManager: .makeForTesting())
 
@@ -642,9 +642,19 @@ extension MainTabBarController {
 
 private final class MockAsyncPOSEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
     var initialVisibility: Bool = false
+    private var visibilityResult: Bool?
+    private var visibilityContinuation: CheckedContinuation<Bool, Never>?
     private var eligibilityResult: POSEligibilityState?
     private var eligibilityContinuation: CheckedContinuation<POSEligibilityState, Never>?
 
+    func setVisibilityResult(_ result: Bool) {
+        visibilityResult = result
+        if let continuation = visibilityContinuation {
+            visibilityContinuation = nil
+            continuation.resume(returning: result)
+        }
+    }
+
     func setEligibilityResult(_ result: POSEligibilityState) {
         eligibilityResult = result
         if let continuation = eligibilityContinuation {
@@ -657,6 +667,19 @@ private final class MockAsyncPOSEligibilityChecker: POSEntryPointEligibilityChec
         initialVisibility
     }
 
+    func checkVisibility() async -> Bool {
+        if let visibilityResult {
+            return visibilityResult
+        }
+        return await withCheckedContinuation { continuation in
+            visibilityContinuation = continuation
+            // If we already have a result, return it immediately.
+            if visibilityContinuation == nil {
+                continuation.resume(returning: visibilityResult ?? true)
+            }
+        }
+    }
+
     func checkEligibility() async -> POSEligibilityState {
         if let eligibilityResult {
             return eligibilityResult