Merge remote-tracking branch 'origin/MC-18194' into 2.3-develop-pr30

Author: serhii-balko

app/code/Magento/Vault/Model/Method/Vault.php

@@ -543,16 +543,22 @@ private function getPaymentExtensionAttributes(OrderPaymentInterface $payment)
      */
     private function attachCreditCardInfo(OrderPaymentInterface $payment): void
     {
-        try {
-            $paymentToken = $payment->getExtensionAttributes()
-                ->getVaultPaymentToken();
-            if ($paymentToken) {
-                $tokenDetails = $this->jsonSerializer->unserialize($paymentToken->getTokenDetails());
-                if ($tokenDetails && is_array($tokenDetails)) {
-                    $payment->addData($tokenDetails);
-                }
-            }
-        } catch (Exception $e) {
+        $paymentToken = $payment->getExtensionAttributes()
+            ->getVaultPaymentToken();
+        if ($paymentToken === null) {
+            return;
+        }
+
+        $tokenDetails = $paymentToken->getTokenDetails();
+        if ($tokenDetails === null) {
+            return;
+        }
+
+        if (is_string($tokenDetails)) {
+            $tokenDetails = $this->jsonSerializer->unserialize($paymentToken->getTokenDetails());
+        }
+        if (is_array($tokenDetails)) {
+            $payment->addData($tokenDetails);
         }
     }