@matchain/matchid-sdk-react 0.1.39 → 0.1.40-alpha.0

package/dist/hooks/index.mjs

@@ -4,7 +4,7 @@ import {
   useMatchEvents,
   useUserInfo,
   useWallet
-} from "../chunk-RVAWFV2B.mjs";
+} from "../chunk-XMGJLSI2.mjs";
 import "../chunk-6PWH7WZI.mjs";
 import "../chunk-J5LGTIGS.mjs";
 export {

package/dist/index.js

@@ -3874,6 +3874,9 @@ function CEXBindModal({
   const [key, setKey] = (0, import_react22.useState)("");
   const [secret, setSecret] = (0, import_react22.useState)("");
   const [error, setError] = (0, import_react22.useState)("");
+  const needPassphrase = (0, import_react22.useMemo)(() => {
+    return ["bitget", "okx"].includes(type.toLowerCase());
+  }, [type]);
   (0, import_react22.useEffect)(() => {
     if (isOpen) {
       setSecret("");
@@ -3890,7 +3893,7 @@ function CEXBindModal({
         cex: type,
         api_key: key,
         api_secret: secret,
-        ...type ? { api_passphrase: APIPassphrase } : {}
+        ...needPassphrase ? { api_passphrase: APIPassphrase } : {}
       });
       if (isSuccess(res)) {
         await refreshOverview();
@@ -3942,7 +3945,7 @@ function CEXBindModal({
         placeholder: "**** **** ****"
       }
     ) }),
-    type == "OKX" && /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(Field, { error, label: intl.formatMessage({
+    needPassphrase && /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(Field, { error, label: intl.formatMessage({
       id: "CEXBindApiPassphrase"
     }), children: /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
       Input,
@@ -4051,6 +4054,13 @@ function useWalletInit({
   const [walletInited, setWalletInited] = (0, import_react23.useState)(false);
   const { appid, token, overview } = useLocalStore_default();
   const { initWallet, generateWallet } = useWallet();
+  const [iframeLoaded, setIframeLoaded] = (0, import_react23.useState)(false);
+  (0, import_react23.useEffect)(() => {
+    console.log("wallet status", {
+      iframeLoaded,
+      walletInited
+    });
+  }, [iframeLoaded, walletInited]);
   (0, import_react23.useEffect)(() => {
     if (endpoints.auth) {
       if (!window.matchWalletMessageIdMap) {
@@ -4067,6 +4077,10 @@ function useWalletInit({
         iframe.onerror = (e) => {
           console.error("iframe error", e);
         };
+        iframe.addEventListener("load", () => {
+          console.log("Iframe has loaded.");
+          setIframeLoaded(true);
+        });
         document.body.insertBefore(iframe, document.body.firstChild);
         window.sendMatchWalletMessage = (method, data) => {
           const messageId = Date.now().toString() + Math.random().toString().slice(6);
@@ -4076,32 +4090,36 @@ function useWalletInit({
             messageId,
             source: "matchid"
           };
+          if (!iframeLoaded) {
+            throw new Error("Wallet not ready");
+          }
+          if (!walletInited) {
+            throw new Error("Wallet not inited");
+          }
           if (document.getElementById("match-wallet")) {
             matchlog_default.log("matchid.sdk.sendMatchWalletMessage", message, endpoints.auth);
             getWalletIframe()?.contentWindow?.postMessage(message, endpoints.auth);
             return messageId;
           }
-          console.error("not found iframe");
-          return false;
+          throw new Error("Wallet not found");
         };
         window.waitMatchUntilWalletMessage = async (method, data, timeout = 3e4) => {
           return new Promise((resolve, reject) => {
-            const messageId = window.sendMatchWalletMessage(method, data);
-            if (!messageId) {
-              console.error("Can't find wallet message");
-              reject(new Error("Can't find wallet message"));
-              return;
+            try {
+              const messageId = window.sendMatchWalletMessage(method, data);
+              window.matchWalletMessageIdMap[messageId] = { resolve, reject };
+              window.matchWalletMessageIdMap[messageId].timeout = setTimeout(() => {
+                console.error("Get wallet result timeout", {
+                  messageId,
+                  method,
+                  data
+                });
+                delete window.matchWalletMessageIdMap[messageId];
+                reject(new Error("Get wallet result timeout"));
+              }, timeout);
+            } catch (error) {
+              reject(error);
             }
-            window.matchWalletMessageIdMap[messageId] = { resolve, reject };
-            window.matchWalletMessageIdMap[messageId].timeout = setTimeout(() => {
-              console.error("Get wallet result timeout", {
-                messageId,
-                method,
-                data
-              });
-              delete window.matchWalletMessageIdMap[messageId];
-              reject(new Error("Get wallet result timeout"));
-            }, timeout);
           });
         };
       } else {