Wait for the print action to finish before dismissing the card payment flow.

Author: toupper

WooCommerce/Classes/ViewModels/CardPresentPayments/ReceiptActionCoordinator.swift

@@ -7,21 +7,27 @@ struct ReceiptActionCoordinator {
                              countryCode: String,
                              cardReaderModel: String?,
                              stores: StoresManager,
-                             analytics: Analytics) {
+                             analytics: Analytics) async {
         analytics.track(event: .InPersonPayments.receiptPrintTapped(countryCode: countryCode, cardReaderModel: cardReaderModel))
 
-        let action = ReceiptAction.print(order: order, parameters: params) { (result) in
-            switch result {
-            case .success:
-                analytics.track(event: .InPersonPayments.receiptPrintSuccess(countryCode: countryCode, cardReaderModel: cardReaderModel))
-            case .cancel:
-                analytics.track(event: .InPersonPayments.receiptPrintCanceled(countryCode: countryCode, cardReaderModel: cardReaderModel))
-            case .failure(let error):
-                analytics.track(event: .InPersonPayments.receiptPrintFailed(error: error, countryCode: countryCode, cardReaderModel: cardReaderModel))
-                DDLogError("⛔️ Failed to print receipt: \(error.localizedDescription)")
+         await withCheckedContinuation { continuation in
+            let action = ReceiptAction.print(order: order, parameters: params) { (result) in
+                switch result {
+                case .success:
+                    analytics.track(event: .InPersonPayments.receiptPrintSuccess(countryCode: countryCode, cardReaderModel: cardReaderModel))
+                case .cancel:
+                    analytics.track(event: .InPersonPayments.receiptPrintCanceled(countryCode: countryCode, cardReaderModel: cardReaderModel))
+                case .failure(let error):
+                    analytics.track(event: .InPersonPayments.receiptPrintFailed(error: error, countryCode: countryCode, cardReaderModel: cardReaderModel))
+                    DDLogError("⛔️ Failed to print receipt: \(error.localizedDescription)")
+                }
+
+                continuation.resume()
             }
-        }
 
-        stores.dispatch(action)
+             Task { @MainActor in
+                 stores.dispatch(action)
+             }
+        }
     }
 }

WooCommerce/Classes/ViewModels/CardPresentPayments/ReceiptViewModel.swift

@@ -48,12 +48,14 @@ final class ReceiptViewModel {
 
     /// Prints the receipt
     func printReceipt() {
-        ReceiptActionCoordinator.printReceipt(for: order,
-                                              params: receipt,
-                                              countryCode: countryCode,
-                                              cardReaderModel: nil,
-                                              stores: stores,
-                                              analytics: ServiceLocator.analytics)
+        Task { @MainActor in
+            await ReceiptActionCoordinator.printReceipt(for: order,
+                                                  params: receipt,
+                                                  countryCode: countryCode,
+                                                  cardReaderModel: nil,
+                                                  stores: stores,
+                                                  analytics: ServiceLocator.analytics)
+        }
     }
 
     /// Returns a boolean that indicates whether email is supported for the app and device so that email UI is only displayed when it is supported.

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

@@ -440,17 +440,18 @@ private extension CollectOrderPaymentUseCase {
         alertsPresenter.present(viewModel: paymentAlerts.success(printReceipt: { [order, configuration, weak self] in
             guard let self = self else { return }
 
-            // Inform about flow completion.
-            onCompleted()
-
             // Delegate print action
-            ReceiptActionCoordinator.printReceipt(for: order,
-                                                  params: receiptParameters,
-                                                  countryCode: configuration.countryCode,
-                                                  cardReaderModel: self.connectedReader?.readerType.model,
-                                                  stores: self.stores,
-                                                  analytics: self.analytics)
-
+            Task { @MainActor in
+                await ReceiptActionCoordinator.printReceipt(for: order,
+                                                      params: receiptParameters,
+                                                      countryCode: configuration.countryCode,
+                                                      cardReaderModel: self.connectedReader?.readerType.model,
+                                                      stores: self.stores,
+                                                      analytics: self.analytics)
+
+                // Inform about flow completion.
+                onCompleted()
+            }
         }, emailReceipt: { [order, analytics, paymentOrchestrator, configuration, weak self] in
             guard let self = self else { return }
 

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

@@ -399,17 +399,17 @@ private extension LegacyCollectOrderPaymentUseCase {
         alerts.success(printReceipt: { [order, configuration, weak self] in
             guard let self = self else { return }
 
-            // Inform about flow completion.
-            onCompleted()
-
             // Delegate print action
-            ReceiptActionCoordinator.printReceipt(for: order,
-                                                  params: receiptParameters,
-                                                  countryCode: configuration.countryCode,
-                                                  cardReaderModel: self.connectedReader?.readerType.model,
-                                                  stores: self.stores,
-                                                  analytics: self.analytics)
-
+            Task { @MainActor in
+                await ReceiptActionCoordinator.printReceipt(for: order,
+                                                      params: receiptParameters,
+                                                      countryCode: configuration.countryCode,
+                                                      cardReaderModel: self.connectedReader?.readerType.model,
+                                                      stores: self.stores,
+                                                      analytics: self.analytics)
+                // Inform about flow completion.
+                onCompleted()
+            }
         }, emailReceipt: { [order, analytics, paymentOrchestrator, configuration, weak self] in
             guard let self = self else { return }