[CIAB] Hide Blaze and Payments from hub menu

WooCommerce/Classes/Blaze/BlazeEligibilityChecker.swift

@@ -13,9 +13,14 @@ protocol BlazeEligibilityCheckerProtocol {
 /// Checks for Blaze eligibility for a site and its products.
 final class BlazeEligibilityChecker: BlazeEligibilityCheckerProtocol {
     private let stores: StoresManager
+    private let siteCIABEligibilityChecker: CIABEligibilityCheckerProtocol
 
-    init(stores: StoresManager = ServiceLocator.stores) {
+    init(
+        stores: StoresManager = ServiceLocator.stores,
+        siteCIABEligibilityChecker: CIABEligibilityCheckerProtocol = CIABEligibilityChecker()
+    ) {
         self.stores = stores
+        self.siteCIABEligibilityChecker = siteCIABEligibilityChecker
     }
 
     /// Checks if the site is eligible for Blaze.
@@ -39,7 +44,11 @@ final class BlazeEligibilityChecker: BlazeEligibilityCheckerProtocol {
 private extension BlazeEligibilityChecker {
     @MainActor
     func checkSiteEligibility(_ site: Site) async -> Bool {
-        guard site.isAdmin && site.canBlaze else {
+        guard
+            site.isAdmin,
+            site.canBlaze,
+            siteCIABEligibilityChecker.isFeatureSupported(.blaze, for: site)
+        else {
             return false
         }
 

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

@@ -85,11 +85,13 @@ final class HubMenuViewModel: ObservableObject {
     private let inboxEligibilityChecker: InboxEligibilityChecker
     private let blazeEligibilityChecker: BlazeEligibilityCheckerProtocol
     private let googleAdsEligibilityChecker: GoogleAdsEligibilityChecker
+    private let siteCIABEligibilityChecker: CIABEligibilityCheckerProtocol
 
     private(set) lazy var inboxViewModel = InboxViewModel(siteID: siteID)
 
     @Published private(set) var shouldShowNewFeatureBadgeOnPayments: Bool = false
 
+    @Published private var isSiteEligibleForPayments = false
     @Published private var isSiteEligibleForBlaze = false
     @Published private var isSiteEligibleForGoogleAds = false
     @Published private var isSiteEligibleForInbox = false
@@ -125,6 +127,7 @@ final class HubMenuViewModel: ObservableObject {
          inboxEligibilityChecker: InboxEligibilityChecker = InboxEligibilityUseCase(),
          blazeEligibilityChecker: BlazeEligibilityCheckerProtocol = BlazeEligibilityChecker(),
          googleAdsEligibilityChecker: GoogleAdsEligibilityChecker = DefaultGoogleAdsEligibilityChecker(),
+         siteCIABEligibilityChecker: CIABEligibilityCheckerProtocol = CIABEligibilityChecker(),
          analytics: Analytics = ServiceLocator.analytics) {
         self.siteID = siteID
         self.credentials = stores.sessionManager.defaultCredentials
@@ -136,6 +139,7 @@ final class HubMenuViewModel: ObservableObject {
         self.inboxEligibilityChecker = inboxEligibilityChecker
         self.blazeEligibilityChecker = blazeEligibilityChecker
         self.googleAdsEligibilityChecker = googleAdsEligibilityChecker
+        self.siteCIABEligibilityChecker = siteCIABEligibilityChecker
         self.cardPresentPaymentsOnboarding = CardPresentPaymentsOnboardingUseCase()
         self.analytics = analytics
         observeSiteForUIUpdates()
@@ -251,30 +255,55 @@ private extension HubMenuViewModel {
     }
 
     func setupGeneralElements() {
-        $shouldShowNewFeatureBadgeOnPayments
-            .combineLatest($isSiteEligibleForInbox,
-                           $isSiteEligibleForBlaze,
-                           $isSiteEligibleForGoogleAds)
-            .map { [weak self] combinedResult -> [HubMenuItem] in
-                guard let self else { return [] }
-                let (shouldShowBadgeOnPayments, eligibleForInbox, eligibleForBlaze, eligibleForGoogleAds) = combinedResult
-                return createGeneralElements(
-                    shouldShowBadgeOnPayments: shouldShowBadgeOnPayments,
-                    eligibleForGoogleAds: eligibleForGoogleAds,
-                    eligibleForBlaze: eligibleForBlaze,
-                    eligibleForInbox: eligibleForInbox
-                )
-            }
-            .assign(to: &$generalElements)
+        Publishers.CombineLatest(
+            $shouldShowNewFeatureBadgeOnPayments,
+            $isSiteEligibleForPayments
+        )
+        .combineLatest(
+            Publishers.CombineLatest3(
+                $isSiteEligibleForInbox,
+                $isSiteEligibleForBlaze,
+                $isSiteEligibleForGoogleAds
+            )
+        )
+        .map { [weak self] combinedResults -> [HubMenuItem] in
+            guard let self else { return [] }
+
+            let ((shouldShowBadgeOnPayments, eligibleForPayments), (eligibleForInbox, eligibleForBlaze, eligibleForGoogleAds)) = combinedResults
+
+            let paymentsEligibility: PaymentsFeatureEligibility = eligibleForPayments ?
+                .eligible(shouldShowBadgeOnPayments: shouldShowBadgeOnPayments) :
+                .ineligible
+
+            return createGeneralElements(
+                paymentsEligibility: paymentsEligibility,
+                eligibleForGoogleAds: eligibleForGoogleAds,
+                eligibleForBlaze: eligibleForBlaze,
+                eligibleForInbox: eligibleForInbox
+            )
+        }
+        .assign(to: &$generalElements)
+    }
+
+    enum PaymentsFeatureEligibility {
+        case ineligible
+        case eligible(shouldShowBadgeOnPayments: Bool)
     }
 
-    func createGeneralElements(shouldShowBadgeOnPayments: Bool,
+    func createGeneralElements(paymentsEligibility: PaymentsFeatureEligibility,
                                eligibleForGoogleAds: Bool,
                                eligibleForBlaze: Bool,
                                eligibleForInbox: Bool) -> [HubMenuItem] {
-        var items: [HubMenuItem] = [
-            Payments(iconBadge: shouldShowBadgeOnPayments ? .dot : nil)
-        ]
+        var items: [HubMenuItem] = []
+
+        switch paymentsEligibility {
+            case .ineligible:
+                break
+            case .eligible(let shouldShowBadgeOnPayments):
+                items.append(
+                    Payments(iconBadge: shouldShowBadgeOnPayments ? .dot : nil)
+                )
+        }
 
         if shouldShowAISettings {
             items.append(AISettings())
@@ -354,7 +383,7 @@ private extension HubMenuViewModel {
     }
 
     func updateMenuItemEligibility(with site: Yosemite.Site) {
-
+        isSiteEligibleForPayments = siteCIABEligibilityChecker.isFeatureSupported(.payments, for: site)
         isSiteEligibleForInbox = inboxEligibilityChecker.isEligibleForInbox(siteID: site.siteID)
 
         Task { @MainActor in

WooCommerce/WooCommerceTests/Mocks/MockCIABEligibilityChecker.swift

@@ -26,6 +26,6 @@ final class MockCIABEligibilityChecker: CIABEligibilityCheckerProtocol {
     }
 
     func isFeatureSupported(_ feature: CIABAffectedFeature, for site: Site) -> Bool {
-        return !mockedCIABDisabledFeatures.contains(feature) && mockedCIABSites.contains(site)
+        return !mockedCIABDisabledFeatures.contains(feature) || !mockedCIABSites.contains(site)
     }
 }

WooCommerce/WooCommerceTests/ViewRelated/Blaze/BlazeEligibilityCheckerTests.swift

@@ -131,6 +131,53 @@ final class BlazeEligibilityCheckerTests: XCTestCase {
         XCTAssertTrue(isEligible)
     }
 
+    @MainActor
+    func test_isEligible_is_true_when_site_is_non_ciab_and_other_requirements_met() async {
+        // Given
+        stores.authenticate(credentials: .wpcom(username: "", authToken: "", siteAddress: ""))
+        let site = mockSite(isEligibleForBlaze: true,
+                            isJetpackThePluginInstalled: false,
+                            isJetpackConnected: true)
+        let siteIsCIABChecker = MockCIABEligibilityChecker(
+            mockedIsCurrentSiteCIAB: false,
+        )
+        let blazeEligibilityChecker = BlazeEligibilityChecker(
+            stores: stores,
+            siteCIABEligibilityChecker: siteIsCIABChecker
+        )
+        mockPluginFetch(remotePlugin: .fake().copy(plugin: Self.pluginSlug, active: true))
+
+        // When
+        let isEligible = await blazeEligibilityChecker.isSiteEligible(site)
+
+        // Then
+        XCTAssertTrue(isEligible)
+    }
+
+    @MainActor
+    func test_isEligible_is_false_when_site_is_ciab_and_other_requirements_met() async {
+        // Given
+        stores.authenticate(credentials: .wpcom(username: "", authToken: "", siteAddress: ""))
+        let site = mockSite(isEligibleForBlaze: true,
+                            isJetpackThePluginInstalled: false,
+                            isJetpackConnected: true)
+        let siteIsCIABChecker = MockCIABEligibilityChecker(
+            mockedIsCurrentSiteCIAB: true,
+            mockedCIABSites: [site]
+        )
+        let blazeEligibilityChecker = BlazeEligibilityChecker(
+            stores: stores,
+            siteCIABEligibilityChecker: siteIsCIABChecker
+        )
+        mockPluginFetch(remotePlugin: .fake().copy(plugin: Self.pluginSlug, active: true))
+
+        // When
+        let isEligible = await blazeEligibilityChecker.isSiteEligible(site)
+
+        // Then
+        XCTAssertFalse(isEligible)
+    }
+
     // MARK: - `isProductEligible`
 
     @MainActor

WooCommerce/WooCommerceTests/ViewRelated/HubMenu/HubMenuViewModelTests.swift

@@ -166,6 +166,64 @@ final class HubMenuViewModelTests: XCTestCase {
         XCTAssertTrue(expectedElementsIDs.isSubset(of: generalElementsIds))
     }
 
+    @MainActor
+    func test_generalElements_does_not_include_blaze_when_site_is_CIAB_site() {
+        // Given
+        let stores = MockStoresManager(sessionManager: .makeForTesting())
+        // Setting site ID is required before setting `Site`.
+        stores.updateDefaultStore(storeID: sampleSiteID)
+        stores.updateDefaultStore(.fake().copy(siteID: sampleSiteID))
+
+        let blazeEligibilityChecker = MockBlazeEligibilityChecker(isSiteEligible: false)
+        let mockCIABEligibilityChecker = MockCIABEligibilityChecker(
+            mockedIsCurrentSiteCIAB: true,
+            mockedCIABSites: [stores.sessionManager.defaultSite ?? .fake()]
+        )
+
+        // When
+        let viewModel = HubMenuViewModel(
+            siteID: sampleSiteID,
+            tapToPayBadgePromotionChecker: TapToPayBadgePromotionChecker(),
+            stores: stores,
+            blazeEligibilityChecker: blazeEligibilityChecker,
+            siteCIABEligibilityChecker: mockCIABEligibilityChecker
+        )
+
+        viewModel.setupMenuElements()
+
+        // Then
+        XCTAssertNil(viewModel.generalElements.firstIndex(where: { $0.id == HubMenuViewModel.Blaze.id }))
+    }
+
+    @MainActor
+    func test_generalElements_does_not_include_payments_when_site_is_CIAB_site() {
+        // Given
+        let stores = MockStoresManager(sessionManager: .makeForTesting())
+        // Setting site ID is required before setting `Site`.
+        stores.updateDefaultStore(storeID: sampleSiteID)
+        stores.updateDefaultStore(.fake().copy(siteID: sampleSiteID))
+
+        let blazeEligibilityChecker = MockBlazeEligibilityChecker(isSiteEligible: false)
+        let mockCIABEligibilityChecker = MockCIABEligibilityChecker(
+            mockedIsCurrentSiteCIAB: true,
+            mockedCIABSites: [stores.sessionManager.defaultSite ?? .fake()]
+        )
+
+        // When
+        let viewModel = HubMenuViewModel(
+            siteID: sampleSiteID,
+            tapToPayBadgePromotionChecker: TapToPayBadgePromotionChecker(),
+            stores: stores,
+            blazeEligibilityChecker: blazeEligibilityChecker,
+            siteCIABEligibilityChecker: mockCIABEligibilityChecker
+        )
+
+        viewModel.setupMenuElements()
+
+        // Then
+        XCTAssertNil(viewModel.generalElements.firstIndex(where: { $0.id == HubMenuViewModel.Payments.id }))
+    }
+
     @MainActor
     func test_generalElements_does_not_include_blaze_when_default_site_is_not_set() {
         // When