@matchain/matchid-sdk-react 0.1.48-alpha.26 → 0.1.48-alpha.28

package/dist/hooks/api/index.mjs

@@ -2,11 +2,11 @@ import {
   bind_exports,
   poh_exports,
   user_exports
-} from "../../chunk-PWUDQPH3.mjs";
+} from "../../chunk-UGKYENZK.mjs";
 import {
   isSuccess,
   wallet_exports
-} from "../../chunk-2MJFQXBZ.mjs";
+} from "../../chunk-OSIGDX4D.mjs";
 import "../../chunk-UA6XHZHX.mjs";
 import "../../chunk-FB5MHLWX.mjs";
 import "../../chunk-5JHHHLG4.mjs";

package/dist/hooks/index.js

@@ -2533,15 +2533,41 @@ function useMatchChain() {
 // src/hooks/useMatchWallet.tsx
 var import_react_qrcode = require("react-qrcode");
 var import_react38 = require("react");
-var import_react_query6 = require("@tanstack/react-query");
-var import_viem10 = require("viem");
+var import_react_query7 = require("@tanstack/react-query");
+var import_viem11 = require("viem");
 var import_react_intl21 = require("react-intl");
 
 // src/components/ImportToken/index.tsx
 var import_react37 = require("react");
 var import_react_intl20 = require("react-intl");
-var import_react_query5 = require("@tanstack/react-query");
+var import_react_query6 = require("@tanstack/react-query");
+var import_viem10 = require("viem");
+
+// src/hooks/useIsContract.ts
 var import_viem9 = require("viem");
+var import_react_query5 = require("@tanstack/react-query");
+function useIsContract({
+  address,
+  chain,
+  enabled
+}) {
+  return (0, import_react_query5.useQuery)({
+    queryKey: ["is_contract", chain?.id, address],
+    queryFn: async () => {
+      if (!chain) return false;
+      if (!address) return false;
+      const publicClient = (0, import_viem9.createPublicClient)({
+        chain,
+        transport: (0, import_viem9.http)()
+      });
+      const res = await publicClient.getCode({ address });
+      return res !== null && res !== void 0;
+    },
+    enabled
+  });
+}
+
+// src/components/ImportToken/index.tsx
 var import_jsx_runtime93 = require("react/jsx-runtime");
 function ImportToken({ close }) {
   const [status, setStatus] = (0, import_react37.useState)("");
@@ -2550,19 +2576,19 @@ function ImportToken({ close }) {
   const [symbol, setSymbol] = (0, import_react37.useState)("");
   const [decimals, setDecimals] = (0, import_react37.useState)("");
   const [error, setError] = (0, import_react37.useState)({});
-  const { publicClient, chainId } = useMatchChain();
+  const { publicClient, chainId, chain } = useMatchChain();
   const getContractInfo = async () => {
     if (!publicClient) return;
     const calls = [
       {
         address,
-        abi: import_viem9.erc20Abi,
+        abi: import_viem10.erc20Abi,
         functionName: "symbol",
         args: []
       },
       {
         address,
-        abi: import_viem9.erc20Abi,
+        abi: import_viem10.erc20Abi,
         functionName: "decimals",
         args: []
       }
@@ -2604,7 +2630,7 @@ function ImportToken({ close }) {
   }, [address, publicClient]);
   const [loading, setLoading] = (0, import_react37.useState)(false);
   const toast = useToast();
-  const queryClient2 = (0, import_react_query5.useQueryClient)();
+  const queryClient2 = (0, import_react_query6.useQueryClient)();
   const onImport = async () => {
     setLoading(true);
     try {
@@ -2646,7 +2672,12 @@ function ImportToken({ close }) {
     }
     return true;
   }, [error, address, symbol, decimals]);
-  console.log("status", status);
+  const isContractQuery = useIsContract({
+    //@ts-ignore
+    chain: (0, import_viem10.defineChain)(chain),
+    address,
+    enabled: canImport
+  });
   if (status == "success" || status == "fail") {
     return /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)("div", { className: `matchid-import-token-result matchid-flex`, children: [
       /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)("div", { className: `matchid-import-token-result-box matchid-flex`, children: [
@@ -2660,7 +2691,7 @@ function ImportToken({ close }) {
     /* @__PURE__ */ (0, import_jsx_runtime93.jsxs)("div", { className: "matchid-import-token-form", children: [
       /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(Field, { label: intl.formatMessage({
         id: "tokenSmartContract"
-      }), error: error.address, children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(
+      }), error: error.address ? error.address : isContractQuery.isFetched && !isContractQuery.isLoading && !isContractQuery.data && canImport ? "Address isn't a contract address" : "", children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(
         Input,
         {
           placeholder: intl.formatMessage({
@@ -2704,8 +2735,8 @@ function ImportToken({ close }) {
         size: "lg",
         onClick: onImport,
         block: true,
-        loading,
-        disabled: !canImport,
+        loading: loading || isContractQuery.isLoading,
+        disabled: !canImport || !isContractQuery.data,
         highlight: true,
         children: /* @__PURE__ */ (0, import_jsx_runtime93.jsx)(import_react_intl20.FormattedMessage, { id: "import" })
       }
@@ -2827,13 +2858,13 @@ function useMatchWalletRecords() {
         for (const contract of contractUnique) {
           calls.push({
             address: contract,
-            abi: import_viem10.erc20Abi,
+            abi: import_viem11.erc20Abi,
             functionName: "symbol",
             args: []
           });
           calls.push({
             address: contract,
-            abi: import_viem10.erc20Abi,
+            abi: import_viem11.erc20Abi,
             functionName: "decimals",
             args: []
           });
@@ -2985,7 +3016,7 @@ function useMatchWalletAssetList({
     name: chain?.nativeCurrency.name,
     balance: 0
   };
-  const nativeBalanceQuery = (0, import_react_query6.useQuery)({
+  const nativeBalanceQuery = (0, import_react_query7.useQuery)({
     queryKey: ["nativeBalance", nativeToken?.chain_id],
     queryFn: async () => {
       if (!nativeToken || !publicClient) return null;
@@ -3005,13 +3036,13 @@ function useMatchWalletAssetList({
     // Retry up to 3 times if failed
   });
   const erc20Tokens = (0, import_react38.useMemo)(() => list.filter((asset) => asset.address !== NATIVE_TOKEN_ADDRESS), [list]);
-  const erc20BalanceQuery = (0, import_react_query6.useQuery)({
+  const erc20BalanceQuery = (0, import_react_query7.useQuery)({
     queryKey: ["erc20Balances", erc20Tokens.map((token) => token.address)],
     queryFn: async () => {
       if (!erc20Tokens.length || !publicClient) return [];
       const calls = erc20Tokens.map((token) => ({
         address: token.address,
-        abi: import_viem10.erc20Abi,
+        abi: import_viem11.erc20Abi,
         functionName: "balanceOf",
         args: [address]
       }));
@@ -3039,13 +3070,14 @@ function useMatchWalletAssetList({
       let balanceValue = "0";
       let balance = 0;
       const decimals = typeof asset.decimals === "string" ? parseInt(asset.decimals) : asset.decimals;
-      if (asset.address === NATIVE_TOKEN_ADDRESS) {
+      const assetAddress = asset.address.toLowerCase();
+      if (assetAddress === NATIVE_TOKEN_ADDRESS) {
         balanceValue = nativeBalanceQuery.data?.toString() || "0";
-        balance = nativeBalanceQuery.data ? Number((0, import_viem10.formatUnits)(nativeBalanceQuery.data, decimals)) : 0;
+        balance = nativeBalanceQuery.data ? Number((0, import_viem11.formatUnits)(nativeBalanceQuery.data, decimals)) : 0;
       } else {
-        const index = erc20Tokens.findIndex((t) => t.address === asset.address);
+        const index = erc20Tokens.findIndex((t) => t.address.toLowerCase() === assetAddress);
         if (index !== -1 && erc20Balances[index] && erc20Balances[index].status === "success") {
-          balance = Number((0, import_viem10.formatUnits)(erc20Balances[index].result, decimals));
+          balance = Number((0, import_viem11.formatUnits)(erc20Balances[index].result, decimals));
           balanceValue = erc20Balances[index].result?.toString() || "0";
         }
       }
@@ -3079,8 +3111,8 @@ function useMatchWalletAssetList({
 
 // src/hooks/useReceipt.tsx
 var import_react39 = require("react");
-var import_react_query7 = require("@tanstack/react-query");
-var import_viem11 = require("viem");
+var import_react_query8 = require("@tanstack/react-query");
+var import_viem12 = require("viem");
 var CACHE_TTL = 86400 * 30 * 1e3;
 var MAX_CACHE_SIZE = 500;
 var STORAGE_KEY = "match_receipt_logs";
@@ -3188,7 +3220,7 @@ function useReceipt2({
   const cache = useReceiptCache();
   const chain = list?.find((item) => item.id === chainId);
   const [shouldRefetch, setShouldRefetch] = (0, import_react39.useState)(true);
-  const query = (0, import_react_query7.useQuery)({
+  const query = (0, import_react_query8.useQuery)({
     queryKey: ["match-tx-receipt", hash, chain],
     queryFn: async () => {
       if (!chain || !hash) return false;
@@ -3197,9 +3229,9 @@ function useReceipt2({
         return cache.get(cacheKey);
       }
       try {
-        const publicClient = (0, import_viem11.createPublicClient)({
-          chain: (0, import_viem11.defineChain)(chain),
-          transport: (0, import_viem11.http)()
+        const publicClient = (0, import_viem12.createPublicClient)({
+          chain: (0, import_viem12.defineChain)(chain),
+          transport: (0, import_viem12.http)()
         });
         const receipt = await publicClient.getTransactionReceipt({ hash });
         if (!receipt) {
@@ -3223,8 +3255,8 @@ function useReceipt2({
 
 // src/hooks/useTransaction.tsx
 var import_react40 = require("react");
-var import_react_query8 = require("@tanstack/react-query");
-var import_viem12 = require("viem");
+var import_react_query9 = require("@tanstack/react-query");
+var import_viem13 = require("viem");
 var CACHE_TTL2 = 86400 * 30 * 1e3;
 var MAX_CACHE_SIZE2 = 500;
 var STORAGE_KEY2 = "match_transaction_logs";
@@ -3332,7 +3364,7 @@ function useTransaction({
   const cache = useTransactionCache();
   const chain = list?.find((item) => item.id === chainId);
   const [shouldRefetch, setShouldRefetch] = (0, import_react40.useState)(true);
-  const query = (0, import_react_query8.useQuery)({
+  const query = (0, import_react_query9.useQuery)({
     queryKey: ["match-tx-transaction", hash, chain],
     queryFn: async () => {
       if (!chain || !hash) return false;
@@ -3341,9 +3373,9 @@ function useTransaction({
         return cache.get(cacheKey);
       }
       try {
-        const publicClient = (0, import_viem12.createPublicClient)({
-          chain: (0, import_viem12.defineChain)(chain),
-          transport: (0, import_viem12.http)()
+        const publicClient = (0, import_viem13.createPublicClient)({
+          chain: (0, import_viem13.defineChain)(chain),
+          transport: (0, import_viem13.http)()
         });
         const transaction = await publicClient.getTransaction({ hash });
         if (!transaction) {