Merge pull request #5305 from woocommerce/issue/4860-pga-in-pco

[Mobile Payments] Do not pass the entire account, just pass the statement descriptor

Author: allendav

WooCommerce/Classes/ViewModels/CardPresentPayments/PaymentCaptureOrchestrator.swift

@@ -15,7 +15,7 @@ final class PaymentCaptureOrchestrator {
     private var walletSuppressionRequestToken: PKSuppressionRequestToken?
 
     func collectPayment(for order: Order,
-                        paymentsAccount: PaymentGatewayAccount?,
+                        statementDescriptor: String?,
                         onPresentMessage: @escaping (String) -> Void,
                         onClearMessage: @escaping () -> Void,
                         onProcessingMessage: @escaping () -> Void,
@@ -39,7 +39,11 @@ final class PaymentCaptureOrchestrator {
                 DDLogWarn("Warning: failed to fetch customer ID for an order")
             }
 
-            guard let parameters = paymentParameters(order: order, account: paymentsAccount, customerID: customerID) else {
+            guard let parameters = paymentParameters(
+                    order: order,
+                    statementDescriptor: statementDescriptor,
+                    customerID: customerID
+            ) else {
                 DDLogError("Error: failed to create payment parameters for an order")
                 onCompletion(.failure(CardReaderServiceError.paymentCapture()))
                 return
@@ -212,7 +216,7 @@ private extension PaymentCaptureOrchestrator {
         ServiceLocator.stores.dispatch(action)
     }
 
-    func paymentParameters(order: Order, account: PaymentGatewayAccount?, customerID: String?) -> PaymentParameters? {
+    func paymentParameters(order: Order, statementDescriptor: String?, customerID: String?) -> PaymentParameters? {
         guard let orderTotal = currencyFormatter.convertToDecimal(from: order.total) else {
             DDLogError("Error: attempted to collect payment for an order without a valid total.")
             return nil
@@ -244,7 +248,7 @@ private extension PaymentCaptureOrchestrator {
         return PaymentParameters(amount: orderTotal as Decimal,
                                  currency: order.currency,
                                  receiptDescription: receiptDescription(orderNumber: order.number),
-                                 statementDescription: account?.statementDescriptor,
+                                 statementDescription: statementDescriptor,
                                  receiptEmail: order.billingAddress?.email,
                                  metadata: metadata,
                                  customerID: customerID)

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

@@ -549,8 +549,10 @@ extension OrderDetailsViewModel {
             DDLogWarn("Expected one card present gateway account. Got something else.")
         }
 
+        let statementDescriptor = cardPresentPaymentGatewayAccounts.first?.statementDescriptor
+
         paymentOrchestrator.collectPayment(for: self.order,
-                                           paymentsAccount: self.cardPresentPaymentGatewayAccounts.first,
+                                           statementDescriptor: statementDescriptor,
                                            onPresentMessage: onPresentMessage,
                                            onClearMessage: onClearMessage,
                                            onProcessingMessage: onProcessingMessage,