Improve logic to decide when to show IPP banner

Author: koke

WooCommerce/Classes/ViewModels/Feature Announcement Cards/FeatureAnnouncementCardViewModel.swift

@@ -58,10 +58,6 @@ class FeatureAnnouncementCardViewModel {
     }
 
     private func updateShouldBeVisible() {
-        guard CardPresentConfigurationLoader(stores: stores).configuration.isSupportedCountry else {
-            shouldBeVisible = false
-            return
-        }
         let action = AppSettingsAction.getFeatureAnnouncementVisibility(campaign: config.campaign) { [weak self] result in
             guard let self = self else { return }
             switch result {

WooCommerce/Classes/ViewRelated/Orders/OrderListViewModel.swift

@@ -293,18 +293,21 @@ extension OrderListViewModel {
     ///
     private func bindTopBannerState() {
         let errorState = $hasErrorLoadingData.removeDuplicates()
+        let cppConfiguration = CardPresentConfigurationLoader(stores: stores).configuration
+        let isSupportedCountryForCPP = cppConfiguration.isSupportedCountry
+
         Publishers.CombineLatest3(errorState, $hideOrdersBanners, upsellCardReadersAnnouncementViewModel.$shouldBeVisible)
             .map { hasError, hasDismissedOrdersBanners, upsellCardReadersBannerShouldBeVisible  -> TopBanner in
 
-                guard !hasError else {
+                if hasError {
                     return .error
                 }
 
-                guard !upsellCardReadersBannerShouldBeVisible else {
+                if upsellCardReadersBannerShouldBeVisible && isSupportedCountryForCPP {
                     return .upsellCardReaders
                 }
 
-                guard !hasDismissedOrdersBanners else {
+                if hasDismissedOrdersBanners {
                     return .none
                 }
 

WooCommerce/WooCommerceTests/ViewRelated/Orders/OrderListViewModelTests.swift

@@ -10,7 +10,9 @@ final class OrderListViewModelTests: XCTestCase {
     /// The `siteID` value doesn't matter.
     private let siteID: Int64 = 1_000_000
 
-    private var storageManager: StorageManagerType!
+    private var storageManager: MockStorageManager!
+
+    private var stores: MockStoresManager!
 
     private var storage: StorageType {
         storageManager.viewStorage
@@ -21,10 +23,16 @@ final class OrderListViewModelTests: XCTestCase {
     override func setUp() {
         super.setUp()
         storageManager = MockStorageManager()
+        stores = MockStoresManager(sessionManager: .makeForTesting(authenticated: true))
+        stores.sessionManager.setStoreId(siteID)
+        ServiceLocator.setSelectedSiteSettings(SelectedSiteSettings(stores: stores, storageManager: storageManager))
     }
 
     override func tearDown() {
+        ServiceLocator.setSelectedSiteSettings(SelectedSiteSettings())
+        storageManager.reset()
         storageManager = nil
+        stores = nil
 
         cancellables.forEach {
             $0.cancel()
@@ -231,18 +239,18 @@ final class OrderListViewModelTests: XCTestCase {
         XCTAssertFalse(resynchronizeRequested)
     }
 
-    func test_when_having_no_error_and_upsellCardReaders_banner_should_be_shown_showns_upsellCardReaders_banner() {
+    func test_when_having_no_error_and_upsellCardReaders_banner_should_be_shown_shows_upsellCardReaders_banner_if_country_supported() {
         // Given
-        let storesManager = MockStoresManager(sessionManager: .testingInstance)
-        storesManager.whenReceivingAction(ofType: AppSettingsAction.self) { action in
+        stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
             switch action {
             case let .getFeatureAnnouncementVisibility(FeatureAnnouncementCampaign.upsellCardReaders, onCompletion):
                 onCompletion(.success(true))
             default:
                 break
             }
         }
-        let viewModel = OrderListViewModel(siteID: siteID, stores: storesManager, filters: nil)
+        setupCountry(country: .us)
+        let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
 
         // When
         viewModel.activate()
@@ -253,11 +261,32 @@ final class OrderListViewModelTests: XCTestCase {
         }
     }
 
+    func test_when_having_no_error_and_upsellCardReaders_banner_should_be_shown_shows_nothing_if_country_unsupported() {
+        // Given
+        stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
+            switch action {
+            case let .getFeatureAnnouncementVisibility(FeatureAnnouncementCampaign.upsellCardReaders, onCompletion):
+                onCompletion(.success(true))
+            default:
+                break
+            }
+        }
+        setupCountry(country: .es)
+        let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
+
+        // When
+        viewModel.activate()
+
+        // Then
+        waitUntil {
+            viewModel.topBanner == .none
+        }
+    }
+
     func test_when_having_no_error_and_upsellCardReaders_banner_should_not_be_shown_and_orders_banner_should_not_be_shown_shows_nothing() {
         // Given
-        let storesManager = MockStoresManager(sessionManager: .testingInstance)
-        let viewModel = OrderListViewModel(siteID: siteID, stores: storesManager, filters: nil)
-        storesManager.whenReceivingAction(ofType: AppSettingsAction.self) { action in
+        let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
+        stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
             switch action {
             case let .loadFeedbackVisibility(_, onCompletion):
                 onCompletion(.success(false))
@@ -279,9 +308,8 @@ final class OrderListViewModelTests: XCTestCase {
 
     func test_when_having_no_error_and_upsellCardReaders_banner_should_not_be_shown_and_orders_banner_should_be_shown_shows_orders_banner() {
         // Given
-        let storesManager = MockStoresManager(sessionManager: .testingInstance)
-        let viewModel = OrderListViewModel(siteID: siteID, stores: storesManager, filters: nil)
-        storesManager.whenReceivingAction(ofType: AppSettingsAction.self) { action in
+        let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
+        stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
             switch action {
             case let .loadFeedbackVisibility(_, onCompletion):
                 onCompletion(.success(true))
@@ -303,9 +331,8 @@ final class OrderListViewModelTests: XCTestCase {
 
     func test_when_having_no_error_and_orders_banner_visibility_loading_fails_shows_nothing() {
         // Given
-        let storesManager = MockStoresManager(sessionManager: .testingInstance)
-        let viewModel = OrderListViewModel(siteID: siteID, stores: storesManager, filters: nil)
-        storesManager.whenReceivingAction(ofType: AppSettingsAction.self) { action in
+        let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
+        stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
             switch action {
             case let .loadFeedbackVisibility(_, onCompletion):
                 let error = NSError(domain: "Test", code: 503, userInfo: nil)
@@ -340,7 +367,6 @@ final class OrderListViewModelTests: XCTestCase {
 
     func test_dismissing_orders_banners_does_not_show_banners() {
         // Given
-        let stores = MockStoresManager(sessionManager: .testingInstance)
         let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
 
         // When
@@ -421,6 +447,26 @@ private extension OrderListViewModel {
     }
 }
 
+private extension OrderListViewModelTests {
+    // MARK: - Country helpers
+    func setupCountry(country: Country) {
+        let setting = SiteSetting.fake()
+            .copy(
+                siteID: siteID,
+                settingID: "woocommerce_default_country",
+                value: country.rawValue,
+                settingGroupKey: SiteSettingGroup.general.rawValue
+            )
+        storageManager.insertSampleSiteSetting(readOnlySiteSetting: setting)
+        ServiceLocator.selectedSiteSettings.refresh()
+    }
+
+    enum Country: String {
+        case us = "US:CA"
+        case es = "ES"
+    }
+}
+
 private extension Array where Element == Yosemite.Order {
     /// Returns all the IDs
     ///