Merge pull request #8078 from woocommerce/issue/8069-hide-ipp-banner

[Mobile Payments] Remove upsellCardReader banner from OrderList

Author: joshheald

RELEASE-NOTES.txt

@@ -3,6 +3,7 @@
 11.2
 -----
 - [*] The survey at the end of the login onboarding flow is no longer available. [https://github.com/woocommerce/woocommerce-ios/pull/8062]
+- [*] The Accept Payments Easily banner has been removed from the order list [https://github.com/woocommerce/woocommerce-ios/pull/8078]
 
 11.1
 -----

WooCommerce/Classes/ViewRelated/Orders/OrderListViewController.swift

@@ -185,8 +185,6 @@ final class OrderListViewController: UIViewController, GhostableViewController {
             // Reload table view to update selected state on the list when changing rotation
             tableView.reloadData()
         }
-
-        updateUpsellCardReaderTopBannerVisibility(with: newCollection)
     }
 
     /// Returns a function that creates cells for `dataSource`.
@@ -248,11 +246,6 @@ private extension OrderListViewController {
                 switch topBannerType {
                 case .none:
                     self.hideTopBannerView()
-                case .upsellCardReaders:
-                    // The banner is too large to be shown when the vertical size class is compact
-                    if self.traitCollection.verticalSizeClass == .regular {
-                        self.showUpsellCardReadersBanner()
-                    }
                 case .error:
                     self.setErrorTopBanner()
                 case .orderCreation:
@@ -411,48 +404,6 @@ extension OrderListViewController: SyncingCoordinatorDelegate {
 
         tableView.updateHeaderHeight()
     }
-
-    private func showUpsellCardReadersBanner() {
-        let view = FeatureAnnouncementCardView(viewModel: viewModel.upsellCardReadersAnnouncementViewModel,
-                                               dismiss: { [weak self] in
-            self?.viewModel.dismissUpsellCardReadersBanner()
-        }, callToAction: { [weak self] in
-            self?.openCardReaderProductPageInWebView()
-        })
-            .background(Color(.listForeground))
-
-        guard let hostingView = UIHostingController(rootView: view).view else {
-            return
-        }
-
-        hostingView.translatesAutoresizingMaskIntoConstraints = false
-        topBannerView = hostingView
-
-        showTopBannerView()
-    }
-
-    private func openCardReaderProductPageInWebView() {
-        let configuration = CardPresentConfigurationLoader().configuration
-        let url = configuration.purchaseCardReaderUrl(utmProvider: viewModel.upsellCardReadersCampaign.utmProvider)
-        let cardReaderWebview = WebViewSheet(
-            viewModel: WebViewSheetViewModel(
-                url: url,
-                navigationTitle: UpsellCardReadersCampaign.Localization.cardReaderWebViewTitle,
-                wpComAuthenticated: true),
-            done: { [weak self] in
-                self?.dismiss(animated: true)
-            })
-        let hostingController = UIHostingController(rootView: cardReaderWebview)
-        present(hostingController, animated: true, completion: nil)
-    }
-
-    func updateUpsellCardReaderTopBannerVisibility(with newCollection: UITraitCollection) {
-        guard viewModel.topBanner == .upsellCardReaders else {
-            return
-        }
-
-        newCollection.verticalSizeClass == .regular ? showUpsellCardReadersBanner() : hideTopBannerView()
-    }
 }
 
 // MARK: - Spinner Helpers

WooCommerce/Classes/ViewRelated/Orders/OrderListViewModel.swift

@@ -24,11 +24,6 @@ final class OrderListViewModel {
     private let pushNotificationsManager: PushNotesManager
     private let notificationCenter: NotificationCenter
 
-    /// Used to show the upsell card readers banner and discern its visibility
-    /// 
-    let upsellCardReadersCampaign = UpsellCardReadersCampaign(source: .orderList)
-    let upsellCardReadersAnnouncementViewModel: FeatureAnnouncementCardViewModel
-
     /// Used for cancelling the observer for Remote Notifications when `self` is deallocated.
     ///
     private var foregroundNotificationsSubscription: AnyCancellable?
@@ -107,11 +102,6 @@ final class OrderListViewModel {
         self.pushNotificationsManager = pushNotificationsManager
         self.notificationCenter = notificationCenter
         self.filters = filters
-        self.upsellCardReadersAnnouncementViewModel =
-            .init(analytics: ServiceLocator.analytics,
-                  configuration: upsellCardReadersCampaign.configuration,
-                  stores: stores)
-
     }
 
     deinit {
@@ -137,10 +127,6 @@ final class OrderListViewModel {
         loadOrdersBannerVisibility()
     }
 
-    func dismissUpsellCardReadersBanner() {
-        bindTopBannerState()
-    }
-
     func dismissOrdersBanner() {
         let action = AppSettingsAction.updateFeedbackStatus(type: .ordersCreation,
                                                status: .dismissed) { [weak self] result in
@@ -293,20 +279,14 @@ 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, upsellCardReadersBannerAvailable  -> TopBanner in
+        Publishers.CombineLatest(errorState, $hideOrdersBanners)
+            .map { hasError, hasDismissedOrdersBanners  -> TopBanner in
 
                 if hasError {
                     return .error
                 }
 
-                if upsellCardReadersBannerAvailable && isSupportedCountryForCPP {
-                    return .upsellCardReaders
-                }
-
                 if hasDismissedOrdersBanners {
                     return .none
                 }
@@ -353,7 +333,6 @@ extension OrderListViewModel {
     ///
     enum TopBanner {
         case error
-        case upsellCardReaders
         case orderCreation
         case none
     }

WooCommerce/WooCommerceTests/ViewRelated/Orders/OrderListViewModelTests.swift

@@ -239,59 +239,13 @@ final class OrderListViewModelTests: XCTestCase {
         XCTAssertFalse(resynchronizeRequested)
     }
 
-    func test_when_having_no_error_and_upsellCardReaders_banner_should_be_shown_shows_upsellCardReaders_banner_if_country_supported() {
-        // Given
-        stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
-            switch action {
-            case let .getFeatureAnnouncementVisibility(FeatureAnnouncementCampaign.upsellCardReaders, onCompletion):
-                onCompletion(.success(true))
-            default:
-                break
-            }
-        }
-        setupCountry(country: .us)
-        let viewModel = OrderListViewModel(siteID: siteID, stores: stores, filters: nil)
-
-        // When
-        viewModel.activate()
-
-        // Then
-        waitUntil {
-            viewModel.topBanner == .upsellCardReaders
-        }
-    }
-
-    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() {
+    func test_when_having_no_error__and_orders_banner_should_not_be_shown_shows_nothing() {
         // Given
         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))
-            case let .getFeatureAnnouncementVisibility(FeatureAnnouncementCampaign.upsellCardReaders, onCompletion):
-                onCompletion(.success(false))
             default:
                 break
             }
@@ -306,15 +260,13 @@ 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() {
+    func test_when_having_no_error_and_orders_banner_should_be_shown_shows_orders_banner() {
         // Given
         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))
-            case let .getFeatureAnnouncementVisibility(FeatureAnnouncementCampaign.upsellCardReaders, onCompletion):
-                onCompletion(.success(false))
             default:
                 break
             }