From 1aaa2ad0472fe308576721068b49c5f3469c1f59 Mon Sep 17 00:00:00 2001
From: "Georgi Malkhasyan (CW)" <gmalkhasyan@paypal.com>
Date: Wed, 4 Dec 2024 13:48:17 -0800
Subject: [PATCH] refactoring

---
 .../PayPalWebViewModel/PayPalPaymentState.swift               | 1 -
 .../PayPalWebViewModel/PayPalWebViewModel.swift               | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalPaymentState.swift b/Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalPaymentState.swift
index 428f502a..6174c845 100644
--- a/Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalPaymentState.swift
+++ b/Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalPaymentState.swift
@@ -25,7 +25,6 @@ struct PayPalPaymentState: Equatable {
     var approveResultResponse: LoadingState<ApprovalResult> = .idle {
         didSet {
             if case .loaded(let value) = approveResultResponse {
-
                 approveResult = value
             }
         }
diff --git a/Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalWebViewModel.swift b/Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalWebViewModel.swift
index 64ca48ef..34f79e9a 100644
--- a/Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalWebViewModel.swift
+++ b/Demo/Demo/PayPalWebPayments/PayPalWebViewModel/PayPalWebViewModel.swift
@@ -167,8 +167,8 @@ class PayPalWebViewModel: ObservableObject {
             DispatchQueue.main.async {
                 self.state.authorizedOrderResponse = .loading
             }
-            let payPalClientMetadataID = payPalDataCollector?.collectDeviceData()
-            if let orderID {
+            if let orderID = state.createOrder?.id, !orderID.isEmpty {
+                let payPalClientMetadataID = payPalDataCollector?.collectDeviceData()
                 let order = try await DemoMerchantAPI.sharedService.completeOrder(
                     intent: intent,
                     orderID: orderID,