@multiversx/sdk-dapp-liquidity 1.1.0-alpha.19 → 1.1.0-alpha.20

package/index.js

@@ -53,7 +53,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-D7Fze-E_.js");
+const reactjs_hooks_useBalances = require("./useBalances-Vfi3IkES.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");

package/index.mjs

@@ -50,7 +50,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-B7J7g6dD.mjs";
+import { u } from "./useBalances-DTvWU9si.mjs";
 import { BridgeFormikValuesEnum, useBridgeFormik } from "./reactjs/hooks/useBridgeFormik.mjs";
 import { useDebounce } from "./reactjs/hooks/useDebounce.mjs";
 import { useFetchBridgeData } from "./reactjs/hooks/useFetchBridgeData.mjs";

package/package.json

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

package/reactjs/components/BridgeForm/BridgeForm.js

@@ -44,7 +44,7 @@ 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-D7Fze-E_.js");
+const reactjs_hooks_useBalances = require("../../../useBalances-Vfi3IkES.js");
 function deepEqual(a, b) {
   if (a === b)
     return true;

package/reactjs/components/BridgeForm/BridgeForm.mjs

@@ -41,7 +41,7 @@ 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-B7J7g6dD.mjs";
+import { g as getAction } from "../../../useBalances-DTvWU9si.mjs";
 function deepEqual(a, b) {
   if (a === b)
     return true;

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-D7Fze-E_.js");
+const reactjs_hooks_useBalances = require("../../useBalances-Vfi3IkES.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-B7J7g6dD.mjs";
+import { u } from "../../useBalances-DTvWU9si.mjs";
 import { BridgeFormikValuesEnum, useBridgeFormik } from "./useBridgeFormik.mjs";
 import { useDebounce } from "./useDebounce.mjs";
 import { useFetchBridgeData } from "./useFetchBridgeData.mjs";

package/reactjs/hooks/useBalances.d.ts

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

package/reactjs/hooks/useBalances.js

@@ -15,7 +15,7 @@ require("yup");
 require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
 require("../../bignumber-B8vjg9qn.js");
 require("wagmi");
-const reactjs_hooks_useBalances = require("../../useBalances-D7Fze-E_.js");
+const reactjs_hooks_useBalances = require("../../useBalances-Vfi3IkES.js");
 require("formik");
 require("../constants/index.js");
 require("@reown/appkit-adapter-solana/react");

package/reactjs/hooks/useBalances.mjs

@@ -12,7 +12,7 @@ import "yup";
 import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
 import "../../bignumber-CKZkoo0g.mjs";
 import "wagmi";
-import { u } from "../../useBalances-B7J7g6dD.mjs";
+import { u } from "../../useBalances-DTvWU9si.mjs";
 import "formik";
 import "../constants/index.mjs";
 import "@reown/appkit-adapter-solana/react";

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-D7Fze-E_.js");
+const reactjs_hooks_useBalances = require("../useBalances-Vfi3IkES.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");

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-B7J7g6dD.mjs";
+import { u } from "../useBalances-DTvWU9si.mjs";
 import { BridgeFormikValuesEnum, useBridgeFormik } from "./hooks/useBridgeFormik.mjs";
 import { useDebounce } from "./hooks/useDebounce.mjs";
 import { useFetchBridgeData } from "./hooks/useFetchBridgeData.mjs";

package/reactjs/queries/useGetEvmTokensBalances.query.js

@@ -9,7 +9,7 @@ require("react");
 require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
 require("../../bignumber-B8vjg9qn.js");
 require("wagmi");
-const reactjs_hooks_useBalances = require("../../useBalances-D7Fze-E_.js");
+const reactjs_hooks_useBalances = require("../../useBalances-Vfi3IkES.js");
 require("formik");
 require("axios");
 require("../context/Web3AppProvider.js");
@@ -31,7 +31,6 @@ const useGetEvmTokensBalancesQuery = ({
         throw new Error("Chain ID is required");
       }
       const assets = await fetchBalances({
-        chainId: chainId.toString(),
         tokens
       });
       return assets.map((asset) => {

package/reactjs/queries/useGetEvmTokensBalances.query.mjs

@@ -6,7 +6,7 @@ import "react";
 import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
 import "../../bignumber-CKZkoo0g.mjs";
 import "wagmi";
-import { u as useBalances } from "../../useBalances-B7J7g6dD.mjs";
+import { u as useBalances } from "../../useBalances-DTvWU9si.mjs";
 import "formik";
 import "axios";
 import "../context/Web3AppProvider.mjs";
@@ -28,7 +28,6 @@ const useGetEvmTokensBalancesQuery = ({
         throw new Error("Chain ID is required");
       }
       const assets = await fetchBalances({
-        chainId: chainId.toString(),
         tokens
       });
       return assets.map((asset) => {

package/{useBalances-B7J7g6dD.mjs → useBalances-DTvWU9si.mjs}

@@ -178,6 +178,15 @@ const useBalances = () => {
       (chain) => chain.chainId.toString() === (chainId == null ? void 0 : chainId.toString())
     );
   }, [chainId, chains]);
+  const chainsMap = useMemo(() => {
+    return (chains ?? []).reduce(
+      (acc, chain) => {
+        acc[chain.chainId.toString()] = chain;
+        return acc;
+      },
+      {}
+    );
+  }, [chains]);
   const getSolBalance = async (rpcUrl, addr) => {
     const connection = new Connection(rpcUrl);
     const publicKey = new PublicKey(addr);
@@ -197,41 +206,43 @@ const useBalances = () => {
     async ({ tokens }) => {
       return await Promise.all(
         tokens.map(async (token) => {
-          if (!isConnected || !address || !chainId) {
+          var _a;
+          if (!isConnected || !address || !token.chainId) {
             return {
               tokenId: token.address,
               balance: "0"
             };
           }
+          const chainType = (_a = chainsMap[token.chainId]) == null ? void 0 : _a.chainType;
+          console.log("chainType", {
+            chainType
+          });
           try {
             let balance = BigInt(0);
-            switch (activeChain == null ? void 0 : activeChain.chainType) {
+            switch (chainType) {
               case ChainType.evm:
                 balance = (await getBalance(config, {
                   address,
-                  chainId: Number(chainId),
+                  chainId: Number(token.chainId),
                   // omit passing the token for fetching the native currency balance
                   token: token.isNative ? void 0 : token.address
                 })).value;
                 break;
               case ChainType.sol:
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
-                  throw new Error(`RPC URL not found for chain ID: ${chainId}`);
+                  throw new Error(
+                    `RPC URL not found for chain ID: ${token.chainId}`
+                  );
                 }
                 balance = await getSolBalance(activeChain == null ? void 0 : activeChain.rpc, address);
                 break;
               case ChainType.btc:
-                if (!(activeChain == null ? void 0 : activeChain.rpc)) {
-                  throw new Error(`RPC URL not found for chain ID: ${chainId}`);
-                }
                 balance = await getBtcBalance();
                 break;
               case ChainType.mvx:
                 break;
               default:
-                throw new Error(
-                  `Unsupported chain type: ${activeChain == null ? void 0 : activeChain.chainType}`
-                );
+                throw new Error(`Unsupported chain type: ${chainType}`);
             }
             return {
               tokenId: token.address,
@@ -247,7 +258,7 @@ const useBalances = () => {
         })
       );
     },
-    [config, isConnected, address, chainId, activeChain == null ? void 0 : activeChain.rpc]
+    [config, isConnected, address, activeChain == null ? void 0 : activeChain.rpc]
   );
   return {
     fetchBalances

package/{useBalances-D7Fze-E_.js → useBalances-Vfi3IkES.js}

@@ -180,6 +180,15 @@ const useBalances = () => {
       (chain) => chain.chainId.toString() === (chainId == null ? void 0 : chainId.toString())
     );
   }, [chainId, chains]);
+  const chainsMap = React.useMemo(() => {
+    return (chains ?? []).reduce(
+      (acc, chain) => {
+        acc[chain.chainId.toString()] = chain;
+        return acc;
+      },
+      {}
+    );
+  }, [chains]);
   const getSolBalance = async (rpcUrl, addr) => {
     const connection = new web3_js.Connection(rpcUrl);
     const publicKey = new web3_js.PublicKey(addr);
@@ -199,41 +208,43 @@ const useBalances = () => {
     async ({ tokens }) => {
       return await Promise.all(
         tokens.map(async (token) => {
-          if (!isConnected || !address || !chainId) {
+          var _a;
+          if (!isConnected || !address || !token.chainId) {
             return {
               tokenId: token.address,
               balance: "0"
             };
           }
+          const chainType = (_a = chainsMap[token.chainId]) == null ? void 0 : _a.chainType;
+          console.log("chainType", {
+            chainType
+          });
           try {
             let balance = BigInt(0);
-            switch (activeChain == null ? void 0 : activeChain.chainType) {
+            switch (chainType) {
               case types_chainType.ChainType.evm:
                 balance = (await getBalance(config, {
                   address,
-                  chainId: Number(chainId),
+                  chainId: Number(token.chainId),
                   // omit passing the token for fetching the native currency balance
                   token: token.isNative ? void 0 : token.address
                 })).value;
                 break;
               case types_chainType.ChainType.sol:
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
-                  throw new Error(`RPC URL not found for chain ID: ${chainId}`);
+                  throw new Error(
+                    `RPC URL not found for chain ID: ${token.chainId}`
+                  );
                 }
                 balance = await getSolBalance(activeChain == null ? void 0 : activeChain.rpc, address);
                 break;
               case types_chainType.ChainType.btc:
-                if (!(activeChain == null ? void 0 : activeChain.rpc)) {
-                  throw new Error(`RPC URL not found for chain ID: ${chainId}`);
-                }
                 balance = await getBtcBalance();
                 break;
               case types_chainType.ChainType.mvx:
                 break;
               default:
-                throw new Error(
-                  `Unsupported chain type: ${activeChain == null ? void 0 : activeChain.chainType}`
-                );
+                throw new Error(`Unsupported chain type: ${chainType}`);
             }
             return {
               tokenId: token.address,
@@ -249,7 +260,7 @@ const useBalances = () => {
         })
       );
     },
-    [config, isConnected, address, chainId, activeChain == null ? void 0 : activeChain.rpc]
+    [config, isConnected, address, activeChain == null ? void 0 : activeChain.rpc]
   );
   return {
     fetchBalances