Trigger completion block after cancelling payment.

Author: jaclync

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

@@ -208,7 +208,9 @@ private extension CollectOrderPaymentUseCase {
         alerts.readerIsReady(title: Localization.collectPaymentTitle(username: order.billingAddress?.firstName),
                              amount: formattedAmount,
                              onCancel: { [weak self] in
-            self?.cancelPayment()
+            self?.cancelPayment {
+                onCompletion(.failure(CollectOrderPaymentUseCaseError.cancelled))
+            }
         })
 
         // Start collect payment process
@@ -219,7 +221,9 @@ private extension CollectOrderPaymentUseCase {
                onWaitingForInput: { [weak self] in
                    // Request card input
                    self?.alerts.tapOrInsertCard(onCancel: { [weak self] in
-                       self?.cancelPayment()
+                       self?.cancelPayment {
+                           onCompletion(.failure(CollectOrderPaymentUseCaseError.cancelled))
+                       }
                    })
 
                }, onProcessingMessage: { [weak self] in
@@ -293,12 +297,13 @@ private extension CollectOrderPaymentUseCase {
 
     /// Cancels payment and record analytics.
     ///
-    func cancelPayment() {
+    func cancelPayment(onCompleted: @escaping () -> ()) {
         paymentOrchestrator.cancelPayment { [weak self, analytics] _ in
             guard let self = self else { return }
             analytics.track(event: WooAnalyticsEvent.InPersonPayments.collectPaymentCanceled(forGatewayID: self.paymentGatewayAccount.gatewayID,
                                                                                              countryCode: self.configuration.countryCode,
                                                                                              cardReaderModel: self.connectedReader?.readerType.model ?? ""))
+            onCompleted()
         }
     }
 
@@ -391,6 +396,7 @@ private extension CollectOrderPaymentUseCase {
     struct UnknownEmailError: Error {}
     enum CollectOrderPaymentUseCaseError: Error {
         case cardReaderDisconnected
+        case cancelled
     }
 
     enum Localization {

WooCommerce/Classes/ViewRelated/Orders/Refund/RefundSubmissionUseCase.swift

@@ -265,7 +265,7 @@ private extension RefundSubmissionUseCase {
                                              paymentGatewayAccount: paymentGatewayAccount,
                                              onWaitingForInput: { [weak self] in
             // Requests card input.
-            self?.alerts.tapOrInsertCard(onCancel: {
+            self?.alerts.tapOrInsertCard(onCancel: { [weak self] in
                 self?.cancelRefund()
             })
         }, onProcessingMessage: { [weak self] in

WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CollectOrderPaymentUseCaseTests.swift

@@ -60,30 +60,26 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
         XCTAssertEqual(eventProperties["plugin_slug"] as? String, Mocks.paymentGatewayAccount)
     }
 
-    func test_cancelling_readerIsReady_alert_tracks_collectPaymentCanceled_event() throws {
+    func test_cancelling_readerIsReady_alert_triggers_onCompleted_and_tracks_collectPaymentCanceled_event_and_dispatches_cancel_action() throws {
+        // Given
+        assertEmpty(stores.receivedActions)
+
         // When
         mockCardPresentPaymentActions()
-        useCase.collectPayment(backButtonTitle: "", onCollect: { _ in }, onCompleted: {})
-        alerts.cancelReaderIsReadyAlert?()
+        let _: Void = waitFor { promise in
+            self.useCase.collectPayment(backButtonTitle: "", onCollect: { _ in }, onCompleted: {
+                promise(())
+            })
+            self.alerts.cancelReaderIsReadyAlert?()
+        }
 
         // Then
         let indexOfEvent = try XCTUnwrap(analyticsProvider.receivedEvents.firstIndex(where: { $0 == "card_present_collect_payment_canceled"}))
         let eventProperties = try XCTUnwrap(analyticsProvider.receivedProperties[indexOfEvent])
         XCTAssertEqual(eventProperties["card_reader_model"] as? String, Mocks.cardReaderModel)
         XCTAssertEqual(eventProperties["country"] as? String, "US")
         XCTAssertEqual(eventProperties["plugin_slug"] as? String, Mocks.paymentGatewayAccount)
-    }
 
-    func test_cancelling_readerIsReady_alert_dispatches_cancel_action() throws {
-        // Given
-        assertEmpty(stores.receivedActions)
-
-        // When
-        mockCardPresentPaymentActions()
-        useCase.collectPayment(backButtonTitle: "", onCollect: { _ in }, onCompleted: {})
-        alerts.cancelReaderIsReadyAlert?()
-
-        // Then
         let action = try XCTUnwrap(stores.receivedActions.last as? CardPresentPaymentAction)
         switch action {
         case .cancelPayment(onCompletion: _):