8079 Show spinner while preparing reader for payment

Author: joshheald

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

@@ -150,6 +150,7 @@ final class CollectOrderPaymentUseCase: NSObject, CollectOrderPaymentProtocol {
                     // Inform about the collect payment state
                     switch result {
                     case .failure(CollectOrderPaymentUseCaseError.flowCanceledByUser):
+                        self.rootViewController.presentedViewController?.dismiss(animated: true)
                         return onCancel()
                     default:
                         onCollect(result.map { _ in () }) // Transforms Result<CardPresentCapturedPaymentData, Error> to Result<Void, Error>
@@ -271,13 +272,11 @@ private extension CollectOrderPaymentUseCase {
             return
         }
 
-        // Show reader ready alert
-        alerts.readerIsReady(title: Localization.collectPaymentTitle(username: order.billingAddress?.firstName),
-                             amount: formattedAmount,
-                             onCancel: { [weak self] in
-            self?.cancelPayment {
+        // Show preparing reader alert
+        alerts.preparingReader(onCancel: { [weak self] in
+            self?.cancelPayment(onCompleted: {
                 onCompletion(.failure(CollectOrderPaymentUseCaseError.flowCanceledByUser))
-            }
+            })
         })
 
         // Start collect payment process
@@ -288,12 +287,14 @@ private extension CollectOrderPaymentUseCase {
             paymentMethodTypes: configuration.paymentMethods.map(\.rawValue),
             stripeSmallestCurrencyUnitMultiplier: configuration.stripeSmallestCurrencyUnitMultiplier,
             onWaitingForInput: { [weak self] in
-                   // Request card input
-                   self?.alerts.tapOrInsertCard(onCancel: { [weak self] in
-                       self?.cancelPayment {
-                           onCompletion(.failure(CollectOrderPaymentUseCaseError.flowCanceledByUser))
-                       }
-                   })
+                guard let self = self else { return }
+                self.alerts.readerIsReady(title: Localization.collectPaymentTitle(username: self.order.billingAddress?.firstName),
+                                     amount: self.formattedAmount,
+                                     onCancel: { [weak self] in
+                    self?.cancelPayment {
+                        onCompletion(.failure(CollectOrderPaymentUseCaseError.flowCanceledByUser))
+                    }
+                })
 
             }, onProcessingMessage: { [weak self] in
                 // Waiting message

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

@@ -295,9 +295,7 @@ private extension RefundSubmissionUseCase {
                                   paymentGatewayAccount: PaymentGatewayAccount,
                                   onCompletion: @escaping (Result<Void, Error>) -> ()) {
         // Shows reader ready alert.
-        alerts.readerIsReady(title: Localization.refundPaymentTitle(username: order.billingAddress?.firstName),
-                             amount: formattedAmount,
-                             onCancel: { [weak self] in
+        alerts.preparingReader(onCancel: { [weak self] in
             self?.cancelRefund(charge: charge, paymentGatewayAccount: paymentGatewayAccount, onCompletion: onCompletion)
         })
 
@@ -307,7 +305,10 @@ private extension RefundSubmissionUseCase {
                                              paymentGatewayAccount: paymentGatewayAccount,
                                              onWaitingForInput: { [weak self] in
             // Requests card input.
-            self?.alerts.tapOrInsertCard(onCancel: { [weak self] in
+            guard let self = self else { return }
+            self.alerts.readerIsReady(title: Localization.refundPaymentTitle(username: self.order.billingAddress?.firstName),
+                                      amount: self.formattedAmount,
+                                      onCancel: { [weak self] in
                 self?.cancelRefund(charge: charge, paymentGatewayAccount: paymentGatewayAccount, onCompletion: onCompletion)
             })
         }, onProcessingMessage: { [weak self] in