Revert POSTabEligibilityChecker changes to be mostly the same as trunk. Will be modified to i2 in the next PR.

jaclync · jaclync · commit e3f2e946e062 · 2025-07-04T14:55:51.000-04:00
diff --git a/WooCommerce/Classes/POS/TabBar/POSIneligibleView.swift b/WooCommerce/Classes/POS/TabBar/POSIneligibleView.swift
@@ -77,6 +77,10 @@ struct POSIneligibleView: View {
 
     private var suggestionText: String {
         switch reason {
+        case .notTablet:
+            return NSLocalizedString("pos.ineligible.suggestion.notTablet",
+                                     value: "Please use a tablet to access POS features.",
+                                     comment: "Suggestion for not tablet: use iPad")
         case .unsupportedIOSVersion:
             return NSLocalizedString("pos.ineligible.suggestion.unsupportedIOSVersion",
                                      value: "Point of Sale requires iOS 17 or later. Please update your device to iOS 17+ to use this feature.",
@@ -101,6 +105,16 @@ struct POSIneligibleView: View {
             return NSLocalizedString("pos.ineligible.suggestion.featureSwitchSyncFailure",
                                      value: "Try relaunching the app or check your internet connection and try again.",
                                      comment: "Suggestion for feature switch sync failure: relaunch or check connection")
+        case let .unsupportedCountry(supportedCountries):
+            let countryNames = supportedCountries.map { $0.readableCountry }
+            let formattedCountryList = ListFormatter.localizedString(byJoining: countryNames)
+            let format = NSLocalizedString(
+                "pos.ineligible.suggestion.unsupportedCountry",
+                value: "POS is currently only available in %1$@. Check back later for availability in your region.",
+                comment: "Suggestion for unsupported country with list of supported countries. " +
+                "%1$@ is a placeholder for the localized list of supported country names."
+            )
+            return String.localizedStringWithFormat(format, formattedCountryList)
         case let .unsupportedCurrency(supportedCurrencies):
             let currencyList = supportedCurrencies.map { $0.rawValue }
             let formattedCurrencyList = ListFormatter.localizedString(byJoining: currencyList)
@@ -116,6 +130,10 @@ struct POSIneligibleView: View {
             return NSLocalizedString("pos.ineligible.suggestion.siteSettingsNotAvailable",
                                      value: "Check your internet connection and try relaunching the app. If the issue persists, please contact support.",
                                      comment: "Suggestion for site settings unavailable: check connection or contact support")
+        case .featureFlagDisabled:
+            return NSLocalizedString("pos.ineligible.suggestion.featureFlagDisabled",
+                                     value: "POS is currently disabled.",
+                                     comment: "Suggestion for disabled feature flag: notify that POS is disabled remotely")
         case .selfDeallocated:
             return NSLocalizedString("pos.ineligible.suggestion.selfDeallocated",
                                      value: "Try relaunching the app to resolve this issue.",
@@ -158,6 +176,24 @@ private extension POSIneligibleView {
     }
 }
 
+#Preview("Unsupported country") {
+    if #available(iOS 17.0, *) {
+        POSIneligibleView(
+            reason: .unsupportedCountry(supportedCountries: [.US, .GB]),
+            onRefresh: {}
+        )
+    }
+}
+
+#Preview("Not a tablet") {
+    if #available(iOS 17.0, *) {
+        POSIneligibleView(
+            reason: .notTablet,
+            onRefresh: {}
+        )
+    }
+}
+
 #Preview("Unsupported iOS version") {
     if #available(iOS 17.0, *) {
         POSIneligibleView(
@@ -176,6 +212,15 @@ private extension POSIneligibleView {
     }
 }
 
+#Preview("Feature flag disabled") {
+    if #available(iOS 17.0, *) {
+        POSIneligibleView(
+            reason: .featureFlagDisabled,
+            onRefresh: {}
+        )
+    }
+}
+
 #Preview("Feature switch disabled") {
     if #available(iOS 17.0, *) {
         POSIneligibleView(
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabEligibilityChecker.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/POS/POSTabEligibilityChecker.swift
@@ -17,12 +17,15 @@ import class Yosemite.PluginsService
 
 /// Represents the reasons why a site may be ineligible for POS.
 enum POSIneligibleReason: Equatable {
+    case notTablet
     case unsupportedIOSVersion
     case unsupportedWooCommerceVersion(minimumVersion: String)
     case siteSettingsNotAvailable
     case wooCommercePluginNotFound
+    case featureFlagDisabled
     case featureSwitchDisabled
     case featureSwitchSyncFailure
+    case unsupportedCountry(supportedCountries: [CountryCode])
     case unsupportedCurrency(supportedCurrencies: [CurrencyCode])
     case selfDeallocated
 }
@@ -42,29 +45,10 @@ protocol POSEntryPointEligibilityCheckerProtocol {
     func checkEligibility() async -> POSEligibilityState
 }
 
-/// Legacy enum containing POS invisible reasons + POSIneligibleReason cases for i1.
-private enum LegacyPOSIneligibleReason: Equatable {
-    case notTablet
-    case unsupportedIOSVersion
-    case unsupportedWooCommerceVersion(minimumVersion: String)
-    case siteSettingsNotAvailable
-    case wooCommercePluginNotFound
-    case featureFlagDisabled
-    case featureSwitchDisabled
-    case featureSwitchSyncFailure
-    case unsupportedCountry(supportedCountries: [CountryCode])
-    case unsupportedCurrency(supportedCurrencies: [CurrencyCode])
-    case selfDeallocated
-}
-
-/// Legacy POS eligibility state for i1.
-private enum LegacyPOSEligibilityState: Equatable {
-    case eligible
-    case ineligible(reason: LegacyPOSIneligibleReason)
-}
-
-/// POS tab eligibility checker for i1. Will be replaced by `POSTabEligibilityCheckerI2` when removing `pointOfSaleAsATabi2` feature flag.
 final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
+    private var siteSettingsEligibility: POSEligibilityState?
+    private var featureFlagEligibility: POSEligibilityState?
+
     private let siteID: Int64
     private let userInterfaceIdiom: UIUserInterfaceIdiom
     private let siteSettings: SelectedSiteSettingsProtocol
@@ -96,10 +80,6 @@ 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 {
-        .eligible
-    }
-
-    private func checkI1Eligibility() async -> LegacyPOSEligibilityState {
         switch checkDeviceEligibility() {
         case .eligible:
             break
@@ -138,13 +118,17 @@ final class POSTabEligibilityChecker: POSEntryPointEligibilityCheckerProtocol {
 
     /// Checks the final visibility of the POS tab.
     func checkVisibility() async -> Bool {
-        let eligibility = await checkI1Eligibility()
-        return eligibility == .eligible
+        if featureFlagService.isFeatureFlagEnabled(.pointOfSaleAsATabi2) {
+            return await checkVisibilityBasedOnCountryAndRemoteFeatureFlag()
+        } else {
+            let eligibility = await checkEligibility()
+            return eligibility == .eligible
+        }
     }
 }
 
 private extension POSTabEligibilityChecker {
-    func checkDeviceEligibility() -> LegacyPOSEligibilityState {
+    func checkDeviceEligibility() -> POSEligibilityState {
         guard #available(iOS 17.0, *) else {
             return .ineligible(reason: .unsupportedIOSVersion)
         }
@@ -155,12 +139,41 @@ private extension POSTabEligibilityChecker {
 
         return .eligible
     }
+
+    func checkVisibilityBasedOnCountryAndRemoteFeatureFlag() async -> Bool {
+        guard checkDeviceEligibility() == .eligible else {
+            return false
+        }
+
+        async let siteSettingsEligibility = checkSiteSettingsEligibility()
+        async let featureFlagEligibility = checkRemoteFeatureEligibility()
+
+        self.siteSettingsEligibility = await siteSettingsEligibility
+        switch await siteSettingsEligibility {
+        case .eligible:
+            break
+        case let .ineligible(reason):
+            if case .unsupportedCurrency = reason {
+                break
+            } else {
+                return false
+            }
+        }
+
+        self.featureFlagEligibility = await featureFlagEligibility
+        switch await featureFlagEligibility {
+        case .eligible:
+            return true
+        case .ineligible:
+            return false
+        }
+    }
 }
 
 // MARK: - WC Plugin Related Eligibility Check
 
 private extension POSTabEligibilityChecker {
-    func checkPluginEligibility() async -> LegacyPOSEligibilityState {
+    func checkPluginEligibility() async -> POSEligibilityState {
         let wcPlugin = await fetchWooCommercePlugin(siteID: siteID)
 
         guard VersionHelpers.isVersionSupported(version: wcPlugin.version,
@@ -186,7 +199,7 @@ private extension POSTabEligibilityChecker {
     }
 
     @MainActor
-    func checkFeatureSwitchEnabled(siteID: Int64) async -> LegacyPOSEligibilityState {
+    func checkFeatureSwitchEnabled(siteID: Int64) async -> POSEligibilityState {
         await withCheckedContinuation { [weak self] continuation in
             guard let self else {
                 return continuation.resume(returning: .ineligible(reason: .selfDeallocated))
@@ -207,7 +220,11 @@ private extension POSTabEligibilityChecker {
 // MARK: - Site Settings Related Eligibility Check
 
 private extension POSTabEligibilityChecker {
-    func checkSiteSettingsEligibility() async -> LegacyPOSEligibilityState {
+    func checkSiteSettingsEligibility() async -> POSEligibilityState {
+        if let siteSettingsEligibility {
+            return siteSettingsEligibility
+        }
+
         // Waits for the first site settings that matches the given site ID.
         let siteSettings = await waitForSiteSettingsRefresh()
         guard siteSettings.isNotEmpty else {
@@ -232,7 +249,7 @@ private extension POSTabEligibilityChecker {
         return []
     }
 
-    func isEligibleFromCountryAndCurrencyCode(countryCode: CountryCode, currencyCode: CurrencyCode) -> LegacyPOSEligibilityState {
+    func isEligibleFromCountryAndCurrencyCode(countryCode: CountryCode, currencyCode: CurrencyCode) -> POSEligibilityState {
         let supportedCountries: [CountryCode] = [.US, .GB]
         let supportedCurrencies: [CountryCode: [CurrencyCode]] = [.US: [.USD],
                                                                   .GB: [.GBP]]
@@ -254,10 +271,14 @@ private extension POSTabEligibilityChecker {
 
 private extension POSTabEligibilityChecker {
     @MainActor
-    func checkRemoteFeatureEligibility() async -> LegacyPOSEligibilityState {
+    func checkRemoteFeatureEligibility() async -> POSEligibilityState {
+        if let featureFlagEligibility {
+            return featureFlagEligibility
+        }
+
         // Only whitelisted accounts in WPCOM have the Point of Sale remote feature flag enabled. These can be found at D159901-code
         // If the account is whitelisted, then the remote value takes preference over the local feature flag configuration
-        await withCheckedContinuation { [weak self] continuation in
+        return await withCheckedContinuation { [weak self] continuation in
             guard let self else {
                 return continuation.resume(returning: .ineligible(reason: .selfDeallocated))
             }
