Approved uapm orders are OK (no error), but not yet completed. Completion will be done via webhook.

Author: mariolorenz

src/Model/Order.php

@@ -188,10 +188,7 @@ public function finalizeOrderAfterExternalPayment(string $payPalOrderId, bool $f
             $isPaypalApplePay ||
             $isUAPM
         ) {
-            if (
-                $this->isPayPalOrderCompleted($payPalApiOrder) ||
-                ($isUAPM && $this->isPayPalOrderApproved($payPalApiOrder))
-            ) {
+            if ($this->isPayPalOrderCompleted($payPalApiOrder)) {
                 $this->markOrderPaid();
                 $transactionId = $this->extractTransactionId($payPalApiOrder);
                 $this->setTransId($transactionId);
@@ -202,6 +199,17 @@ public function finalizeOrderAfterExternalPayment(string $payPalOrderId, bool $f
                     PayPalApiOrder::STATUS_COMPLETED,
                     $transactionId
                 );
+            } elseif ($isUAPM && $this->isPayPalOrderApproved($payPalApiOrder)) {
+                $this->markOrderPaymentNotFinished();
+                $transactionId = $this->extractTransactionId($payPalApiOrder);
+                //prepare capture tracking
+                $this->paymentService->trackPayPalOrder(
+                    $this->getId(),
+                    $payPalOrderId,
+                    $paymentsId,
+                    PayPalApiOrder::STATUS_APPROVED,
+                    $transactionId
+                );
             } else {
                 throw PayPalException::cannotFinalizeOrderAfterExternalPayment($payPalOrderId, $paymentsId);
             }