From 9b610e86f89311c01f187a899f8e446fae8c9e5a Mon Sep 17 00:00:00 2001
From: Jonathan Yeboah <10155597+JonYeb@users.noreply.github.com>
Date: Thu, 30 Nov 2023 13:02:57 +0100
Subject: [PATCH 1/2] #35186 fix setting merchant id

---
 src/app/useSettings.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/useSettings.tsx b/src/app/useSettings.tsx
index 930ec87..063aef8 100644
--- a/src/app/useSettings.tsx
+++ b/src/app/useSettings.tsx
@@ -112,8 +112,6 @@ export const SettingsProvider: FC<
   useEffect(() => {
     if (!settings) {
       value.handleGetSettings();
-    } else if (settings?.merchantId) {
-      options.merchantId = settings.merchantId;
     }
   }, [settings]);
 
@@ -126,6 +124,7 @@ export const SettingsProvider: FC<
             intent: settings.payPalIntent.toString().toLowerCase(),
             dataUserIdToken: userIdToken,
             dataPartnerAttributionId: PARTNER_ATTRIBUTION_ID,
+            merchantId: settings.merchantId,
           }}
         >
           {children}

From ecebe01daa6710cbdd6194fa14b8ae39d6c1a517 Mon Sep 17 00:00:00 2001
From: Jonathan Yeboah <10155597+JonYeb@users.noreply.github.com>
Date: Thu, 30 Nov 2023 14:19:45 +0100
Subject: [PATCH 2/2] increment version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 69bd20e..fd40a24 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "paypal-commercetools-client",
-  "version": "0.0.67",
+  "version": "0.0.68",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "paypal-commercetools-client",
-      "version": "0.0.67",
+      "version": "0.0.68",
       "license": "MIT",
       "dependencies": {
         "@heroicons/react": "^1.0.6",
diff --git a/package.json b/package.json
index 0835ada..d30ddae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paypal-commercetools-client",
-  "version": "0.0.67",
+  "version": "0.0.68",
   "private": false,
   "type": "module",
   "license": "MIT",