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

Feature/35186 merchantid
mediaopt · Nov 29, 2023 · dae4036 · dae4036
2 parents 95c19e6 + 4e08cf2
commit dae4036
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 15 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.66",
+  "version": "0.0.67",
   "private": false,
   "type": "module",
   "license": "MIT",

diff --git a/src/app/useSettings.tsx b/src/app/useSettings.tsx
@@ -17,6 +17,7 @@ import {
 import { getSettings, getUserInfo, removePaymentToken } from "../services";
 import { useLoader } from "./useLoader";
 import { PARTNER_ATTRIBUTION_ID } from "../constants";
+import { useNotifications } from "./useNotifications";
 
 type SettingsContextT = {
   handleGetSettings: () => void;
@@ -46,6 +47,7 @@ export const SettingsProvider: FC<
   const [userIdToken, setUserIdToken] = useState<string>();
   const [paymentTokens, setPaymentTokens] = useState<PaymentTokens>();
   const { isLoading } = useLoader();
+  const { notify } = useNotifications();
 
   const value = useMemo(() => {
     const handleGetSettings = async () => {
@@ -65,9 +67,17 @@ export const SettingsProvider: FC<
         const getSettingsResult = (await getSettings(
           requestHeader,
           getSettingsUrl
-        )) as GetSettingsResponse;
+        )) as Record<any, any>;
 
-        setSettings(getSettingsResult);
+        if (
+          !getSettingsResult ||
+          (getSettingsResult.hasOwnProperty("ok") && !getSettingsResult.ok)
+        ) {
+          notify("Error", "Could not fetch settings");
+          isLoading(false);
+        } else {
+          setSettings(getSettingsResult as GetSettingsResponse);
+        }
       }
       isLoading(false);
     };
@@ -102,6 +112,8 @@ export const SettingsProvider: FC<
   useEffect(() => {
     if (!settings) {
       value.handleGetSettings();
+    } else if (settings?.merchantId) {
+      options.merchantId = settings.merchantId;
     }
   }, [settings]);
 

diff --git a/src/components/RenderTemplate/RenderTemplate.tsx b/src/components/RenderTemplate/RenderTemplate.tsx
@@ -35,14 +35,14 @@ export const RenderTemplate: FC<
 }) => {
   return (
     <LoaderProvider>
-      <SettingsProvider
-        options={options}
-        getSettingsUrl={getSettingsUrl}
-        requestHeader={requestHeader}
-        getUserInfoUrl={getUserInfoUrl}
-        removePaymentTokenUrl={removePaymentTokenUrl}
-      >
-        <NotificationsProvider>
+      <NotificationsProvider>
+        <SettingsProvider
+          options={options}
+          getSettingsUrl={getSettingsUrl}
+          requestHeader={requestHeader}
+          getUserInfoUrl={getUserInfoUrl}
+          removePaymentTokenUrl={removePaymentTokenUrl}
+        >
           <PaymentProvider
             options={options}
             createPaymentUrl={createPaymentUrl}
@@ -61,8 +61,8 @@ export const RenderTemplate: FC<
           >
             <RenderPurchase>{children}</RenderPurchase>
           </PaymentProvider>
-        </NotificationsProvider>
-      </SettingsProvider>
+        </SettingsProvider>
+      </NotificationsProvider>
     </LoaderProvider>
   );
 };
diff --git a/src/types/index.ts b/src/types/index.ts
@@ -322,6 +322,7 @@ type CustomDataStringObject = { [key: string]: string };
 type PayPalButtonColors = "gold" | "blue" | "white" | "silver" | "black";
 
 export type GetSettingsResponse = {
+  merchantId: string;
   email: string;
   acceptPayPal: boolean;
   acceptPayLater: boolean;