Merge pull request #6393 from woocommerce/try/debug-remove-card-bug

[Mobile Payments] Ensure card has been removed before attempting a payment

Author: ctarda

Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift

@@ -211,14 +211,27 @@ extension StripeCardReaderService: CardReaderService {
         // a single value or it will fail.
         // This isn't enforced by the type system, but it is guaranteed as long as all the
         // steps produce a Future.
-        return createPaymentIntent(parameters)
-            .flatMap { intent in
+
+        // 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)
+            }.flatMap { intent in
                 self.collectPaymentMethod(intent: intent)
             }.flatMap { intent in
                 self.processPayment(intent: intent)
             }.flatMap { intent in
-                self.waitForInsertedCardToBeRemoved(intent: intent)
-            }.eraseToAnyPublisher()
+                self.waitForInsertedCardToBeRemoved()
+                    .map { intent }
+            }
+            .map(PaymentIntent.init(intent:))
+            .eraseToAnyPublisher()
     }
 
     public func cancelPaymentIntent() -> Future<Void, Error> {
@@ -406,15 +419,15 @@ private extension StripeCardReaderService {
         }
     }
 
-    func waitForInsertedCardToBeRemoved(intent: PaymentIntent) -> Future<PaymentIntent, Error> {
+    func waitForInsertedCardToBeRemoved() -> Future<Void, Error> {
         return Future() { [weak self] promise in
             guard let self = self else {
                 return
             }
 
             // If there is no chip card inserted, it is ok to immediatedly return. The payment method may have been swipe or tap.
             if !self.isChipCardInserted {
-                return promise(.success(intent))
+                return promise(.success(()))
             }
 
             self.timerCancellable = Timer.publish(every: 1, tolerance: 0.1, on: .main, in: .default)
@@ -423,13 +436,13 @@ private extension StripeCardReaderService {
                 .sink(receiveValue: { _ in
                     if !self.isChipCardInserted {
                         self.timerCancellable?.cancel()
-                        return promise(.success(intent))
+                        return promise(.success(()))
                     }
                 })
         }
     }
 
-    func processPayment(intent: StripeTerminal.PaymentIntent) -> Future<PaymentIntent, Error> {
+    func processPayment(intent: StripeTerminal.PaymentIntent) -> Future<StripeTerminal.PaymentIntent, Error> {
         return Future() { [weak self] promise in
             Terminal.shared.processPayment(intent) { (intent, error) in
                 if let error = error {
@@ -438,7 +451,7 @@ private extension StripeCardReaderService {
                 }
 
                 if let intent = intent {
-                    promise(.success(PaymentIntent(intent: intent)))
+                    promise(.success(intent))
                     self?.activePaymentIntent = nil
                 }
             }

RELEASE-NOTES.txt

@@ -18,6 +18,7 @@
 - [*] Reviews: Fixed missing product information on first load [https://github.com/woocommerce/woocommerce-ios/pull/6367]
 - [internal] Removed the feature flag for My store tab UI updates. Please smoke test the store stats and top performers in the "My store" tab to make sure everything works as before. [https://github.com/woocommerce/woocommerce-ios/pull/6334]
 - [*] In-Person Payments: Add support for accepting payments on bookable products [https://github.com/woocommerce/woocommerce-ios/pull/6364]
+- [*] In-Person Payments: Fixed issue where payment could be stuck prompting to remove the card if the payment was declined and retried before removing the card.
 
 8.6
 -----