@multiversx/sdk-dapp-liquidity 1.1.0-alpha.46 → 1.1.0-alpha.48

package/index.js

@@ -55,7 +55,7 @@ const reactjs_hooks_validation_useSecondAmountSchema = require("./reactjs/hooks/
 const reactjs_hooks_validation_useTestHasEnoughFunds = require("./reactjs/hooks/validation/useTestHasEnoughFunds.js");
 const reactjs_hooks_validation_useTestIsConnected = require("./reactjs/hooks/validation/useTestIsConnected.js");
 const reactjs_hooks_useAccount = require("./reactjs/hooks/useAccount.js");
-const reactjs_hooks_useBalances = require("./useBalances-ok4GNkJ5.js");
+const reactjs_hooks_useBalances = require("./reactjs/hooks/useBalances.js");
 const reactjs_hooks_useBridgeFormik = require("./reactjs/hooks/useBridgeFormik.js");
 const reactjs_hooks_useDebounce = require("./reactjs/hooks/useDebounce.js");
 const reactjs_hooks_useFetchBridgeData = require("./reactjs/hooks/useFetchBridgeData.js");
@@ -67,7 +67,7 @@ const reactjs_hooks_useSignTransaction = require("./reactjs/hooks/useSignTransac
 const reactjs_init_init = require("./reactjs/init/init.js");
 const reactjs_queries_useGetAllTokens_query = require("./reactjs/queries/useGetAllTokens.query.js");
 const reactjs_queries_useGetChains_query = require("./reactjs/queries/useGetChains.query.js");
-const reactjs_queries_useGetEvmTokensBalances_query = require("./reactjs/queries/useGetEvmTokensBalances.query.js");
+const reactjs_queries_useGetNonMvxTokensBalances_query = require("./reactjs/queries/useGetNonMvxTokensBalances.query.js");
 const reactjs_queries_useGetHistory_query = require("./reactjs/queries/useGetHistory.query.js");
 const reactjs_queries_useGetMvxTokensBalances_query = require("./reactjs/queries/useGetMvxTokensBalances.query.js");
 const reactjs_queries_useGetRate_mutation = require("./reactjs/queries/useGetRate.mutation.js");
@@ -156,8 +156,8 @@ exports.useSignTransaction = reactjs_hooks_useSignTransaction.useSignTransaction
 exports.init = reactjs_init_init.init;
 exports.useGetAllTokensQuery = reactjs_queries_useGetAllTokens_query.useGetAllTokensQuery;
 exports.useGetChainsQuery = reactjs_queries_useGetChains_query.useGetChainsQuery;
-exports.invalidateEvmTokensBalances = reactjs_queries_useGetEvmTokensBalances_query.invalidateEvmTokensBalances;
-exports.useGetEvmTokensBalancesQuery = reactjs_queries_useGetEvmTokensBalances_query.useGetEvmTokensBalancesQuery;
+exports.invalidateEvmTokensBalances = reactjs_queries_useGetNonMvxTokensBalances_query.invalidateEvmTokensBalances;
+exports.useGetNonMvxTokensBalancesQuery = reactjs_queries_useGetNonMvxTokensBalances_query.useGetNonMvxTokensBalancesQuery;
 exports.invalidateHistoryQuery = reactjs_queries_useGetHistory_query.invalidateHistoryQuery;
 exports.useGetHistoryQuery = reactjs_queries_useGetHistory_query.useGetHistoryQuery;
 exports.invalidateMvxTokensBalancesQuery = reactjs_queries_useGetMvxTokensBalances_query.invalidateMvxTokensBalancesQuery;

package/index.mjs

@@ -52,7 +52,7 @@ import { useSecondAmountSchema } from "./reactjs/hooks/validation/useSecondAmoun
 import { useTestHasEnoughFunds } from "./reactjs/hooks/validation/useTestHasEnoughFunds.mjs";
 import { useTestIsConnected } from "./reactjs/hooks/validation/useTestIsConnected.mjs";
 import { useAccount } from "./reactjs/hooks/useAccount.mjs";
-import { u } from "./useBalances-CtcrEcK2.mjs";
+import { useBalances } from "./reactjs/hooks/useBalances.mjs";
 import { BridgeFormikValuesEnum, useBridgeFormik } from "./reactjs/hooks/useBridgeFormik.mjs";
 import { useDebounce } from "./reactjs/hooks/useDebounce.mjs";
 import { useFetchBridgeData } from "./reactjs/hooks/useFetchBridgeData.mjs";
@@ -64,7 +64,7 @@ import { useSignTransaction } from "./reactjs/hooks/useSignTransaction.mjs";
 import { init } from "./reactjs/init/init.mjs";
 import { useGetAllTokensQuery } from "./reactjs/queries/useGetAllTokens.query.mjs";
 import { useGetChainsQuery } from "./reactjs/queries/useGetChains.query.mjs";
-import { invalidateEvmTokensBalances, useGetEvmTokensBalancesQuery } from "./reactjs/queries/useGetEvmTokensBalances.query.mjs";
+import { invalidateEvmTokensBalances, useGetNonMvxTokensBalancesQuery } from "./reactjs/queries/useGetNonMvxTokensBalances.query.mjs";
 import { invalidateHistoryQuery, useGetHistoryQuery } from "./reactjs/queries/useGetHistory.query.mjs";
 import { invalidateMvxTokensBalancesQuery, useGetMvxTokensBalancesQuery } from "./reactjs/queries/useGetMvxTokensBalances.query.mjs";
 import { useGetRateMutation } from "./reactjs/queries/useGetRate.mutation.mjs";
@@ -164,7 +164,7 @@ export {
   useAppKitProvider,
   useAppKitState,
   useAppKitTheme,
-  u as useBalances,
+  useBalances,
   useBridgeFormik,
   useDebounce,
   useDisconnect,
@@ -173,9 +173,9 @@ export {
   useGetAllTokensQuery,
   useGetChainId,
   useGetChainsQuery,
-  useGetEvmTokensBalancesQuery,
   useGetHistoryQuery,
   useGetMvxTokensBalancesQuery,
+  useGetNonMvxTokensBalancesQuery,
   useGetRateMutation,
   useResolveTokenChain,
   useSecondAmountSchema,

package/package.json

@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/multiversx/mx-sdk-dapp-liquidity#readme",
   "license": "MIT",
-  "version": "1.1.0-alpha.46",
+  "version": "1.1.0-alpha.48",
   "main": "index.js",
   "module": "index.mjs",
   "types": "index.d.ts",

package/reactjs/components/BridgeForm/BridgeForm.js

@@ -44,7 +44,15 @@ const reactjs_components_Connect_MvxAccountDisplay = require("../Connect/MvxAcco
 const reactjs_components_TokenSelector_TokenSelector = require("../TokenSelector/TokenSelector.js");
 const viem = require("viem");
 const actions = require("viem/actions");
-const reactjs_hooks_useBalances = require("../../../useBalances-ok4GNkJ5.js");
+function getAction(client, actionFn, name) {
+  const action_implicit = client[actionFn.name];
+  if (typeof action_implicit === "function")
+    return action_implicit;
+  const action_explicit = client[name];
+  if (typeof action_explicit === "function")
+    return action_explicit;
+  return (params) => actionFn(client, params);
+}
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -95,12 +103,12 @@ function getConnections(config) {
 async function waitForTransactionReceipt(config, parameters) {
   const { chainId, timeout = 0, ...rest } = parameters;
   const client = config.getClient({ chainId });
-  const action = reactjs_hooks_useBalances.getAction(client, actions.waitForTransactionReceipt, "waitForTransactionReceipt");
+  const action = getAction(client, actions.waitForTransactionReceipt, "waitForTransactionReceipt");
   const receipt = await action({ ...rest, timeout });
   if (receipt.status === "reverted") {
-    const action_getTransaction = reactjs_hooks_useBalances.getAction(client, actions.getTransaction, "getTransaction");
+    const action_getTransaction = getAction(client, actions.getTransaction, "getTransaction");
     const txn = await action_getTransaction({ hash: receipt.transactionHash });
-    const action_call = reactjs_hooks_useBalances.getAction(client, actions.call, "call");
+    const action_call = getAction(client, actions.call, "call");
     const code = await action_call({
       ...txn,
       data: txn.input,
@@ -253,7 +261,7 @@ const BridgeForm = ({
   const hasAmounts = firstAmount !== "" && secondAmount !== "";
   const fetchRateDebounced = React.useCallback(
     debounce(async (amount) => {
-      if (!amount || !account.address || !(firstToken == null ? void 0 : firstToken.address) || !(secondToken == null ? void 0 : secondToken.address) || !selectedChainOption || !chainId) {
+      if (!amount || !Number(amount) || !account.address || !(firstToken == null ? void 0 : firstToken.address) || !(secondToken == null ? void 0 : secondToken.address) || !selectedChainOption || !chainId) {
         return;
       }
       getRate({

package/reactjs/components/BridgeForm/BridgeForm.mjs

@@ -41,7 +41,15 @@ import { MvxAccountDisplay } from "../Connect/MvxAccountDisplay.mjs";
 import { TokenSelector } from "../TokenSelector/TokenSelector.mjs";
 import { hexToString } from "viem";
 import { waitForTransactionReceipt as waitForTransactionReceipt$1, getTransaction, call } from "viem/actions";
-import { g as getAction } from "../../../useBalances-CtcrEcK2.mjs";
+function getAction(client, actionFn, name) {
+  const action_implicit = client[actionFn.name];
+  if (typeof action_implicit === "function")
+    return action_implicit;
+  const action_explicit = client[name];
+  if (typeof action_explicit === "function")
+    return action_explicit;
+  return (params) => actionFn(client, params);
+}
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -250,7 +258,7 @@ const BridgeForm = ({
   const hasAmounts = firstAmount !== "" && secondAmount !== "";
   const fetchRateDebounced = useCallback(
     debounce(async (amount) => {
-      if (!amount || !account.address || !(firstToken == null ? void 0 : firstToken.address) || !(secondToken == null ? void 0 : secondToken.address) || !selectedChainOption || !chainId) {
+      if (!amount || !Number(amount) || !account.address || !(firstToken == null ? void 0 : firstToken.address) || !(secondToken == null ? void 0 : secondToken.address) || !selectedChainOption || !chainId) {
         return;
       }
       getRate({

package/reactjs/components/Connect/BridgeAccountDisplay.js

@@ -14,13 +14,13 @@ require("yup");
 require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
 require("../../../bignumber-B8vjg9qn.js");
 const reactjs_hooks_useAccount = require("../../hooks/useAccount.js");
-require("@solana/web3.js");
 require("axios");
-const reactjs_hooks_useGetChainId = require("../../hooks/useGetChainId.js");
-require("@tanstack/react-query");
 require("formik");
+require("@tanstack/react-query");
+const reactjs_hooks_useGetChainId = require("../../hooks/useGetChainId.js");
 require("../../constants/index.js");
 require("@reown/appkit-adapter-solana/react");
+require("@solana/web3.js");
 require("wagmi");
 const reactjs_hooks_useGenericSignMessage = require("../../hooks/useGenericSignMessage.js");
 const reactjs_queries_useLinkAccount_mutation = require("../../queries/useLinkAccount.mutation.js");

package/reactjs/components/Connect/BridgeAccountDisplay.mjs

@@ -11,13 +11,13 @@ import "yup";
 import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
 import "../../../bignumber-CKZkoo0g.mjs";
 import { useAccount } from "../../hooks/useAccount.mjs";
-import "@solana/web3.js";
 import "axios";
-import { useGetChainId } from "../../hooks/useGetChainId.mjs";
-import "@tanstack/react-query";
 import "formik";
+import "@tanstack/react-query";
+import { useGetChainId } from "../../hooks/useGetChainId.mjs";
 import "../../constants/index.mjs";
 import "@reown/appkit-adapter-solana/react";
+import "@solana/web3.js";
 import "wagmi";
 import { useGenericSignMessage } from "../../hooks/useGenericSignMessage.mjs";
 import { useLinkAccountMutation } from "../../queries/useLinkAccount.mutation.mjs";

package/reactjs/hooks/index.js

@@ -6,7 +6,7 @@ const reactjs_hooks_validation_useSecondAmountSchema = require("./validation/use
 const reactjs_hooks_validation_useTestHasEnoughFunds = require("./validation/useTestHasEnoughFunds.js");
 const reactjs_hooks_validation_useTestIsConnected = require("./validation/useTestIsConnected.js");
 const reactjs_hooks_useAccount = require("./useAccount.js");
-const reactjs_hooks_useBalances = require("../../useBalances-ok4GNkJ5.js");
+const reactjs_hooks_useBalances = require("./useBalances.js");
 const reactjs_hooks_useBridgeFormik = require("./useBridgeFormik.js");
 const reactjs_hooks_useDebounce = require("./useDebounce.js");
 const reactjs_hooks_useFetchBridgeData = require("./useFetchBridgeData.js");

package/reactjs/hooks/index.mjs

@@ -3,7 +3,7 @@ import { useSecondAmountSchema } from "./validation/useSecondAmountSchema.mjs";
 import { useTestHasEnoughFunds } from "./validation/useTestHasEnoughFunds.mjs";
 import { useTestIsConnected } from "./validation/useTestIsConnected.mjs";
 import { useAccount } from "./useAccount.mjs";
-import { u } from "../../useBalances-CtcrEcK2.mjs";
+import { useBalances } from "./useBalances.mjs";
 import { BridgeFormikValuesEnum, useBridgeFormik } from "./useBridgeFormik.mjs";
 import { useDebounce } from "./useDebounce.mjs";
 import { useFetchBridgeData } from "./useFetchBridgeData.mjs";
@@ -16,7 +16,7 @@ export {
   BridgeFormikValuesEnum,
   useAccount,
   useAmountSchema,
-  u as useBalances,
+  useBalances,
   useBridgeFormik,
   useDebounce,
   useFetchBridgeData,

package/reactjs/hooks/useBalances.d.ts

@@ -1,8 +1,9 @@
 import { TokenType } from '../../types';
 
 export declare const useBalances: () => {
-    fetchBalances: ({ tokens }: {
+    getBalances: ({ tokens, chainId }: {
         tokens: TokenType[];
+        chainId: string;
     }) => Promise<{
         tokenId: string;
         balance: string;

package/reactjs/hooks/useBalances.js

@@ -1,22 +1,54 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("@reown/appkit/react");
-require("@solana/web3.js");
-require("axios");
-require("react");
-require("../../helpers/getApiURL.js");
-require("./useGetChainId.js");
-require("../../types/chainType.js");
-require("../context/useWeb3App.js");
-require("@tanstack/react-query");
-require("../queries/useGetChains.query.js");
-require("yup");
-require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
-require("../../bignumber-B8vjg9qn.js");
-require("wagmi");
-const reactjs_hooks_useBalances = require("../../useBalances-ok4GNkJ5.js");
-require("formik");
-require("../constants/index.js");
-require("@reown/appkit-adapter-solana/react");
-exports.useBalances = reactjs_hooks_useBalances.useBalances;
+const react = require("@reown/appkit/react");
+const axios = require("axios");
+const React = require("react");
+const helpers_getApiURL = require("../../helpers/getApiURL.js");
+const reactjs_context_useWeb3App = require("../context/useWeb3App.js");
+const useBalances = () => {
+  const { config } = reactjs_context_useWeb3App.useWeb3App();
+  const { address, isConnected } = react.useAppKitAccount();
+  const { nativeAuthToken } = reactjs_context_useWeb3App.useWeb3App();
+  const fetchBalances = async (chainId) => {
+    const url = `${helpers_getApiURL.getApiURL()}/user/balance/${address}?chainId=${chainId}`;
+    try {
+      const { data } = await axios.get(url, {
+        headers: {
+          Authorization: `Bearer ${nativeAuthToken}`
+        }
+      });
+      return data.reduce(
+        (acc, cur) => {
+          acc[cur.tokenAddress] = cur.balance;
+          return acc;
+        },
+        {}
+      );
+    } catch (error) {
+      throw new Error(`Error fetching balances: ${error}`);
+    }
+  };
+  const getBalances = React.useCallback(
+    async ({ tokens, chainId }) => {
+      const tokensBalances = await fetchBalances(chainId);
+      return tokens.map((token) => {
+        if (!isConnected || !address || !token.chainId) {
+          return {
+            tokenId: token.address,
+            balance: "0"
+          };
+        }
+        return {
+          tokenId: token.address,
+          balance: tokensBalances[token.address] ?? "0"
+        };
+      });
+    },
+    [config, isConnected, address]
+  );
+  return {
+    getBalances
+  };
+};
+exports.useBalances = useBalances;

package/reactjs/hooks/useBalances.mjs

@@ -1,21 +1,53 @@
-import "@reown/appkit/react";
-import "@solana/web3.js";
-import "axios";
-import "react";
-import "../../helpers/getApiURL.mjs";
-import "./useGetChainId.mjs";
-import "../../types/chainType.mjs";
-import "../context/useWeb3App.mjs";
-import "@tanstack/react-query";
-import "../queries/useGetChains.query.mjs";
-import "yup";
-import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
-import "../../bignumber-CKZkoo0g.mjs";
-import "wagmi";
-import { u } from "../../useBalances-CtcrEcK2.mjs";
-import "formik";
-import "../constants/index.mjs";
-import "@reown/appkit-adapter-solana/react";
+import { useAppKitAccount } from "@reown/appkit/react";
+import axios from "axios";
+import { useCallback } from "react";
+import { getApiURL } from "../../helpers/getApiURL.mjs";
+import { useWeb3App } from "../context/useWeb3App.mjs";
+const useBalances = () => {
+  const { config } = useWeb3App();
+  const { address, isConnected } = useAppKitAccount();
+  const { nativeAuthToken } = useWeb3App();
+  const fetchBalances = async (chainId) => {
+    const url = `${getApiURL()}/user/balance/${address}?chainId=${chainId}`;
+    try {
+      const { data } = await axios.get(url, {
+        headers: {
+          Authorization: `Bearer ${nativeAuthToken}`
+        }
+      });
+      return data.reduce(
+        (acc, cur) => {
+          acc[cur.tokenAddress] = cur.balance;
+          return acc;
+        },
+        {}
+      );
+    } catch (error) {
+      throw new Error(`Error fetching balances: ${error}`);
+    }
+  };
+  const getBalances = useCallback(
+    async ({ tokens, chainId }) => {
+      const tokensBalances = await fetchBalances(chainId);
+      return tokens.map((token) => {
+        if (!isConnected || !address || !token.chainId) {
+          return {
+            tokenId: token.address,
+            balance: "0"
+          };
+        }
+        return {
+          tokenId: token.address,
+          balance: tokensBalances[token.address] ?? "0"
+        };
+      });
+    },
+    [config, isConnected, address]
+  );
+  return {
+    getBalances
+  };
+};
 export {
-  u as useBalances
+  useBalances
 };

package/reactjs/hooks/useFetchTokens.js

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const react = require("@reown/appkit/react");
 const React = require("react");
 const reactjs_hooks_useAccount = require("./useAccount.js");
-const reactjs_hooks_useGetChainId = require("./useGetChainId.js");
 const constants_index = require("../../constants/index.js");
 const reactjs_queries_useGetAllTokens_query = require("../queries/useGetAllTokens.query.js");
-const reactjs_queries_useGetEvmTokensBalances_query = require("../queries/useGetEvmTokensBalances.query.js");
 const reactjs_queries_useGetMvxTokensBalances_query = require("../queries/useGetMvxTokensBalances.query.js");
+const reactjs_queries_useGetNonMvxTokensBalances_query = require("../queries/useGetNonMvxTokensBalances.query.js");
 const useFetchTokens = ({
   mvxAddress,
   mvxApiURL,
   refetchTrigger
 }) => {
-  const chainId = reactjs_hooks_useGetChainId.useGetChainId();
+  const { chainId } = react.useAppKitNetwork();
   const account = reactjs_hooks_useAccount.useAccount();
   const {
     data: tokens,
@@ -36,7 +36,7 @@ const useFetchTokens = ({
     data: evmTokensBalances,
     isLoading: isLoadingEvmTokensBalances,
     isError: isErrorEvmTokensBalances
-  } = reactjs_queries_useGetEvmTokensBalances_query.useGetEvmTokensBalancesQuery({
+  } = reactjs_queries_useGetNonMvxTokensBalances_query.useGetNonMvxTokensBalancesQuery({
     tokens: evmTokens ?? [],
     chainId: chainId == null ? void 0 : chainId.toString()
   });
@@ -69,7 +69,7 @@ const useFetchTokens = ({
   const evmTokensWithBalances = React.useMemo(() => {
     return evmTokens == null ? void 0 : evmTokens.map((token) => {
       const foundToken = evmTokensBalances == null ? void 0 : evmTokensBalances.find(
-        (evmToken) => evmToken.address === token.address
+        (evmToken) => evmToken.address === token.address && evmToken.chainId === token.chainId
       );
       if (!foundToken) {
         return {
@@ -84,13 +84,16 @@ const useFetchTokens = ({
     });
   }, [evmTokens, evmTokensBalances]);
   React.useEffect(() => {
-    if (account.address) {
-      reactjs_queries_useGetEvmTokensBalances_query.invalidateEvmTokensBalances();
-    }
     if (mvxAddress) {
       reactjs_queries_useGetMvxTokensBalances_query.invalidateMvxTokensBalancesQuery();
     }
-  }, [refetchTrigger, chainId, account.address, mvxAddress]);
+  }, [refetchTrigger, mvxAddress]);
+  React.useEffect(() => {
+    if (!account.address) {
+      return;
+    }
+    reactjs_queries_useGetNonMvxTokensBalances_query.invalidateEvmTokensBalances();
+  }, [refetchTrigger, chainId, account.address]);
   return {
     isTokensLoading,
     isTokensError,

package/reactjs/hooks/useFetchTokens.mjs

@@ -1,16 +1,16 @@
+import { useAppKitNetwork } from "@reown/appkit/react";
 import { useMemo, useEffect } from "react";
 import { useAccount } from "./useAccount.mjs";
-import { useGetChainId } from "./useGetChainId.mjs";
 import { MVX_CHAIN_IDS } from "../../constants/index.mjs";
 import { useGetAllTokensQuery } from "../queries/useGetAllTokens.query.mjs";
-import { useGetEvmTokensBalancesQuery, invalidateEvmTokensBalances } from "../queries/useGetEvmTokensBalances.query.mjs";
 import { useGetMvxTokensBalancesQuery, invalidateMvxTokensBalancesQuery } from "../queries/useGetMvxTokensBalances.query.mjs";
+import { useGetNonMvxTokensBalancesQuery, invalidateEvmTokensBalances } from "../queries/useGetNonMvxTokensBalances.query.mjs";
 const useFetchTokens = ({
   mvxAddress,
   mvxApiURL,
   refetchTrigger
 }) => {
-  const chainId = useGetChainId();
+  const { chainId } = useAppKitNetwork();
   const account = useAccount();
   const {
     data: tokens,
@@ -33,7 +33,7 @@ const useFetchTokens = ({
     data: evmTokensBalances,
     isLoading: isLoadingEvmTokensBalances,
     isError: isErrorEvmTokensBalances
-  } = useGetEvmTokensBalancesQuery({
+  } = useGetNonMvxTokensBalancesQuery({
     tokens: evmTokens ?? [],
     chainId: chainId == null ? void 0 : chainId.toString()
   });
@@ -66,7 +66,7 @@ const useFetchTokens = ({
   const evmTokensWithBalances = useMemo(() => {
     return evmTokens == null ? void 0 : evmTokens.map((token) => {
       const foundToken = evmTokensBalances == null ? void 0 : evmTokensBalances.find(
-        (evmToken) => evmToken.address === token.address
+        (evmToken) => evmToken.address === token.address && evmToken.chainId === token.chainId
       );
       if (!foundToken) {
         return {
@@ -81,13 +81,16 @@ const useFetchTokens = ({
     });
   }, [evmTokens, evmTokensBalances]);
   useEffect(() => {
-    if (account.address) {
-      invalidateEvmTokensBalances();
-    }
     if (mvxAddress) {
       invalidateMvxTokensBalancesQuery();
     }
-  }, [refetchTrigger, chainId, account.address, mvxAddress]);
+  }, [refetchTrigger, mvxAddress]);
+  useEffect(() => {
+    if (!account.address) {
+      return;
+    }
+    invalidateEvmTokensBalances();
+  }, [refetchTrigger, chainId, account.address]);
   return {
     isTokensLoading,
     isTokensError,

package/reactjs/index.js

@@ -36,7 +36,7 @@ const reactjs_hooks_validation_useSecondAmountSchema = require("./hooks/validati
 const reactjs_hooks_validation_useTestHasEnoughFunds = require("./hooks/validation/useTestHasEnoughFunds.js");
 const reactjs_hooks_validation_useTestIsConnected = require("./hooks/validation/useTestIsConnected.js");
 const reactjs_hooks_useAccount = require("./hooks/useAccount.js");
-const reactjs_hooks_useBalances = require("../useBalances-ok4GNkJ5.js");
+const reactjs_hooks_useBalances = require("./hooks/useBalances.js");
 const reactjs_hooks_useBridgeFormik = require("./hooks/useBridgeFormik.js");
 const reactjs_hooks_useDebounce = require("./hooks/useDebounce.js");
 const reactjs_hooks_useFetchBridgeData = require("./hooks/useFetchBridgeData.js");
@@ -48,7 +48,7 @@ const reactjs_hooks_useSignTransaction = require("./hooks/useSignTransaction.js"
 const reactjs_init_init = require("./init/init.js");
 const reactjs_queries_useGetAllTokens_query = require("./queries/useGetAllTokens.query.js");
 const reactjs_queries_useGetChains_query = require("./queries/useGetChains.query.js");
-const reactjs_queries_useGetEvmTokensBalances_query = require("./queries/useGetEvmTokensBalances.query.js");
+const reactjs_queries_useGetNonMvxTokensBalances_query = require("./queries/useGetNonMvxTokensBalances.query.js");
 const reactjs_queries_useGetHistory_query = require("./queries/useGetHistory.query.js");
 const reactjs_queries_useGetMvxTokensBalances_query = require("./queries/useGetMvxTokensBalances.query.js");
 const reactjs_queries_useGetRate_mutation = require("./queries/useGetRate.mutation.js");
@@ -116,8 +116,8 @@ exports.useSignTransaction = reactjs_hooks_useSignTransaction.useSignTransaction
 exports.init = reactjs_init_init.init;
 exports.useGetAllTokensQuery = reactjs_queries_useGetAllTokens_query.useGetAllTokensQuery;
 exports.useGetChainsQuery = reactjs_queries_useGetChains_query.useGetChainsQuery;
-exports.invalidateEvmTokensBalances = reactjs_queries_useGetEvmTokensBalances_query.invalidateEvmTokensBalances;
-exports.useGetEvmTokensBalancesQuery = reactjs_queries_useGetEvmTokensBalances_query.useGetEvmTokensBalancesQuery;
+exports.invalidateEvmTokensBalances = reactjs_queries_useGetNonMvxTokensBalances_query.invalidateEvmTokensBalances;
+exports.useGetNonMvxTokensBalancesQuery = reactjs_queries_useGetNonMvxTokensBalances_query.useGetNonMvxTokensBalancesQuery;
 exports.invalidateHistoryQuery = reactjs_queries_useGetHistory_query.invalidateHistoryQuery;
 exports.useGetHistoryQuery = reactjs_queries_useGetHistory_query.useGetHistoryQuery;
 exports.invalidateMvxTokensBalancesQuery = reactjs_queries_useGetMvxTokensBalances_query.invalidateMvxTokensBalancesQuery;

package/reactjs/index.mjs

@@ -33,7 +33,7 @@ import { useSecondAmountSchema } from "./hooks/validation/useSecondAmountSchema.
 import { useTestHasEnoughFunds } from "./hooks/validation/useTestHasEnoughFunds.mjs";
 import { useTestIsConnected } from "./hooks/validation/useTestIsConnected.mjs";
 import { useAccount } from "./hooks/useAccount.mjs";
-import { u } from "../useBalances-CtcrEcK2.mjs";
+import { useBalances } from "./hooks/useBalances.mjs";
 import { BridgeFormikValuesEnum, useBridgeFormik } from "./hooks/useBridgeFormik.mjs";
 import { useDebounce } from "./hooks/useDebounce.mjs";
 import { useFetchBridgeData } from "./hooks/useFetchBridgeData.mjs";
@@ -45,7 +45,7 @@ import { useSignTransaction } from "./hooks/useSignTransaction.mjs";
 import { init } from "./init/init.mjs";
 import { useGetAllTokensQuery } from "./queries/useGetAllTokens.query.mjs";
 import { useGetChainsQuery } from "./queries/useGetChains.query.mjs";
-import { invalidateEvmTokensBalances, useGetEvmTokensBalancesQuery } from "./queries/useGetEvmTokensBalances.query.mjs";
+import { invalidateEvmTokensBalances, useGetNonMvxTokensBalancesQuery } from "./queries/useGetNonMvxTokensBalances.query.mjs";
 import { invalidateHistoryQuery, useGetHistoryQuery } from "./queries/useGetHistory.query.mjs";
 import { invalidateMvxTokensBalancesQuery, useGetMvxTokensBalancesQuery } from "./queries/useGetMvxTokensBalances.query.mjs";
 import { useGetRateMutation } from "./queries/useGetRate.mutation.mjs";
@@ -124,7 +124,7 @@ export {
   useAppKitProvider,
   useAppKitState,
   useAppKitTheme,
-  u as useBalances,
+  useBalances,
   useBridgeFormik,
   useDebounce,
   useDisconnect,
@@ -133,9 +133,9 @@ export {
   useGetAllTokensQuery,
   useGetChainId,
   useGetChainsQuery,
-  useGetEvmTokensBalancesQuery,
   useGetHistoryQuery,
   useGetMvxTokensBalancesQuery,
+  useGetNonMvxTokensBalancesQuery,
   useGetRateMutation,
   useResolveTokenChain,
   useSecondAmountSchema,

package/reactjs/queries/index.d.ts

@@ -1,6 +1,6 @@
 export * from './useGetAllTokens.query';
 export * from './useGetChains.query';
-export * from './useGetEvmTokensBalances.query';
+export * from './useGetNonMvxTokensBalances.query';
 export * from './useGetHistory.query';
 export * from './useGetMvxTokensBalances.query';
 export * from './useGetRate.mutation';

package/reactjs/queries/index.js

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const reactjs_queries_useGetAllTokens_query = require("./useGetAllTokens.query.js");
 const reactjs_queries_useGetChains_query = require("./useGetChains.query.js");
-const reactjs_queries_useGetEvmTokensBalances_query = require("./useGetEvmTokensBalances.query.js");
+const reactjs_queries_useGetNonMvxTokensBalances_query = require("./useGetNonMvxTokensBalances.query.js");
 const reactjs_queries_useGetHistory_query = require("./useGetHistory.query.js");
 const reactjs_queries_useGetMvxTokensBalances_query = require("./useGetMvxTokensBalances.query.js");
 const reactjs_queries_useGetRate_mutation = require("./useGetRate.mutation.js");
 exports.useGetAllTokensQuery = reactjs_queries_useGetAllTokens_query.useGetAllTokensQuery;
 exports.useGetChainsQuery = reactjs_queries_useGetChains_query.useGetChainsQuery;
-exports.invalidateEvmTokensBalances = reactjs_queries_useGetEvmTokensBalances_query.invalidateEvmTokensBalances;
-exports.useGetEvmTokensBalancesQuery = reactjs_queries_useGetEvmTokensBalances_query.useGetEvmTokensBalancesQuery;
+exports.invalidateEvmTokensBalances = reactjs_queries_useGetNonMvxTokensBalances_query.invalidateEvmTokensBalances;
+exports.useGetNonMvxTokensBalancesQuery = reactjs_queries_useGetNonMvxTokensBalances_query.useGetNonMvxTokensBalancesQuery;
 exports.invalidateHistoryQuery = reactjs_queries_useGetHistory_query.invalidateHistoryQuery;
 exports.useGetHistoryQuery = reactjs_queries_useGetHistory_query.useGetHistoryQuery;
 exports.invalidateMvxTokensBalancesQuery = reactjs_queries_useGetMvxTokensBalances_query.invalidateMvxTokensBalancesQuery;

package/reactjs/queries/index.mjs

@@ -1,6 +1,6 @@
 import { useGetAllTokensQuery } from "./useGetAllTokens.query.mjs";
 import { useGetChainsQuery } from "./useGetChains.query.mjs";
-import { invalidateEvmTokensBalances, useGetEvmTokensBalancesQuery } from "./useGetEvmTokensBalances.query.mjs";
+import { invalidateEvmTokensBalances, useGetNonMvxTokensBalancesQuery } from "./useGetNonMvxTokensBalances.query.mjs";
 import { invalidateHistoryQuery, useGetHistoryQuery } from "./useGetHistory.query.mjs";
 import { invalidateMvxTokensBalancesQuery, useGetMvxTokensBalancesQuery } from "./useGetMvxTokensBalances.query.mjs";
 import { useGetRateMutation } from "./useGetRate.mutation.mjs";
@@ -10,8 +10,8 @@ export {
   invalidateMvxTokensBalancesQuery,
   useGetAllTokensQuery,
   useGetChainsQuery,
-  useGetEvmTokensBalancesQuery,
   useGetHistoryQuery,
   useGetMvxTokensBalancesQuery,
+  useGetNonMvxTokensBalancesQuery,
   useGetRateMutation
 };

package/reactjs/queries/useCheckAccount.query.d.ts

@@ -1,3 +1,3 @@
 import { AxiosError } from 'axios';
 
-export declare const useCheckAccountQuery: () => import('@tanstack/react-query').UseQueryResult<import('../../dto/CheckAccount.dto.ts').CheckAccountDto, AxiosError<unknown, any>>;
+export declare const useCheckAccountQuery: () => import('@tanstack/react-query').UseQueryResult<import('../../dto/CheckAccount.dto').CheckAccountDto, AxiosError<unknown, any>>;

package/reactjs/queries/useCheckAccount.query.js

@@ -11,12 +11,12 @@ require("react");
 require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
 require("../../bignumber-B8vjg9qn.js");
 require("wagmi");
-require("@solana/web3.js");
 require("axios");
-const reactjs_hooks_useGetChainId = require("../hooks/useGetChainId.js");
 require("formik");
+const reactjs_hooks_useGetChainId = require("../hooks/useGetChainId.js");
 require("../constants/index.js");
 require("@reown/appkit-adapter-solana/react");
+require("@solana/web3.js");
 const useCheckAccountQuery = () => {
   const { address } = react.useAppKitAccount();
   const chainId = reactjs_hooks_useGetChainId.useGetChainId();