zh-web-sdk 2.11.0 → 2.11.2

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import { MiniKit } from "@worldcoin/minikit-js";
 declare global {
     interface Window {
         zerohash: any;
@@ -6,6 +7,7 @@ declare global {
          * inside the World App environment.
          */
         WorldApp: unknown;
+        MiniKit: typeof MiniKit;
     }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zh-web-sdk",
-  "version": "2.11.0",
+  "version": "2.11.2",
   "private": false,
   "description": "ZeroHash Web SDK",
   "homepage": "https://github.com/seedcx/zh-web-sdk",

package/src/iframe-container/AppContainer.tsx

@@ -22,7 +22,6 @@ import {
 import { useWindowSize } from "../hooks/use-window-size";
 import { isInsideWorldApp } from "../utils/world-app-utils";
 import {
-  MiniKit,
   PayCommandInput,
   Tokens,
   tokenToDecimals,
@@ -186,11 +185,11 @@ const AppContainer = ({
         iRef.current?.contentWindow?.postMessage(
           {
             type: `${appIdentifierToActionPrefixMap.get(
-              key as AppIdentifier
+              key as AppIdentifier,
             )}SEND_JWT_TOKEN`,
             jwt: allAppsState[key as AppIdentifier].jwt,
           },
-          zeroHashAppURL
+          zeroHashAppURL,
         );
 
         // If the zh-web-sdk is being run inside the WorldApp, we must send the WorldApp object
@@ -198,7 +197,7 @@ const AppContainer = ({
         if (isInsideWorldApp()) {
           iRef.current?.contentWindow?.postMessage(
             { type: `WORLD_APP_OBJECT`, WorldApp: window.WorldApp },
-            zeroHashAppURL
+            zeroHashAppURL,
           );
         }
 
@@ -207,11 +206,11 @@ const AppContainer = ({
           iRef.current?.contentWindow?.postMessage(
             {
               type: `${appIdentifierToActionPrefixMap.get(
-                key as AppIdentifier
+                key as AppIdentifier,
               )}SEND_FILTERS`,
               filters: allAppsState[key as AppIdentifier].filters,
             },
-            zeroHashAppURL
+            zeroHashAppURL,
           );
         }
         // Send navigate to Onboarding App
@@ -219,11 +218,11 @@ const AppContainer = ({
           iRef.current?.contentWindow?.postMessage(
             {
               type: `${appIdentifierToActionPrefixMap.get(
-                AppIdentifier.ONBOARDING
+                AppIdentifier.ONBOARDING,
               )}NAVIGATE`,
               navigate,
             },
-            zeroHashAppURL
+            zeroHashAppURL,
           );
         }
       });
@@ -258,24 +257,33 @@ const AppContainer = ({
 
   const worldAppEventHandler = useCallback(
     async (event: MessageEvent) => {
-      // Does nothing if not running inside the World App
-      if (!isInsideWorldApp()) {
-        return;
-      }
-
       const zhAppsURL = new URL(zeroHashAppURL);
-      if (event.origin !== zhAppsURL.origin) {
-        console.warn("Received message from unknown origin:", event.origin);
+      iRef.current?.contentWindow?.postMessage(
+        {
+          type: "MINIKIT_PAY_COMMAND_RECEIVED",
+          payload: {
+            origin: event.origin,
+            zhAppsURLOrigin: zhAppsURL.origin,
+            data: event.data,
+          },
+        },
+        zeroHashAppURL,
+      );
+
+      if (!window.MiniKit) {
+        iRef.current?.contentWindow?.postMessage(
+          {
+            type: "MINIKIT_PAY_COMMAND_CANCELED",
+            payload: { reason: "window.Minikit not found" },
+          },
+          zeroHashAppURL,
+        );
         return;
       }
 
-      if (!MiniKit.isInstalled()) {
-        const result = MiniKit.install();
-        console.log("MiniKit not installed, installing now", { result });
-      }
-      if (event.data?.type === "MINIKIT_PAY_COMMAND") {
-        const payload = event.data.payload;
-        try {
+      try {
+        if (event.data?.type === "MINIKIT_PAY_COMMAND") {
+          const payload = event.data.payload;
           const minikitPayload: PayCommandInput = {
             reference: payload.reference,
             to: payload.to,
@@ -284,31 +292,38 @@ const AppContainer = ({
                 symbol: payload.token as Tokens,
                 token_amount: tokenToDecimals(
                   Number(payload.amount),
-                  payload.token
+                  payload.token,
                 ).toString(),
               },
             ],
             description: payload.description,
           };
+          iRef.current?.contentWindow?.postMessage(
+            {
+              type: "MINIKIT_PAY_COMMAND_SUBMITTING_PAYMENT",
+              payload: { minikitPayload },
+            },
+            zeroHashAppURL,
+          );
           const { finalPayload } =
-            await MiniKit.commandsAsync.pay(minikitPayload);
+            await window.MiniKit.commandsAsync.pay(minikitPayload);
 
           iRef.current?.contentWindow?.postMessage(
             { type: "MINIKIT_PAY_COMMAND_RESULT", payload: { finalPayload } },
-            zeroHashAppURL
-          );
-        } catch (error) {
-          iRef.current?.contentWindow?.postMessage(
-            {
-              type: "MINIKIT_PAY_COMMAND_RESULT",
-              result: { error: String(error), status: "error" },
-            },
-            zeroHashAppURL
+            zeroHashAppURL,
           );
         }
+      } catch (error) {
+        iRef.current?.contentWindow?.postMessage(
+          {
+            type: "MINIKIT_PAY_COMMAND_ERROR",
+            payload: { error, status: "error" },
+          },
+          zeroHashAppURL,
+        );
       }
     },
-    [zeroHashAppURL]
+    [zeroHashAppURL],
   );
 
   useEffect(() => {
@@ -357,7 +372,7 @@ const AppContainer = ({
 
 const mapStateToProps = (
   state: AppContainerMappedProps,
-  ownProps: AppContainerProps
+  ownProps: AppContainerProps,
 ) => {
   return {
     isAppActive: state[ownProps.appIdentifier].isAppActive,

package/src/types.ts

@@ -1,3 +1,5 @@
+import {MiniKit} from "@worldcoin/minikit-js";
+
 declare global {
   interface Window {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -6,7 +8,8 @@ declare global {
      * WorldApp is a global object that is set if the zh-web-sdk is running
      * inside the World App environment.
      */
-    WorldApp: unknown
+    WorldApp: unknown,
+    MiniKit: typeof MiniKit,
   }
 }