Pass cancellation request through orchestrator, restore pass there too

Author: allendav

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalTapCard.swift

@@ -10,6 +10,9 @@ final class CardPresentModalTapCard: CardPresentPaymentsModalViewModel {
     /// Charge amount
     private let amount: String
 
+    /// Cancellation callback
+    private let onCancel: () -> Void
+
     let textMode: PaymentsModalTextMode = .fullInfo
     let actionsMode: PaymentsModalActionsMode = .secondaryOnlyAction
 
@@ -33,22 +36,20 @@ final class CardPresentModalTapCard: CardPresentPaymentsModalViewModel {
 
     let bottomSubtitle: String? = Localization.tapInsertOrSwipe
 
-    init(name: String, amount: String) {
+    init(name: String, amount: String, onCancel: @escaping () -> Void) {
         self.name = name
         self.amount = amount
+        self.onCancel = onCancel
     }
 
     func didTapPrimaryButton(in viewController: UIViewController?) {
         //
     }
 
     func didTapSecondaryButton(in viewController: UIViewController?) {
-        ServiceLocator.analytics.track(.collectPaymentCanceled)
-        let action = CardPresentPaymentAction.cancelPayment(onCompletion: nil)
-
-        ServiceLocator.stores.dispatch(action)
-
-        viewController?.dismiss(animated: true, completion: nil)
+        viewController?.dismiss(animated: true, completion: { [weak self] in
+            self?.onCancel()
+        })
     }
 
     func didTapAuxiliaryButton(in viewController: UIViewController?) {

WooCommerce/Classes/ViewModels/CardPresentPayments/PaymentCaptureOrchestrator.swift

@@ -77,7 +77,10 @@ final class PaymentCaptureOrchestrator {
     }
 
     func cancelPayment(onCompletion: @escaping (Result<Void, Error>) -> Void) {
-        let action = CardPresentPaymentAction.cancelPayment(onCompletion: onCompletion)
+        let action = CardPresentPaymentAction.cancelPayment() { [weak self] result in
+            self?.allowPassPresentation()
+            onCompletion(result)
+        }
         ServiceLocator.stores.dispatch(action)
     }
 

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsPaymentAlerts.swift

@@ -48,8 +48,8 @@ final class OrderDetailsPaymentAlerts {
         presentViewModel(viewModel: viewModel)
     }
 
-    func tapOrInsertCard() {
-        let viewModel = tapOrInsert()
+    func tapOrInsertCard(onCancel: @escaping () -> Void) {
+        let viewModel = tapOrInsert(onCancel: onCancel)
         presentViewModel(viewModel: viewModel)
     }
 
@@ -89,8 +89,8 @@ private extension OrderDetailsPaymentAlerts {
         CardPresentModalReaderIsReady(name: name, amount: amount)
     }
 
-    func tapOrInsert() -> CardPresentPaymentsModalViewModel {
-        CardPresentModalTapCard(name: name, amount: amount)
+    func tapOrInsert(onCancel: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
+        CardPresentModalTapCard(name: name, amount: amount, onCancel: onCancel)
     }
 
     func remove() -> CardPresentPaymentsModalViewModel {

WooCommerce/Classes/ViewRelated/Orders/Order Details/OrderDetailsViewController.swift

@@ -728,7 +728,11 @@ private extension OrderDetailsViewController {
 
         ServiceLocator.analytics.track(.collectPaymentTapped)
         viewModel.collectPayment { [weak self] readerEventMessage in
-            self?.paymentAlerts.tapOrInsertCard()
+            self?.paymentAlerts.tapOrInsertCard(onCancel: {
+                self?.viewModel.cancelPayment(onCompletion: { _ in
+                    ServiceLocator.analytics.track(.collectPaymentCanceled)
+                })
+            })
         } onClearMessage: { [weak self] in
             self?.paymentAlerts.removeCard()
         } onProcessingMessage: { [weak self] in

WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CardPresentModalTapCardTests.swift

@@ -5,14 +5,21 @@ import TestKit
 
 final class CardPresentModalTapCardTests: XCTestCase {
     private var viewModel: CardPresentModalTapCard!
+    private var closures: Closures!
 
     override func setUp() {
         super.setUp()
-        viewModel = CardPresentModalTapCard(name: Expectations.name, amount: Expectations.amount)
+        closures = Closures()
+        viewModel = CardPresentModalTapCard(
+            name: Expectations.name,
+            amount: Expectations.amount,
+            onCancel: closures.onCancel()
+        )
     }
 
     override func tearDown() {
         viewModel = nil
+        closures = nil
         super.tearDown()
     }
 
@@ -48,33 +55,26 @@ final class CardPresentModalTapCardTests: XCTestCase {
         XCTAssertNotNil(viewModel.bottomSubtitle)
     }
 
-    func test_secondary_button_dispatched_cancel_action() throws {
-        let storesManager = MockStoresManager(sessionManager: .makeForTesting(authenticated: true))
-        storesManager.reset()
-
-        ServiceLocator.setStores(storesManager)
-
-        assertEmpty(storesManager.receivedActions)
-
-        viewModel.didTapSecondaryButton(in: nil)
-
-        XCTAssertEqual(storesManager.receivedActions.count, 1)
-
-        let action = try XCTUnwrap(storesManager.receivedActions.first as? CardPresentPaymentAction)
-        switch action {
-        case .cancelPayment(onCompletion: _):
-            XCTAssertTrue(true)
-        default:
-            XCTFail("Primary button failed to dispatch .cancelPayment action")
-        }
+    func test_secondary_button_calls_closure() throws {
+        viewModel.didTapSecondaryButton(in: UIViewController())
+        XCTAssertTrue(closures.didTapCancel)
     }
 }
 
-
 private extension CardPresentModalTapCardTests {
     enum Expectations {
         static var name = "name"
         static var amount = "amount"
         static var image = UIImage.cardPresentImage
     }
 }
+
+private final class Closures {
+    var didTapCancel = false
+
+    func onCancel() -> () -> Void {
+        return { [weak self] in
+            self?.didTapCancel = true
+        }
+    }
+}