Merge pull request #7471 from woocommerce/issue/7470-pass-onboarding-error

[Mobile Payments] Pass onboarding error, to avoid another onboarding check

Author: toupper

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsMenuViewController.swift

@@ -15,8 +15,6 @@ final class InPersonPaymentsMenuViewController: UIViewController {
     private let cardPresentPaymentsOnboardingUseCase: CardPresentPaymentsOnboardingUseCase
     private var cancellables: Set<AnyCancellable> = []
 
-    private var cardPresentPaymentsOnboardingPresenter: CardPresentPaymentsOnboardingPresenting?
-
     /// Main TableView
     ///
     private lazy var tableView: UITableView = {
@@ -75,41 +73,43 @@ private extension InPersonPaymentsMenuViewController {
             .debounce(for: .milliseconds(100), scheduler: DispatchQueue.main)
             .removeDuplicates()
             .sink(receiveValue: { [weak self] state in
-                guard let self = self else { return }
-
-                self.pluginState = nil
-
-                guard state != .loading else {
-                    self.activityIndicator?.startAnimating()
-                    return
-                }
-
-                switch state {
-                case let .completed(newPluginState):
-                    self.pluginState = newPluginState
-                    self.dismissCardPresentPaymentsOnboardingNoticeIfPresent()
-                case let .selectPlugin(pluginSelectionWasCleared):
-                    // If it was cleared it means that we triggered it manually (e.g by tapping in this view on the plugin selection row)
-                    // No need to show the onboarding notice
-                    if !pluginSelectionWasCleared {
-                        self.showCardPresentPaymentsOnboardingNotice()
-                    }
-                default:
-                    self.showCardPresentPaymentsOnboardingNotice()
-                }
-
-                self.activityIndicator?.stopAnimating()
-                self.configureSections()
-                self.tableView.reloadData()
+                self?.refreshAfterNewOnboardingState(state)
         }).store(in: &cancellables)
     }
 
+    func refreshAfterNewOnboardingState(_ state: CardPresentPaymentOnboardingState) {
+        self.pluginState = nil
+
+        guard state != .loading else {
+            self.activityIndicator?.startAnimating()
+            return
+        }
+
+        switch state {
+        case let .completed(newPluginState):
+            self.pluginState = newPluginState
+            self.dismissCardPresentPaymentsOnboardingNoticeIfPresent()
+        case let .selectPlugin(pluginSelectionWasCleared):
+            // If it was cleared it means that we triggered it manually (e.g by tapping in this view on the plugin selection row)
+            // No need to show the onboarding notice
+            if !pluginSelectionWasCleared {
+                self.showCardPresentPaymentsOnboardingNotice()
+            }
+        default:
+            self.showCardPresentPaymentsOnboardingNotice()
+        }
+
+        self.activityIndicator?.stopAnimating()
+        self.configureSections()
+        self.tableView.reloadData()
+    }
+
     func showCardPresentPaymentsOnboardingNotice() {
         let permanentNotice = PermanentNotice(message: Localization.inPersonPaymentsSetupNotFinishedNotice,
                                               callToActionTitle: Localization.inPersonPaymentsSetupNotFinishedNoticeButtonTitle,
                                               callToActionHandler: { [weak self] in
             ServiceLocator.analytics.track(.paymentsMenuOnboardingErrorTapped)
-            self?.showOnboardingIfRequired()
+            self?.showOnboarding()
         })
 
         permanentNoticePresenter.presentNotice(notice: permanentNotice, from: self)
@@ -119,18 +119,23 @@ private extension InPersonPaymentsMenuViewController {
         permanentNoticePresenter.dismiss()
     }
 
-    func showOnboardingIfRequired() {
+    func showOnboarding() {
         guard let navigationController = self.navigationController else {
             return
         }
 
-        // Recreating it ensures that the readiness state is up to date.
-        // Keeping a reference ensures that the callback closure is retained.
-        cardPresentPaymentsOnboardingPresenter = CardPresentPaymentsOnboardingPresenter()
-
-        cardPresentPaymentsOnboardingPresenter?.showOnboardingIfRequired(from: navigationController) { [weak self] in
-            self?.cardPresentPaymentsOnboardingUseCase.refresh()
+        // Instead of using `CardPresentPaymentsOnboardingPresenter` we create the view directly because we already have the onboarding state in the use case.
+        // That way we avoid triggering the onboarding check again that comes with the presenter.
+        let onboardingViewModel = InPersonPaymentsViewModel(useCase: cardPresentPaymentsOnboardingUseCase, showMenuOnCompletion: false)
+        onboardingViewModel.onOnboardingCompletion = { [weak self] plugin in
+            self?.refreshAfterNewOnboardingState(.completed(plugin: plugin))
+            if navigationController.visibleViewController is InPersonPaymentsViewController {
+                navigationController.popViewController(animated: true)
+            }
         }
+
+        let onboardingViewController = InPersonPaymentsViewController(viewModel: onboardingViewModel)
+        show(onboardingViewController, sender: self)
     }
 }
 

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsViewModel.swift

@@ -8,6 +8,7 @@ final class InPersonPaymentsViewModel: ObservableObject {
     var learnMoreURL: URL? = nil
     let showMenuOnCompletion: Bool
     let gatewaySelectionAvailable: Bool
+    var onOnboardingCompletion: ((CardPresentPaymentsPluginState) -> ())?
     private let useCase: CardPresentPaymentsOnboardingUseCase
     let stores: StoresManager
 
@@ -29,6 +30,9 @@ final class InPersonPaymentsViewModel: ObservableObject {
             .debounce(for: .milliseconds(100), scheduler: DispatchQueue.main)
             .removeDuplicates()
             .handleEvents(receiveOutput: { [weak self] result in
+                if case let .completed(plugin) = result {
+                    self?.onOnboardingCompletion?(plugin)
+                }
                 self?.updateLearnMoreURL(state: result)
             })
             .handleEvents(receiveOutput: trackState(_:))

WooCommerce/Classes/ViewRelated/Orders/Collect Payments/CardPresentPaymentsOnboardingPresenter.swift

@@ -9,6 +9,9 @@ protocol CardPresentPaymentsOnboardingPresenting {
     func refresh()
 }
 
+/// Checks for the current user status regarding Card Present Payments,
+/// and shows the onboarding if the user didn't finish the onboarding to use CPP
+/// 
 final class CardPresentPaymentsOnboardingPresenter: CardPresentPaymentsOnboardingPresenting {
 
     private let stores: StoresManager