Update CardPresentModalError dismiss action handling to completion so that the dismiss implementation detail is within the modal class.

Author: jaclync

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentModalError.swift

@@ -5,8 +5,8 @@ final class CardPresentModalError: CardPresentPaymentsModalViewModel {
     /// A closure to execute when the primary button is tapped
     private let primaryAction: () -> Void
 
-    /// A closure to execute when the secondary button is tapped
-    private let secondaryAction: (UIViewController?) -> Void
+    /// A closure to execute when the secondary button is tapped to dismiss the modal
+    private let dismissCompletion: () -> Void
 
     let textMode: PaymentsModalTextMode = .reducedBottomInfo
     let actionsMode: PaymentsModalActionsMode = .twoAction
@@ -37,21 +37,23 @@ final class CardPresentModalError: CardPresentPaymentsModalViewModel {
     init(errorDescription: String?,
          transactionType: CardPresentTransactionType,
          primaryAction: @escaping () -> Void,
-         secondaryAction: @escaping (_ viewController: UIViewController?) -> Void) {
+         dismissCompletion: @escaping () -> Void) {
         self.topTitle = Localization.paymentFailed(transactionType: transactionType)
         self.bottomTitle = errorDescription
         self.primaryButtonTitle = Localization.tryAgain(transactionType: transactionType)
         self.secondaryButtonTitle = Localization.noThanks(transactionType: transactionType)
         self.primaryAction = primaryAction
-        self.secondaryAction = secondaryAction
+        self.dismissCompletion = dismissCompletion
     }
 
     func didTapPrimaryButton(in viewController: UIViewController?) {
         primaryAction()
     }
 
     func didTapSecondaryButton(in viewController: UIViewController?) {
-        secondaryAction(viewController)
+        viewController?.dismiss(animated: true) { [weak self] in
+            self?.dismissCompletion()
+        }
     }
 
     func didTapAuxiliaryButton(in viewController: UIViewController?) { }

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

@@ -77,8 +77,8 @@ final class OrderDetailsPaymentAlerts: OrderDetailsPaymentAlertsProtocol {
         presentViewModel(viewModel: viewModel)
     }
 
-    func error(error: Error, tryAgain: @escaping () -> Void, dismissError: @escaping (UIViewController?) -> Void) {
-        let viewModel = errorViewModel(error: error, tryAgain: tryAgain, dismissError: dismissError)
+    func error(error: Error, tryAgain: @escaping () -> Void, dismissCompletion: @escaping () -> Void) {
+        let viewModel = errorViewModel(error: error, tryAgain: tryAgain, dismissCompletion: dismissCompletion)
         presentViewModel(viewModel: viewModel)
     }
 
@@ -129,7 +129,7 @@ private extension OrderDetailsPaymentAlerts {
 
     func errorViewModel(error: Error,
                         tryAgain: @escaping () -> Void,
-                        dismissError: @escaping (_ viewController: UIViewController?) -> Void) -> CardPresentPaymentsModalViewModel {
+                        dismissCompletion: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
         let errorDescription: String?
         if let error = error as? CardReaderServiceError {
             switch error {
@@ -154,7 +154,7 @@ private extension OrderDetailsPaymentAlerts {
         return CardPresentModalError(errorDescription: errorDescription,
                                      transactionType: transactionType,
                                      primaryAction: tryAgain,
-                                     secondaryAction: dismissError)
+                                     dismissCompletion: dismissCompletion)
     }
 
     func retryableErrorViewModel(tryAgain: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {

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

@@ -14,7 +14,7 @@ protocol OrderDetailsPaymentAlertsProtocol {
 
     func success(printReceipt: @escaping () -> Void, emailReceipt: @escaping () -> Void, noReceiptTitle: String, noReceiptAction: @escaping () -> Void)
 
-    func error(error: Error, tryAgain: @escaping () -> Void, dismissError: @escaping (_ viewController: UIViewController?) -> Void)
+    func error(error: Error, tryAgain: @escaping () -> Void, dismissCompletion: @escaping () -> Void)
 
     func nonRetryableError(from: UIViewController?, error: Error)
 

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

@@ -289,8 +289,7 @@ private extension CollectOrderPaymentUseCase {
                     onCompletion(.failure(error))
                 }
             }
-        }, dismissError: { viewController in
-            viewController?.dismiss(animated: true)
+        }, dismissCompletion: {
             onCompletion(.failure(error))
         })
     }

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

@@ -305,8 +305,7 @@ private extension RefundSubmissionUseCase {
                     onCompletion(.failure(error))
                 }
             }
-        }, dismissError: { viewController in
-            viewController?.dismiss(animated: true)
+        }, dismissCompletion: {
             onCompletion(.failure(error))
         })
     }

WooCommerce/WooCommerceTests/Mocks/MockOrderDetailsPaymentAlerts.swift

@@ -7,7 +7,7 @@ final class MockOrderDetailsPaymentAlerts: OrderDetailsPaymentAlertsProtocol {
 
     var error: Error?
     var retryFromError: (() -> Void)?
-    var dismissError: ((UIViewController?) -> Void)?
+    var dismissErrorCompletion: (() -> Void)?
 
     func presentViewModel(viewModel: CardPresentPaymentsModalViewModel) {
         // no-op
@@ -33,10 +33,10 @@ final class MockOrderDetailsPaymentAlerts: OrderDetailsPaymentAlertsProtocol {
         // no-op
     }
 
-    func error(error: Error, tryAgain: @escaping () -> Void, dismissError: @escaping (UIViewController?) -> Void) {
+    func error(error: Error, tryAgain: @escaping () -> Void, dismissCompletion: @escaping () -> Void) {
         self.error = error
         retryFromError = tryAgain
-        self.dismissError = dismissError
+        dismissErrorCompletion = dismissCompletion
     }
 
     func nonRetryableError(from: UIViewController?, error: Error) {

WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CardPresentModalErrorTests.swift

@@ -11,7 +11,7 @@ final class CardPresentModalErrorTests: XCTestCase {
         viewModel = CardPresentModalError(errorDescription: Expectations.error.localizedDescription,
                                           transactionType: .collectPayment,
                                           primaryAction: closures.primaryAction(),
-                                          secondaryAction: closures.secondaryAction())
+                                          dismissCompletion: closures.dismissCompletion())
     }
 
     override func tearDown() {
@@ -66,17 +66,17 @@ private extension CardPresentModalErrorTests {
 
 private final class Closures {
     var didTapPrimary = false
-    var didTapSecondary = false
+    var didDismiss = false
 
     func primaryAction() -> () -> Void {
         return {[weak self] in
             self?.didTapPrimary = true
         }
     }
 
-    func secondaryAction() -> (UIViewController?) -> Void {
-        return { [weak self] _ in
-            self?.didTapSecondary = true
+    func dismissCompletion() -> () -> Void {
+        return { [weak self] in
+            self?.didDismiss = true
         }
     }
 }

WooCommerce/WooCommerceTests/ViewModels/CardPresentPayments/CollectOrderPaymentUseCaseTests.swift

@@ -114,7 +114,7 @@ final class CollectOrderPaymentUseCaseTests: XCTestCase {
                 promise(())
             })
             // Dismisses error to complete the payment flow for `onCollect` to be triggered.
-            self?.alerts.dismissError?(UIViewController())
+            self?.alerts.dismissErrorCompletion?()
         }
 
         // Then