Merge pull request #8351 from woocommerce/issue/8289-show-processing-directly-after-collect-payment

[Mobile Payments] Show Processing alert directly after collect payment completes

Author: joshheald

Hardware/Hardware/CardReader/CardReaderEvent.swift

@@ -18,6 +18,9 @@ public enum CardReaderEvent: Equatable {
     /// A card was removed after client-side payment capture.
     case cardRemovedAfterClientSidePaymentCapture
 
+    /// Card details were collected, and can be used to process a payment.
+    case cardDetailsCollected
+
     /// Low battery warning.
     case lowBattery
 

Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift

@@ -228,6 +228,11 @@ extension StripeCardReaderService: CardReaderService {
                 return promise(.success(()))
             }
 
+            // When this is used for a new payment, there is a new subscription to readerEvents, which won't rely the
+            // old `.removeCard` message. If there is a card inserted, we manually send a display message prompting to
+            // remove the card, and wait for that before continuing.
+            self.sendReaderEvent(CardReaderEvent.make(displayMessage: .removeCard))
+
             self.timerCancellable = Timer.publish(every: 1, tolerance: 0.1, on: .main, in: .default)
                 .autoconnect()
                 .receive(on: DispatchQueue.main)
@@ -260,12 +265,6 @@ extension StripeCardReaderService: CardReaderService {
         // steps produce a Future.
 
         // If a card was left from a previous payment attempt, we want that removed before we initiate a new payment.
-        // However, a new payment probably means a new subscription to readerEvents, which won't rely the old `.removeCard`
-        // message. If there is a card inserted, we manually send a display message prompting to remove the card,
-        // and wait for that before continuing.
-        if isChipCardInserted {
-            sendReaderEvent(CardReaderEvent.make(displayMessage: .removeCard))
-        }
         return waitForInsertedCardToBeRemoved()
             .flatMap {
                 self.createPaymentIntent(parameters)
@@ -524,6 +523,7 @@ private extension StripeCardReaderService {
                 }
 
                 if let intent = intent {
+                    self?.sendReaderEvent(.cardDetailsCollected)
                     promise(.success(intent))
                 }
             }

RELEASE-NOTES.txt

@@ -3,6 +3,7 @@
 11.6
 -----
 - [***] We added a new Analytics Hub inside the My Store area of the app. Simply click on the See More button under the store stats to check more detailed information on Revenue, Orders and Products. [https://github.com/woocommerce/woocommerce-ios/pull/8356]
+- [*] In-Person Payments: fixed timing issues in payments flow, which caused "Remove card" to be shown for too long [https://github.com/woocommerce/woocommerce-ios/pull/8351]
 
 11.5
 -----

WooCommerce/Classes/ViewModels/CardPresentPayments/CardPresentRefundOrchestrator.swift

@@ -44,6 +44,8 @@ final class CardPresentRefundOrchestrator {
                 onWaitingForInput(inputMethods)
             case .displayMessage(let message):
                 onDisplayMessage(message)
+            case .cardDetailsCollected:
+                onProcessingMessage()
             default:
                 break
             }

WooCommerce/Classes/ViewModels/CardPresentPayments/LegacyPaymentCaptureOrchestrator.swift

@@ -65,7 +65,7 @@ final class LegacyPaymentCaptureOrchestrator {
                     onWaitingForInput(inputMethods)
                 case .displayMessage(let message):
                     onDisplayMessage(message)
-                case .cardRemovedAfterClientSidePaymentCapture:
+                case .cardDetailsCollected, .cardRemovedAfterClientSidePaymentCapture:
                     onProcessingMessage()
                 default:
                     break

WooCommerce/Classes/ViewModels/CardPresentPayments/PaymentCaptureOrchestrator.swift

@@ -77,7 +77,7 @@ final class PaymentCaptureOrchestrator {
                     onWaitingForInput(inputMethods)
                 case .displayMessage(let message):
                     onDisplayMessage(message)
-                case .cardRemovedAfterClientSidePaymentCapture:
+                case .cardDetailsCollected, .cardRemovedAfterClientSidePaymentCapture:
                     onProcessingMessage()
                 default:
                     break