Merge pull request #42 from mediaopt/feature/35186-merchantid

#35186 fix setting merchant id
mediaopt · Nov 30, 2023 · cf49863 · cf49863
2 parents dae4036 + ecebe01
commit cf49863
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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",

diff --git 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}