@matchain/matchid-sdk-react 0.1.48-alpha.23 → 0.1.48-alpha.25

package/dist/hooks/index.mjs

@@ -12,12 +12,12 @@ import {
   useTransaction,
   useUserInfo,
   useWallet
-} from "../chunk-FYW4P7HS.mjs";
+} from "../chunk-UR57LTMH.mjs";
 import "../chunk-UA6XHZHX.mjs";
-import "../chunk-5JHHHLG4.mjs";
 import {
   useLayout_exports
 } from "../chunk-FB5MHLWX.mjs";
+import "../chunk-5JHHHLG4.mjs";
 import "../chunk-LHNKZISB.mjs";
 import "../chunk-J5LGTIGS.mjs";
 export {

package/dist/{index-Ca30Hgn7.d.mts → index-BMfaixEx.d.mts}

@@ -1,5 +1,5 @@
 import { A as AuthParams, C as ChainType, E as EmbeddedWalletsParams, R as RecoveryType } from './mpc-CTbBWHld.mjs';
-import { A as Address, d as AnyObject, o as AppConfigType, p as BindInfoType, q as BindItemType, r as BindWalletParam, B as ButtonProps, C as CEXType, D as DeepPartial, s as DrawerProps, E as EmailModalProps, H as Hash, a as IEnvConfigType, t as IEnvName, v as ILoginWalletReq, I as IMatchEvents, b as ISocialLoginMethod, w as IconProps, x as InputProps, L as LocaleType, i as LoginBoxProps, c as LoginMethodType, n as LoginModalProps, m as LoginPanelProps, y as MessageType, z as MetaPageType, F as ModalProps, M as ModalWithHeaderProps, j as OtherLoginMethodType, O as OverviewInfo, G as PohItemType, J as PohZkpassParams, P as PopoverPositionType, K as PopoverProps, l as PopoverTypeType, R as RecommendLoginMethodType, T as ThemeType, N as UIProps, g as UserAssetToken, U as UserChainType, f as UserImportTokenType, Q as UserPopoverProps, S as UserTransactionNextPageParams, V as UserTransactionRecordType, e as UserTransactionType, h as WalletAssetMergeType, X as WalletAssetType, Y as WalletChainType, W as WalletConfigType, Z as WalletNFTType, _ as WalletPanelProps, $ as WalletReceiveMessageType, k as WalletType, u as useMatchWalletAssetsProps } from './types-Dc15ure7.mjs';
+import { A as Address, k as AnyObject, o as AppConfigType, p as BindInfoType, q as BindItemType, r as BindWalletParam, B as ButtonProps, C as CEXType, D as DeepPartial, s as DrawerProps, E as EmailModalProps, H as Hash, a as IEnvConfigType, t as IEnvName, v as ILoginWalletReq, I as IMatchEvents, h as ISocialLoginMethod, w as IconProps, x as InputProps, L as LocaleType, b as LoginBoxProps, j as LoginMethodType, f as LoginModalProps, e as LoginPanelProps, y as MessageType, z as MetaPageType, F as ModalProps, M as ModalWithHeaderProps, O as OtherLoginMethodType, i as OverviewInfo, G as PohItemType, J as PohZkpassParams, P as PopoverPositionType, K as PopoverProps, d as PopoverTypeType, R as RecommendLoginMethodType, T as ThemeType, N as UIProps, n as UserAssetToken, U as UserChainType, m as UserImportTokenType, Q as UserPopoverProps, S as UserTransactionNextPageParams, V as UserTransactionRecordType, l as UserTransactionType, g as WalletAssetMergeType, X as WalletAssetType, Y as WalletChainType, W as WalletConfigType, Z as WalletNFTType, _ as WalletPanelProps, $ as WalletReceiveMessageType, c as WalletType, u as useMatchWalletAssetsProps } from './types-DzVVzMYU.mjs';
 
 declare const index_Address: typeof Address;
 declare const index_AnyObject: typeof AnyObject;

package/dist/{index-CN2jy6bb.d.ts → index-BMsj8hJv.d.ts}

@@ -1,6 +1,6 @@
-import { B as Button, F as Field, I as Input, M as Modal, a as ModalWithHeader, O as Overlay, P as Popover } from './index-BOsoQSmx.js';
+import { B as Button, F as Field, I as Input, M as Modal, a as ModalWithHeader, O as Overlay, P as Popover } from './index-BcEreCxd.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { s as DrawerProps, _ as WalletPanelProps, N as UIProps } from './types-Dc15ure7.js';
+import { s as DrawerProps, _ as WalletPanelProps, N as UIProps } from './types-DzVVzMYU.js';
 import { Hash, Chain } from 'viem';
 import { CSSProperties } from 'react';
 

package/dist/{index-BOsoQSmx.d.ts → index-BcEreCxd.d.ts}

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode, PropsWithChildren } from 'react';
-import { x as InputProps, B as ButtonProps, F as ModalProps, M as ModalWithHeaderProps, K as PopoverProps } from './types-Dc15ure7.js';
+import { x as InputProps, B as ButtonProps, F as ModalProps, M as ModalWithHeaderProps, K as PopoverProps } from './types-DzVVzMYU.js';
 
 declare function Field({ label, children, error, required, className }: {
     label: ReactNode;

package/dist/{index-BFSCCmlU.d.ts → index-Bpmrd7mh.d.ts}

@@ -1,5 +1,5 @@
 import { A as AuthParams, C as ChainType, E as EmbeddedWalletsParams, R as RecoveryType } from './mpc-CTbBWHld.js';
-import { A as Address, d as AnyObject, o as AppConfigType, p as BindInfoType, q as BindItemType, r as BindWalletParam, B as ButtonProps, C as CEXType, D as DeepPartial, s as DrawerProps, E as EmailModalProps, H as Hash, a as IEnvConfigType, t as IEnvName, v as ILoginWalletReq, I as IMatchEvents, b as ISocialLoginMethod, w as IconProps, x as InputProps, L as LocaleType, i as LoginBoxProps, c as LoginMethodType, n as LoginModalProps, m as LoginPanelProps, y as MessageType, z as MetaPageType, F as ModalProps, M as ModalWithHeaderProps, j as OtherLoginMethodType, O as OverviewInfo, G as PohItemType, J as PohZkpassParams, P as PopoverPositionType, K as PopoverProps, l as PopoverTypeType, R as RecommendLoginMethodType, T as ThemeType, N as UIProps, g as UserAssetToken, U as UserChainType, f as UserImportTokenType, Q as UserPopoverProps, S as UserTransactionNextPageParams, V as UserTransactionRecordType, e as UserTransactionType, h as WalletAssetMergeType, X as WalletAssetType, Y as WalletChainType, W as WalletConfigType, Z as WalletNFTType, _ as WalletPanelProps, $ as WalletReceiveMessageType, k as WalletType, u as useMatchWalletAssetsProps } from './types-Dc15ure7.js';
+import { A as Address, k as AnyObject, o as AppConfigType, p as BindInfoType, q as BindItemType, r as BindWalletParam, B as ButtonProps, C as CEXType, D as DeepPartial, s as DrawerProps, E as EmailModalProps, H as Hash, a as IEnvConfigType, t as IEnvName, v as ILoginWalletReq, I as IMatchEvents, h as ISocialLoginMethod, w as IconProps, x as InputProps, L as LocaleType, b as LoginBoxProps, j as LoginMethodType, f as LoginModalProps, e as LoginPanelProps, y as MessageType, z as MetaPageType, F as ModalProps, M as ModalWithHeaderProps, O as OtherLoginMethodType, i as OverviewInfo, G as PohItemType, J as PohZkpassParams, P as PopoverPositionType, K as PopoverProps, d as PopoverTypeType, R as RecommendLoginMethodType, T as ThemeType, N as UIProps, n as UserAssetToken, U as UserChainType, m as UserImportTokenType, Q as UserPopoverProps, S as UserTransactionNextPageParams, V as UserTransactionRecordType, l as UserTransactionType, g as WalletAssetMergeType, X as WalletAssetType, Y as WalletChainType, W as WalletConfigType, Z as WalletNFTType, _ as WalletPanelProps, $ as WalletReceiveMessageType, c as WalletType, u as useMatchWalletAssetsProps } from './types-DzVVzMYU.js';
 
 declare const index_Address: typeof Address;
 declare const index_AnyObject: typeof AnyObject;

package/dist/{index-DTYp8DRd.d.ts → index-Bvc8cjpN.d.ts}

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { E as EmailModalProps, i as LoginBoxProps, B as ButtonProps, j as OtherLoginMethodType, R as RecommendLoginMethodType, k as WalletType, P as PopoverPositionType, l as PopoverTypeType, m as LoginPanelProps, n as LoginModalProps, M as ModalWithHeaderProps, h as WalletAssetMergeType, u as useMatchWalletAssetsProps } from './types-Dc15ure7.js';
-import { B as Button, F as Field, I as Input, M as Modal, a as ModalWithHeader, O as Overlay, P as Popover } from './index-BOsoQSmx.js';
+import { E as EmailModalProps, b as LoginBoxProps, B as ButtonProps, O as OtherLoginMethodType, R as RecommendLoginMethodType, c as WalletType, P as PopoverPositionType, d as PopoverTypeType, e as LoginPanelProps, f as LoginModalProps, M as ModalWithHeaderProps, g as WalletAssetMergeType, u as useMatchWalletAssetsProps } from './types-DzVVzMYU.js';
+import { B as Button, F as Field, I as Input, M as Modal, a as ModalWithHeader, O as Overlay, P as Popover } from './index-BcEreCxd.js';
 import { ReactNode } from 'react';
 
 declare function EmailModal({ isOpen, width, onClose, onBack, onLogin }: EmailModalProps): react_jsx_runtime.JSX.Element;

package/dist/{index-Bk_dqXKp.d.mts → index-C9F6f2iz.d.mts}

@@ -1,6 +1,6 @@
-import { B as Button, F as Field, I as Input, M as Modal, a as ModalWithHeader, O as Overlay, P as Popover } from './index-CdM22eod.mjs';
+import { B as Button, F as Field, I as Input, M as Modal, a as ModalWithHeader, O as Overlay, P as Popover } from './index-Cou96DpL.mjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { s as DrawerProps, _ as WalletPanelProps, N as UIProps } from './types-Dc15ure7.mjs';
+import { s as DrawerProps, _ as WalletPanelProps, N as UIProps } from './types-DzVVzMYU.mjs';
 import { Hash, Chain } from 'viem';
 import { CSSProperties } from 'react';
 

package/dist/{index-B4gKj0ro.d.mts → index-C9qYyRgt.d.mts}

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { E as EmailModalProps, i as LoginBoxProps, B as ButtonProps, j as OtherLoginMethodType, R as RecommendLoginMethodType, k as WalletType, P as PopoverPositionType, l as PopoverTypeType, m as LoginPanelProps, n as LoginModalProps, M as ModalWithHeaderProps, h as WalletAssetMergeType, u as useMatchWalletAssetsProps } from './types-Dc15ure7.mjs';
-import { B as Button, F as Field, I as Input, M as Modal, a as ModalWithHeader, O as Overlay, P as Popover } from './index-CdM22eod.mjs';
+import { E as EmailModalProps, b as LoginBoxProps, B as ButtonProps, O as OtherLoginMethodType, R as RecommendLoginMethodType, c as WalletType, P as PopoverPositionType, d as PopoverTypeType, e as LoginPanelProps, f as LoginModalProps, M as ModalWithHeaderProps, g as WalletAssetMergeType, u as useMatchWalletAssetsProps } from './types-DzVVzMYU.mjs';
+import { B as Button, F as Field, I as Input, M as Modal, a as ModalWithHeader, O as Overlay, P as Popover } from './index-Cou96DpL.mjs';
 import { ReactNode } from 'react';
 
 declare function EmailModal({ isOpen, width, onClose, onBack, onLogin }: EmailModalProps): react_jsx_runtime.JSX.Element;

package/dist/{index-CdM22eod.d.mts → index-Cou96DpL.d.mts}

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode, PropsWithChildren } from 'react';
-import { x as InputProps, B as ButtonProps, F as ModalProps, M as ModalWithHeaderProps, K as PopoverProps } from './types-Dc15ure7.mjs';
+import { x as InputProps, B as ButtonProps, F as ModalProps, M as ModalWithHeaderProps, K as PopoverProps } from './types-DzVVzMYU.mjs';
 
 declare function Field({ label, children, error, required, className }: {
     label: ReactNode;

package/dist/{index-BHXlpUg5.d.ts → index-Cy3K-Yao.d.ts}

@@ -1,6 +1,6 @@
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { UseQueryOptions } from '@tanstack/react-query/src/types';
-import { J as PohZkpassParams, e as UserTransactionType, S as UserTransactionNextPageParams, X as WalletAssetType, z as MetaPageType, q as BindItemType, p as BindInfoType, G as PohItemType, U as UserChainType, g as UserAssetToken, f as UserImportTokenType, Y as WalletChainType, Z as WalletNFTType } from './types-Dc15ure7.js';
+import { J as PohZkpassParams, l as UserTransactionType, S as UserTransactionNextPageParams, X as WalletAssetType, z as MetaPageType, q as BindItemType, p as BindInfoType, G as PohItemType, U as UserChainType, n as UserAssetToken, m as UserImportTokenType, Y as WalletChainType, Z as WalletNFTType } from './types-DzVVzMYU.js';
 
 declare const isSuccess: (res: {
     code: number;

package/dist/{index-D3GBq1P1.d.mts → index-D4ju2J_e.d.mts}

@@ -1,6 +1,6 @@
 import * as _tanstack_react_query from '@tanstack/react-query';
 import { UseQueryOptions } from '@tanstack/react-query/src/types';
-import { J as PohZkpassParams, e as UserTransactionType, S as UserTransactionNextPageParams, X as WalletAssetType, z as MetaPageType, q as BindItemType, p as BindInfoType, G as PohItemType, U as UserChainType, g as UserAssetToken, f as UserImportTokenType, Y as WalletChainType, Z as WalletNFTType } from './types-Dc15ure7.mjs';
+import { J as PohZkpassParams, l as UserTransactionType, S as UserTransactionNextPageParams, X as WalletAssetType, z as MetaPageType, q as BindItemType, p as BindInfoType, G as PohItemType, U as UserChainType, n as UserAssetToken, m as UserImportTokenType, Y as WalletChainType, Z as WalletNFTType } from './types-DzVVzMYU.mjs';
 
 declare const isSuccess: (res: {
     code: number;

package/dist/{index-BObJQar4.d.mts → index-DUHkH5t-.d.mts}

@@ -1,4 +1,4 @@
-import { b as ISocialLoginMethod, O as OverviewInfo, C as CEXType, c as LoginMethodType, I as IMatchEvents, U as UserChainType, A as Address, H as Hash$1, d as AnyObject, e as UserTransactionType, u as useMatchWalletAssetsProps, f as UserImportTokenType, g as UserAssetToken, h as WalletAssetMergeType } from './types-Dc15ure7.mjs';
+import { h as ISocialLoginMethod, i as OverviewInfo, C as CEXType, j as LoginMethodType, I as IMatchEvents, U as UserChainType, A as Address, H as Hash$1, k as AnyObject, l as UserTransactionType, u as useMatchWalletAssetsProps, m as UserImportTokenType, n as UserAssetToken, g as WalletAssetMergeType } from './types-DzVVzMYU.mjs';
 import * as viem from 'viem';
 import { Account, WalletClientConfig, createWalletClient, SignableMessage, Hex, TransactionSerializable, DeployContractParameters, SendTransactionParameters, WriteContractParameters, Chain } from 'viem';
 import { C as ChainType } from './mpc-CTbBWHld.mjs';
@@ -3257,6 +3257,16 @@ declare function useMatchWalletAssetList({ list }: {
     list: WalletAssetMergeType[];
     isLoading: boolean;
     isFetched: boolean;
+    nativeBalanceQuery: _tanstack_react_query.UseQueryResult<bigint | null, Error>;
+    erc20BalanceQuery: _tanstack_react_query.UseQueryResult<({
+        error?: undefined;
+        result: unknown;
+        status: "success";
+    } | {
+        error: Error;
+        result?: undefined;
+        status: "failure";
+    })[], Error>;
     nativeBalance: bigint | null | undefined;
     erc20Balances: ({
         error?: undefined;

package/dist/{index-CSTyna62.d.ts → index-DcQm2dkr.d.ts}

@@ -1,4 +1,4 @@
-import { b as ISocialLoginMethod, O as OverviewInfo, C as CEXType, c as LoginMethodType, I as IMatchEvents, U as UserChainType, A as Address, H as Hash$1, d as AnyObject, e as UserTransactionType, u as useMatchWalletAssetsProps, f as UserImportTokenType, g as UserAssetToken, h as WalletAssetMergeType } from './types-Dc15ure7.js';
+import { h as ISocialLoginMethod, i as OverviewInfo, C as CEXType, j as LoginMethodType, I as IMatchEvents, U as UserChainType, A as Address, H as Hash$1, k as AnyObject, l as UserTransactionType, u as useMatchWalletAssetsProps, m as UserImportTokenType, n as UserAssetToken, g as WalletAssetMergeType } from './types-DzVVzMYU.js';
 import * as viem from 'viem';
 import { Account, WalletClientConfig, createWalletClient, SignableMessage, Hex, TransactionSerializable, DeployContractParameters, SendTransactionParameters, WriteContractParameters, Chain } from 'viem';
 import { C as ChainType } from './mpc-CTbBWHld.js';
@@ -3257,6 +3257,16 @@ declare function useMatchWalletAssetList({ list }: {
     list: WalletAssetMergeType[];
     isLoading: boolean;
     isFetched: boolean;
+    nativeBalanceQuery: _tanstack_react_query.UseQueryResult<bigint | null, Error>;
+    erc20BalanceQuery: _tanstack_react_query.UseQueryResult<({
+        error?: undefined;
+        result: unknown;
+        status: "success";
+    } | {
+        error: Error;
+        result?: undefined;
+        status: "failure";
+    })[], Error>;
     nativeBalance: bigint | null | undefined;
     erc20Balances: ({
         error?: undefined;

package/dist/index.d.mts

@@ -1,14 +1,14 @@
 import React, { ReactNode } from 'react';
-import { I as IMatchEvents, a as IEnvConfigType, L as LocaleType, W as WalletConfigType } from './types-Dc15ure7.mjs';
-export { i as Components } from './index-B4gKj0ro.mjs';
-export { i as UI } from './index-Bk_dqXKp.mjs';
-export { i as Hooks } from './index-BObJQar4.mjs';
-export { i as Api } from './index-D3GBq1P1.mjs';
+import { I as IMatchEvents, a as IEnvConfigType, L as LocaleType, W as WalletConfigType } from './types-DzVVzMYU.mjs';
+export { i as Components } from './index-C9qYyRgt.mjs';
+export { i as UI } from './index-C9F6f2iz.mjs';
+export { i as Hooks } from './index-DUHkH5t-.mjs';
+export { i as Api } from './index-D4ju2J_e.mjs';
 export { i as Chains } from './index-DXRGMAbv.mjs';
-export { i as Types } from './index-Ca30Hgn7.mjs';
+export { i as Types } from './index-BMfaixEx.mjs';
 import '@tanstack/react-query/src/types';
 import 'react/jsx-runtime';
-import './index-CdM22eod.mjs';
+import './index-Cou96DpL.mjs';
 import 'viem';
 import './mpc-CTbBWHld.mjs';
 import 'viem/types/misc';

package/dist/index.d.ts

@@ -1,14 +1,14 @@
 import React, { ReactNode } from 'react';
-import { I as IMatchEvents, a as IEnvConfigType, L as LocaleType, W as WalletConfigType } from './types-Dc15ure7.js';
-export { i as Components } from './index-DTYp8DRd.js';
-export { i as UI } from './index-CN2jy6bb.js';
-export { i as Hooks } from './index-CSTyna62.js';
-export { i as Api } from './index-BHXlpUg5.js';
+import { I as IMatchEvents, a as IEnvConfigType, L as LocaleType, W as WalletConfigType } from './types-DzVVzMYU.js';
+export { i as Components } from './index-Bvc8cjpN.js';
+export { i as UI } from './index-BMsj8hJv.js';
+export { i as Hooks } from './index-DcQm2dkr.js';
+export { i as Api } from './index-Cy3K-Yao.js';
 export { i as Chains } from './index-DXRGMAbv.js';
-export { i as Types } from './index-BFSCCmlU.js';
+export { i as Types } from './index-Bpmrd7mh.js';
 import '@tanstack/react-query/src/types';
 import 'react/jsx-runtime';
-import './index-BOsoQSmx.js';
+import './index-BcEreCxd.js';
 import 'viem';
 import './mpc-CTbBWHld.js';
 import 'viem/types/misc';

package/dist/index.js

@@ -5655,11 +5655,11 @@ var persistedState3 = (0, import_middleware3.persist)(
   (set, get) => ({
     contracts: {},
     getContract: (chainId, contractAddress) => {
-      const key = `${chainId}-${contractAddress}`;
+      const key = `${chainId}-${contractAddress.toLowerCase()}`;
       return get().contracts[key];
     },
     setContractName: (chainId, contractAddress, name) => {
-      const key = `${chainId}-${contractAddress}`;
+      const key = `${chainId}-${contractAddress.toLowerCase()}`;
       set((state) => {
         const updatedContracts = {
           ...state.contracts,
@@ -5669,7 +5669,7 @@ var persistedState3 = (0, import_middleware3.persist)(
       });
     },
     setContractSymbol: (chainId, contractAddress, symbol) => {
-      const key = `${chainId}-${contractAddress}`;
+      const key = `${chainId}-${contractAddress.toLowerCase()}`;
       set((state) => {
         const updatedContracts = {
           ...state.contracts,
@@ -5679,7 +5679,7 @@ var persistedState3 = (0, import_middleware3.persist)(
       });
     },
     setContractDecimals: (chainId, contractAddress, decimals) => {
-      const key = `${chainId}-${contractAddress}`;
+      const key = `${chainId}-${contractAddress.toLowerCase()}`;
       set((state) => {
         const updatedContracts = {
           ...state.contracts,
@@ -5692,7 +5692,7 @@ var persistedState3 = (0, import_middleware3.persist)(
       set((state) => {
         const newContracts = { ...state.contracts };
         data.forEach(({ chainId, contractAddress, info }) => {
-          const key = `${chainId}-${contractAddress}`;
+          const key = `${chainId}-${contractAddress.toLowerCase()}`;
           newContracts[key] = { ...newContracts[key], ...info };
         });
         return { contracts: newContracts };
@@ -5709,7 +5709,7 @@ var import_react_intl17 = require("react-intl");
 var import_jsx_runtime88 = require("react/jsx-runtime");
 var Item = ({ data }) => {
   const { address } = useWallet();
-  const isOut = data.from == address;
+  const isOut = data.from.toLowerCase() == address.toLowerCase();
   const { chain, chainId, explorerLink, formatUnits: chainFormatUnits } = useMatchChain();
   const { getContract } = useContractStore_default();
   const [shouldRefetch, setShouldRefetch] = (0, import_react32.useState)(true);
@@ -5744,11 +5744,6 @@ var Item = ({ data }) => {
     }
     return chainFormatUnits(BigInt(data.value));
   }, [data.input, transferType, data.value, getContract, chainId, data.to]);
-  (0, import_react32.useEffect)(() => {
-    if (data.hash) {
-      setShouldRefetch(true);
-    }
-  }, [data.hash]);
   const hashQuery = useHash({
     hash: data.hash,
     //@ts-ignore
@@ -5784,8 +5779,10 @@ var Item = ({ data }) => {
     return "loading";
   }, [data.extra?.status, data.source, hashQuery.data]);
   (0, import_react32.useEffect)(() => {
-    setShouldRefetch(status == "loading");
-  }, [status]);
+    if (data.hash) {
+      setShouldRefetch(status == "loading");
+    }
+  }, [status, data.hash]);
   const symbol = (0, import_react32.useMemo)(() => {
     if (transferType == "erc20_transfer") {
       return getContract(chainId || 0, data.to)?.symbol || getContract(chainId || 0, data.to)?.name || "unknown";
@@ -6268,7 +6265,7 @@ function useMatchWalletAssets({
       list.unshift({
         chain_id: chain?.id.toString() || "",
         address: NATIVE_TOKEN_ADDRESS,
-        decimals: 18,
+        decimals: chain?.nativeCurrency.decimals || 18,
         symbol: chain?.nativeCurrency.symbol,
         name: chain?.nativeCurrency.name,
         balance: 0,
@@ -6340,7 +6337,7 @@ function useMatchWalletAssetList({
       }
       return balances;
     },
-    enabled: erc20Tokens.length > 0 && !!publicClient,
+    enabled: !!publicClient,
     refetchInterval: 15e3,
     // Refresh every 15 seconds
     retry: 3
@@ -6383,6 +6380,8 @@ function useMatchWalletAssetList({
     list: assets,
     isLoading: nativeBalanceQuery.isLoading || erc20BalanceQuery.isLoading,
     isFetched: nativeBalanceQuery.isFetched && erc20BalanceQuery.isFetched,
+    nativeBalanceQuery,
+    erc20BalanceQuery,
     nativeBalance: nativeBalanceQuery.data,
     erc20Balances: erc20BalanceQuery.data
   };