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

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-DtAB8tpU.js");
+const reactjs_hooks_useBalances = require("./useBalances-D7Fze-E_.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-C-yCGDYA.mjs";
+import { u } from "./useBalances-B7J7g6dD.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.18",
+  "version": "1.1.0-alpha.19",
   "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-DtAB8tpU.js");
+const reactjs_hooks_useBalances = require("../../../useBalances-D7Fze-E_.js");
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -134,6 +134,7 @@ const BridgeForm = ({
 }) => {
   var _a, _b, _c, _d, _e, _f;
   const ref = React.useRef(null);
+  const initializedInitialTokensRef = React.useRef(false);
   const [isTokenSelectorVisible, setIsTokenSelectorVisible] = React.useState(false);
   const [pendingSigning, setPendingSigning] = React.useState(false);
   const [siginingTransactionsCount, setSigningTransactionsCount] = React.useState(0);
@@ -189,30 +190,33 @@ const BridgeForm = ({
     })) ?? [],
     [evmTokensWithBalances]
   );
-  const availableTokens = React.useMemo(() => {
-    if (!(firstToken == null ? void 0 : firstToken.availableTokens)) {
-      return [];
-    }
-    const foundTokens = [];
-    for (const availableToken of firstToken.availableTokens) {
-      const foundToken = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
-        (mvxToken) => mvxToken.address === availableToken.address
-      );
-      if (foundToken) {
-        foundTokens.push(foundToken);
+  const getAvailableTokens = React.useCallback(
+    (option) => {
+      if (!(option == null ? void 0 : option.availableTokens)) {
+        return [];
       }
-    }
-    return foundTokens;
-  }, [mvxTokensWithBalances, firstToken == null ? void 0 : firstToken.availableTokens]);
+      const foundTokens = [];
+      for (const availableToken of option.availableTokens) {
+        const foundToken = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+          (mvxToken) => mvxToken.address === availableToken.address
+        );
+        if (foundToken) {
+          foundTokens.push(foundToken);
+        }
+      }
+      return foundTokens;
+    },
+    [mvxTokensWithBalances]
+  );
   const toOptions = React.useMemo(
-    () => (availableTokens && availableTokens.map((token) => {
+    () => ((firstToken == null ? void 0 : firstToken.availableTokens) && getAvailableTokens(firstToken).map((token) => {
       return {
         ...token,
         identifier: token.address,
         ticker: token.symbol
       };
     })) ?? [],
-    [availableTokens]
+    [firstToken == null ? void 0 : firstToken.availableTokens]
   );
   const selectedChainOption = React.useMemo(
     () => (chains == null ? void 0 : chains.find(
@@ -220,9 +224,11 @@ const BridgeForm = ({
     )) ?? (chains == null ? void 0 : chains[0]),
     [activeChain == null ? void 0 : activeChain.id, chains]
   );
-  const defaultReceivingToken = React.useMemo(
-    () => (availableTokens == null ? void 0 : availableTokens[0]) ?? toOptions.find((x) => x.symbol.toLowerCase().includes("usdc")),
-    [toOptions, availableTokens]
+  const getDefaultReceivingToken = React.useCallback(
+    (values) => values.find((x) => x.symbol.toLowerCase().includes("usdc")) ?? (mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+      (x) => x.symbol.toLowerCase().includes("usdc")
+    )),
+    [mvxTokensWithBalances]
   );
   const hasAmounts = firstAmount !== "" && secondAmount !== "";
   const fetchRateDebounced = React.useCallback(
@@ -285,7 +291,7 @@ const BridgeForm = ({
   );
   const updateUrlParams = React.useCallback(
     ({ firstTokenId, secondTokenId }) => {
-      if (isTokensLoading || !bridgeAddress) {
+      if (isTokensLoading) {
         return;
       }
       const currentUrl = reactjs_utils_getCompletePathname.getCompletePathname();
@@ -302,8 +308,14 @@ const BridgeForm = ({
       }
       onNavigate == null ? void 0 : onNavigate(newUrl, { replace: true });
     },
-    [bridgeAddress, callbackRoute, isTokensLoading, onNavigate]
+    [callbackRoute, isTokensLoading, onNavigate]
   );
+  console.log("BridgeForm", {
+    firstToken,
+    secondToken,
+    fromOptions,
+    toOptions
+  });
   const onChangeFirstSelect = React.useCallback(
     (option) => {
       if (!option) {
@@ -311,9 +323,13 @@ const BridgeForm = ({
       }
       setFirstToken(() => option);
       updateUrlParams({ firstTokenId: option == null ? void 0 : option.address });
-      const secondOption = toOptions.find(
-        (x) => x.symbol.toLowerCase() === (option == null ? void 0 : option.symbol.toLowerCase())
-      ) ?? defaultReceivingToken;
+      const availableTokens = getAvailableTokens(option);
+      const secondOption = availableTokens.find(
+        (x) => {
+          var _a2;
+          return x.symbol.toLowerCase() === ((_a2 = availableTokens == null ? void 0 : availableTokens[0]) == null ? void 0 : _a2.symbol.toLowerCase());
+        }
+      ) ?? getDefaultReceivingToken(availableTokens);
       if (!secondOption) {
         return;
       }
@@ -342,7 +358,7 @@ const BridgeForm = ({
   );
   const setInitialSelectedTokens = () => {
     var _a2, _b2, _c2, _d2;
-    if (isTokensLoading) {
+    if (isTokensLoading || initializedInitialTokensRef.current) {
       return;
     }
     const initialTokens = reactjs_utils_getInitialTokens.getInitialTokens();
@@ -353,31 +369,37 @@ const BridgeForm = ({
         var _a3;
         return option.chainId.toString() === ((_a3 = activeChain == null ? void 0 : activeChain.id) == null ? void 0 : _a3.toString());
       }
-    );
-    const secondOption = (toOptions == null ? void 0 : toOptions.find(
+    ) ?? (fromOptions == null ? void 0 : fromOptions[0]);
+    const availableTokens = getAvailableTokens(firstOption);
+    const secondOption = (availableTokens == null ? void 0 : availableTokens.find(
       ({ address }) => {
         var _a3;
         return address.toLowerCase() === ((_a3 = (firstOption == null ? void 0 : firstOption.symbol) ?? (initialTokens == null ? void 0 : initialTokens.secondTokenId)) == null ? void 0 : _a3.toLowerCase());
       }
-    )) ?? toOptions.find(
+    )) ?? availableTokens.find(
       (x) => x.symbol.toLowerCase() === (firstOption == null ? void 0 : firstOption.symbol.toLowerCase())
-    ) ?? defaultReceivingToken;
+    ) ?? getDefaultReceivingToken(availableTokens);
     const hasOptionsSelected = Boolean(firstToken) && Boolean(secondToken) && ((_a2 = firstToken == null ? void 0 : firstToken.address) == null ? void 0 : _a2.toLowerCase()) === ((_b2 = firstOption == null ? void 0 : firstOption.address) == null ? void 0 : _b2.toLowerCase()) && ((_c2 = secondToken == null ? void 0 : secondToken.address) == null ? void 0 : _c2.toLowerCase()) === ((_d2 = secondOption == null ? void 0 : secondOption.address) == null ? void 0 : _d2.toLowerCase());
     if (hasOptionsSelected) {
       return;
     }
+    let initializedFirstToken = false;
     if (firstOption) {
       setFirstToken(firstOption);
       updateUrlParams({
         firstTokenId: firstOption == null ? void 0 : firstOption.address
       });
+      initializedFirstToken = true;
     }
+    let initializedSecondToken = false;
     if (secondOption) {
       setSecondToken(secondOption);
       updateUrlParams({
         secondTokenId: secondOption == null ? void 0 : secondOption.address
       });
+      initializedSecondToken = true;
     }
+    initializedInitialTokensRef.current = initializedFirstToken && initializedSecondToken;
   };
   const onSubmit = React.useCallback(
     async ({
@@ -552,12 +574,7 @@ const BridgeForm = ({
       setSecondAmount("0");
     }
   }, [rateValidationError]);
-  React.useEffect(setInitialSelectedTokens, [
-    isTokensLoading,
-    fromOptions,
-    toOptions,
-    chainId
-  ]);
+  React.useEffect(setInitialSelectedTokens, [isTokensLoading, fromOptions]);
   React.useEffect(() => {
     const selectedTokenOption = evmTokensWithBalances == null ? void 0 : evmTokensWithBalances.find(
       (x) => x.address === (firstToken == null ? void 0 : firstToken.address)

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-C-yCGDYA.mjs";
+import { g as getAction } from "../../../useBalances-B7J7g6dD.mjs";
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -131,6 +131,7 @@ const BridgeForm = ({
 }) => {
   var _a, _b, _c, _d, _e, _f;
   const ref = useRef(null);
+  const initializedInitialTokensRef = useRef(false);
   const [isTokenSelectorVisible, setIsTokenSelectorVisible] = useState(false);
   const [pendingSigning, setPendingSigning] = useState(false);
   const [siginingTransactionsCount, setSigningTransactionsCount] = useState(0);
@@ -186,30 +187,33 @@ const BridgeForm = ({
     })) ?? [],
     [evmTokensWithBalances]
   );
-  const availableTokens = useMemo(() => {
-    if (!(firstToken == null ? void 0 : firstToken.availableTokens)) {
-      return [];
-    }
-    const foundTokens = [];
-    for (const availableToken of firstToken.availableTokens) {
-      const foundToken = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
-        (mvxToken) => mvxToken.address === availableToken.address
-      );
-      if (foundToken) {
-        foundTokens.push(foundToken);
+  const getAvailableTokens = useCallback(
+    (option) => {
+      if (!(option == null ? void 0 : option.availableTokens)) {
+        return [];
       }
-    }
-    return foundTokens;
-  }, [mvxTokensWithBalances, firstToken == null ? void 0 : firstToken.availableTokens]);
+      const foundTokens = [];
+      for (const availableToken of option.availableTokens) {
+        const foundToken = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+          (mvxToken) => mvxToken.address === availableToken.address
+        );
+        if (foundToken) {
+          foundTokens.push(foundToken);
+        }
+      }
+      return foundTokens;
+    },
+    [mvxTokensWithBalances]
+  );
   const toOptions = useMemo(
-    () => (availableTokens && availableTokens.map((token) => {
+    () => ((firstToken == null ? void 0 : firstToken.availableTokens) && getAvailableTokens(firstToken).map((token) => {
       return {
         ...token,
         identifier: token.address,
         ticker: token.symbol
       };
     })) ?? [],
-    [availableTokens]
+    [firstToken == null ? void 0 : firstToken.availableTokens]
   );
   const selectedChainOption = useMemo(
     () => (chains == null ? void 0 : chains.find(
@@ -217,9 +221,11 @@ const BridgeForm = ({
     )) ?? (chains == null ? void 0 : chains[0]),
     [activeChain == null ? void 0 : activeChain.id, chains]
   );
-  const defaultReceivingToken = useMemo(
-    () => (availableTokens == null ? void 0 : availableTokens[0]) ?? toOptions.find((x) => x.symbol.toLowerCase().includes("usdc")),
-    [toOptions, availableTokens]
+  const getDefaultReceivingToken = useCallback(
+    (values) => values.find((x) => x.symbol.toLowerCase().includes("usdc")) ?? (mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+      (x) => x.symbol.toLowerCase().includes("usdc")
+    )),
+    [mvxTokensWithBalances]
   );
   const hasAmounts = firstAmount !== "" && secondAmount !== "";
   const fetchRateDebounced = useCallback(
@@ -282,7 +288,7 @@ const BridgeForm = ({
   );
   const updateUrlParams = useCallback(
     ({ firstTokenId, secondTokenId }) => {
-      if (isTokensLoading || !bridgeAddress) {
+      if (isTokensLoading) {
         return;
       }
       const currentUrl = getCompletePathname();
@@ -299,8 +305,14 @@ const BridgeForm = ({
       }
       onNavigate == null ? void 0 : onNavigate(newUrl, { replace: true });
     },
-    [bridgeAddress, callbackRoute, isTokensLoading, onNavigate]
+    [callbackRoute, isTokensLoading, onNavigate]
   );
+  console.log("BridgeForm", {
+    firstToken,
+    secondToken,
+    fromOptions,
+    toOptions
+  });
   const onChangeFirstSelect = useCallback(
     (option) => {
       if (!option) {
@@ -308,9 +320,13 @@ const BridgeForm = ({
       }
       setFirstToken(() => option);
       updateUrlParams({ firstTokenId: option == null ? void 0 : option.address });
-      const secondOption = toOptions.find(
-        (x) => x.symbol.toLowerCase() === (option == null ? void 0 : option.symbol.toLowerCase())
-      ) ?? defaultReceivingToken;
+      const availableTokens = getAvailableTokens(option);
+      const secondOption = availableTokens.find(
+        (x) => {
+          var _a2;
+          return x.symbol.toLowerCase() === ((_a2 = availableTokens == null ? void 0 : availableTokens[0]) == null ? void 0 : _a2.symbol.toLowerCase());
+        }
+      ) ?? getDefaultReceivingToken(availableTokens);
       if (!secondOption) {
         return;
       }
@@ -339,7 +355,7 @@ const BridgeForm = ({
   );
   const setInitialSelectedTokens = () => {
     var _a2, _b2, _c2, _d2;
-    if (isTokensLoading) {
+    if (isTokensLoading || initializedInitialTokensRef.current) {
       return;
     }
     const initialTokens = getInitialTokens();
@@ -350,31 +366,37 @@ const BridgeForm = ({
         var _a3;
         return option.chainId.toString() === ((_a3 = activeChain == null ? void 0 : activeChain.id) == null ? void 0 : _a3.toString());
       }
-    );
-    const secondOption = (toOptions == null ? void 0 : toOptions.find(
+    ) ?? (fromOptions == null ? void 0 : fromOptions[0]);
+    const availableTokens = getAvailableTokens(firstOption);
+    const secondOption = (availableTokens == null ? void 0 : availableTokens.find(
       ({ address }) => {
         var _a3;
         return address.toLowerCase() === ((_a3 = (firstOption == null ? void 0 : firstOption.symbol) ?? (initialTokens == null ? void 0 : initialTokens.secondTokenId)) == null ? void 0 : _a3.toLowerCase());
       }
-    )) ?? toOptions.find(
+    )) ?? availableTokens.find(
       (x) => x.symbol.toLowerCase() === (firstOption == null ? void 0 : firstOption.symbol.toLowerCase())
-    ) ?? defaultReceivingToken;
+    ) ?? getDefaultReceivingToken(availableTokens);
     const hasOptionsSelected = Boolean(firstToken) && Boolean(secondToken) && ((_a2 = firstToken == null ? void 0 : firstToken.address) == null ? void 0 : _a2.toLowerCase()) === ((_b2 = firstOption == null ? void 0 : firstOption.address) == null ? void 0 : _b2.toLowerCase()) && ((_c2 = secondToken == null ? void 0 : secondToken.address) == null ? void 0 : _c2.toLowerCase()) === ((_d2 = secondOption == null ? void 0 : secondOption.address) == null ? void 0 : _d2.toLowerCase());
     if (hasOptionsSelected) {
       return;
     }
+    let initializedFirstToken = false;
     if (firstOption) {
       setFirstToken(firstOption);
       updateUrlParams({
         firstTokenId: firstOption == null ? void 0 : firstOption.address
       });
+      initializedFirstToken = true;
     }
+    let initializedSecondToken = false;
     if (secondOption) {
       setSecondToken(secondOption);
       updateUrlParams({
         secondTokenId: secondOption == null ? void 0 : secondOption.address
       });
+      initializedSecondToken = true;
     }
+    initializedInitialTokensRef.current = initializedFirstToken && initializedSecondToken;
   };
   const onSubmit = useCallback(
     async ({
@@ -549,12 +571,7 @@ const BridgeForm = ({
       setSecondAmount("0");
     }
   }, [rateValidationError]);
-  useEffect(setInitialSelectedTokens, [
-    isTokensLoading,
-    fromOptions,
-    toOptions,
-    chainId
-  ]);
+  useEffect(setInitialSelectedTokens, [isTokensLoading, fromOptions]);
   useEffect(() => {
     const selectedTokenOption = evmTokensWithBalances == null ? void 0 : evmTokensWithBalances.find(
       (x) => x.address === (firstToken == null ? void 0 : firstToken.address)

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

package/reactjs/hooks/useBalances.js

@@ -5,6 +5,7 @@ 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");
@@ -14,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-DtAB8tpU.js");
+const reactjs_hooks_useBalances = require("../../useBalances-D7Fze-E_.js");
 require("formik");
 require("../constants/index.js");
 require("@reown/appkit-adapter-solana/react");

package/reactjs/hooks/useBalances.mjs

@@ -2,6 +2,7 @@ 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";
@@ -11,7 +12,7 @@ import "yup";
 import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
 import "../../bignumber-CKZkoo0g.mjs";
 import "wagmi";
-import { u } from "../../useBalances-C-yCGDYA.mjs";
+import { u } from "../../useBalances-B7J7g6dD.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-DtAB8tpU.js");
+const reactjs_hooks_useBalances = require("../useBalances-D7Fze-E_.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-C-yCGDYA.mjs";
+import { u } from "../useBalances-B7J7g6dD.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-DtAB8tpU.js");
+const reactjs_hooks_useBalances = require("../../useBalances-D7Fze-E_.js");
 require("formik");
 require("axios");
 require("../context/Web3AppProvider.js");

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-C-yCGDYA.mjs";
+import { u as useBalances } from "../../useBalances-B7J7g6dD.mjs";
 import "formik";
 import "axios";
 import "../context/Web3AppProvider.mjs";

package/{useBalances-C-yCGDYA.mjs → useBalances-B7J7g6dD.mjs}

@@ -2,6 +2,7 @@ import { useAppKitAccount } from "@reown/appkit/react";
 import { Connection, PublicKey } from "@solana/web3.js";
 import axios from "axios";
 import { useMemo, useCallback } from "react";
+import { getApiURL } from "./helpers/getApiURL.mjs";
 import { useGetChainId } from "./reactjs/hooks/useGetChainId.mjs";
 import { ChainType } from "./types/chainType.mjs";
 import { useWeb3App } from "./reactjs/context/useWeb3App.mjs";
@@ -183,23 +184,13 @@ const useBalances = () => {
     const balance = await connection.getBalance(publicKey);
     return BigInt(balance.toString());
   };
-  const getBtcBalance = async (rpcUrl) => {
-    const url = `${rpcUrl}utxo/${address}`;
+  const getBtcBalance = async () => {
+    const url = `${getApiURL()}/user/balance/${address}`;
     try {
       const { data } = await axios.get(url);
-      const utxos = data || [];
-      if (!utxos || utxos.length === 0) {
-        throw new Error(`No UTXOs found for address ${address}`);
-      }
-      let totalInput = 0;
-      const chosenUtxos = [];
-      for (const utxo of utxos) {
-        chosenUtxos.push(utxo);
-        totalInput += Number(utxo.value);
-      }
-      return BigInt(totalInput);
+      return BigInt(data.balance);
     } catch (error) {
-      throw new Error(`Error fetching UTXOs from Trezor: ${error}`);
+      throw new Error(`Error fetching BTC balance: ${error}`);
     }
   };
   const fetchBalances = useCallback(
@@ -233,7 +224,7 @@ const useBalances = () => {
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
                   throw new Error(`RPC URL not found for chain ID: ${chainId}`);
                 }
-                balance = await getBtcBalance(activeChain == null ? void 0 : activeChain.rpc);
+                balance = await getBtcBalance();
                 break;
               case ChainType.mvx:
                 break;

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

@@ -4,6 +4,7 @@ const react = require("@reown/appkit/react");
 const web3_js = require("@solana/web3.js");
 const axios = require("axios");
 const React = require("react");
+const helpers_getApiURL = require("./helpers/getApiURL.js");
 const reactjs_hooks_useGetChainId = require("./reactjs/hooks/useGetChainId.js");
 const types_chainType = require("./types/chainType.js");
 const reactjs_context_useWeb3App = require("./reactjs/context/useWeb3App.js");
@@ -185,23 +186,13 @@ const useBalances = () => {
     const balance = await connection.getBalance(publicKey);
     return BigInt(balance.toString());
   };
-  const getBtcBalance = async (rpcUrl) => {
-    const url = `${rpcUrl}utxo/${address}`;
+  const getBtcBalance = async () => {
+    const url = `${helpers_getApiURL.getApiURL()}/user/balance/${address}`;
     try {
       const { data } = await axios.get(url);
-      const utxos = data || [];
-      if (!utxos || utxos.length === 0) {
-        throw new Error(`No UTXOs found for address ${address}`);
-      }
-      let totalInput = 0;
-      const chosenUtxos = [];
-      for (const utxo of utxos) {
-        chosenUtxos.push(utxo);
-        totalInput += Number(utxo.value);
-      }
-      return BigInt(totalInput);
+      return BigInt(data.balance);
     } catch (error) {
-      throw new Error(`Error fetching UTXOs from Trezor: ${error}`);
+      throw new Error(`Error fetching BTC balance: ${error}`);
     }
   };
   const fetchBalances = React.useCallback(
@@ -235,7 +226,7 @@ const useBalances = () => {
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
                   throw new Error(`RPC URL not found for chain ID: ${chainId}`);
                 }
-                balance = await getBtcBalance(activeChain == null ? void 0 : activeChain.rpc);
+                balance = await getBtcBalance();
                 break;
               case types_chainType.ChainType.mvx:
                 break;