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

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-Vfi3IkES.js");
+const reactjs_hooks_useBalances = require("./useBalances-BwQplEkY.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-DTvWU9si.mjs";
+import { u } from "./useBalances-BWufkhuy.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.20",
+  "version": "1.1.0-alpha.22",
   "main": "index.js",
   "module": "index.mjs",
   "types": "index.d.ts",

package/reactjs/components/BridgeForm/BridgeForm.d.ts

@@ -4,6 +4,8 @@ interface BridgeFormProps {
     username?: string;
     nativeAuthToken?: string;
     callbackRoute?: string;
+    firstTokenIdentifier?: string;
+    secondTokenIdentifier?: string;
     refetchTrigger?: number;
     showHistory?: boolean;
     onSuccessfullySentTransaction?: (txHashes?: string[]) => void;
@@ -13,5 +15,5 @@ interface BridgeFormProps {
     onMvxDisconnect?: () => void;
     onNavigate?: (url: string, options?: object) => void;
 }
-export declare const BridgeForm: ({ mvxChainId, mvxAddress, username, nativeAuthToken, callbackRoute, refetchTrigger, showHistory, onSuccessfullySentTransaction, onFailedSentTransaction, onHistoryClose, onMvxConnect, onMvxDisconnect, onNavigate }: BridgeFormProps) => import("react/jsx-runtime").JSX.Element;
+export declare const BridgeForm: ({ mvxChainId, mvxAddress, username, nativeAuthToken, callbackRoute, firstTokenIdentifier, secondTokenIdentifier, refetchTrigger, showHistory, onSuccessfullySentTransaction, onFailedSentTransaction, onHistoryClose, onMvxConnect, onMvxDisconnect, onNavigate }: BridgeFormProps) => import("react/jsx-runtime").JSX.Element;
 export {};

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-Vfi3IkES.js");
+const reactjs_hooks_useBalances = require("../../../useBalances-BwQplEkY.js");
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -123,6 +123,8 @@ const BridgeForm = ({
   username,
   nativeAuthToken,
   callbackRoute = "/",
+  firstTokenIdentifier,
+  secondTokenIdentifier,
   refetchTrigger,
   showHistory,
   onSuccessfullySentTransaction,
@@ -310,12 +312,6 @@ const BridgeForm = ({
     },
     [callbackRoute, isTokensLoading, onNavigate]
   );
-  console.log("BridgeForm", {
-    firstToken,
-    secondToken,
-    fromOptions,
-    toOptions
-  });
   const onChangeFirstSelect = React.useCallback(
     (option) => {
       if (!option) {
@@ -361,7 +357,10 @@ const BridgeForm = ({
     if (isTokensLoading || initializedInitialTokensRef.current) {
       return;
     }
-    const initialTokens = reactjs_utils_getInitialTokens.getInitialTokens();
+    const initialTokens = reactjs_utils_getInitialTokens.getInitialTokens({
+      firstTokenId: firstTokenIdentifier,
+      secondTokenId: secondTokenIdentifier
+    });
     const firstOption = (fromOptions == null ? void 0 : fromOptions.find(
       ({ identifier }) => (initialTokens == null ? void 0 : initialTokens.firstTokenId) === identifier
     )) ?? fromOptions.find(
@@ -465,9 +464,6 @@ const BridgeForm = ({
                   console.error("No bitcoin params");
                   break;
                 }
-                console.log({
-                  transaction
-                });
                 const psbt = await bitcoin.signTransaction(
                   transaction.bitcoinParams
                 );
@@ -735,7 +731,7 @@ const BridgeForm = ({
             reactjs_components_Connect_MvxConnectButton.MvxConnectButton,
             {
               mvxAccountAddress: mvxAddress,
-              chain: mvxChain,
+              icon: mvxChain == null ? void 0 : mvxChain.svgUrl,
               onClick: onMvxConnect
             }
           ),

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-DTvWU9si.mjs";
+import { g as getAction } from "../../../useBalances-BWufkhuy.mjs";
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -120,6 +120,8 @@ const BridgeForm = ({
   username,
   nativeAuthToken,
   callbackRoute = "/",
+  firstTokenIdentifier,
+  secondTokenIdentifier,
   refetchTrigger,
   showHistory,
   onSuccessfullySentTransaction,
@@ -307,12 +309,6 @@ const BridgeForm = ({
     },
     [callbackRoute, isTokensLoading, onNavigate]
   );
-  console.log("BridgeForm", {
-    firstToken,
-    secondToken,
-    fromOptions,
-    toOptions
-  });
   const onChangeFirstSelect = useCallback(
     (option) => {
       if (!option) {
@@ -358,7 +354,10 @@ const BridgeForm = ({
     if (isTokensLoading || initializedInitialTokensRef.current) {
       return;
     }
-    const initialTokens = getInitialTokens();
+    const initialTokens = getInitialTokens({
+      firstTokenId: firstTokenIdentifier,
+      secondTokenId: secondTokenIdentifier
+    });
     const firstOption = (fromOptions == null ? void 0 : fromOptions.find(
       ({ identifier }) => (initialTokens == null ? void 0 : initialTokens.firstTokenId) === identifier
     )) ?? fromOptions.find(
@@ -462,9 +461,6 @@ const BridgeForm = ({
                   console.error("No bitcoin params");
                   break;
                 }
-                console.log({
-                  transaction
-                });
                 const psbt = await bitcoin.signTransaction(
                   transaction.bitcoinParams
                 );
@@ -732,7 +728,7 @@ const BridgeForm = ({
             MvxConnectButton,
             {
               mvxAccountAddress: mvxAddress,
-              chain: mvxChain,
+              icon: mvxChain == null ? void 0 : mvxChain.svgUrl,
               onClick: onMvxConnect
             }
           ),

package/reactjs/components/BridgeHistory/BridgeHistory.js

@@ -179,7 +179,16 @@ const BridgeHistory = ({
                     "liq-text-red-200": transaction.status === "failed"
                   }),
                   children: [
-                    transaction.statusIcon,
+                    /* @__PURE__ */ jsxRuntime.jsx(
+                      reactjs_components_base_MxTooltip_MxTooltip.MxTooltip,
+                      {
+                        placement: "top",
+                        buttonText: transaction.statusIcon,
+                        children: new Date(
+                          transaction.depositTimestamp * 1e3
+                        ).toLocaleString()
+                      }
+                    ),
                     constants_index.MVX_CHAIN_IDS.includes(transaction.toChainId) ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
                       /* @__PURE__ */ jsxRuntime.jsx(
                         reactjs_components_base_MxTooltip_MxTooltip.MxTooltip,

package/reactjs/components/BridgeHistory/BridgeHistory.mjs

@@ -176,7 +176,16 @@ const BridgeHistory = ({
                     "liq-text-red-200": transaction.status === "failed"
                   }),
                   children: [
-                    transaction.statusIcon,
+                    /* @__PURE__ */ jsx(
+                      MxTooltip,
+                      {
+                        placement: "top",
+                        buttonText: transaction.statusIcon,
+                        children: new Date(
+                          transaction.depositTimestamp * 1e3
+                        ).toLocaleString()
+                      }
+                    ),
                     MVX_CHAIN_IDS.includes(transaction.toChainId) ? /* @__PURE__ */ jsxs(Fragment, { children: [
                       /* @__PURE__ */ jsx(
                         MxTooltip,

package/reactjs/components/Connect/MvxConnectButton.d.ts

@@ -1,11 +1,9 @@
-import { ChainDTO } from '../../../dto/Chain.dto';
-
 interface ConnectButtonProps {
     mvxAccountAddress?: string;
-    chain?: ChainDTO;
+    icon?: string;
     disabled?: boolean;
     className?: string;
     onClick?: () => void;
 }
-export declare const MvxConnectButton: ({ mvxAccountAddress, chain, disabled, className, onClick }: ConnectButtonProps) => import("react/jsx-runtime").JSX.Element | null;
+export declare const MvxConnectButton: ({ mvxAccountAddress, icon, disabled, className, onClick }: ConnectButtonProps) => import("react/jsx-runtime").JSX.Element | null;
 export {};

package/reactjs/components/Connect/MvxConnectButton.js

@@ -6,7 +6,7 @@ const reactjs_utils_mxClsx = require("../../utils/mxClsx.js");
 const reactjs_components_base_MxButton_MxButton = require("../base/MxButton/MxButton.js");
 const MvxConnectButton = ({
   mvxAccountAddress,
-  chain,
+  icon,
   disabled,
   className = "",
   onClick
@@ -30,7 +30,7 @@ const MvxConnectButton = ({
         /* @__PURE__ */ jsxRuntime.jsx(
           "img",
           {
-            src: (chain == null ? void 0 : chain.svgUrl) ?? "",
+            src: icon ?? "",
             alt: "",
             className: "liq-h-[1.5rem] liq-w-[1.5rem]"
           }

package/reactjs/components/Connect/MvxConnectButton.mjs

@@ -3,7 +3,7 @@ import { mxClsx } from "../../utils/mxClsx.mjs";
 import { MxButton } from "../base/MxButton/MxButton.mjs";
 const MvxConnectButton = ({
   mvxAccountAddress,
-  chain,
+  icon,
   disabled,
   className = "",
   onClick
@@ -27,7 +27,7 @@ const MvxConnectButton = ({
         /* @__PURE__ */ jsx(
           "img",
           {
-            src: (chain == null ? void 0 : chain.svgUrl) ?? "",
+            src: icon ?? "",
             alt: "",
             className: "liq-h-[1.5rem] liq-w-[1.5rem]"
           }

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

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-Vfi3IkES.js");
+const reactjs_hooks_useBalances = require("../../useBalances-BwQplEkY.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-DTvWU9si.mjs";
+import { u } from "../../useBalances-BWufkhuy.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-Vfi3IkES.js");
+const reactjs_hooks_useBalances = require("../useBalances-BwQplEkY.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-DTvWU9si.mjs";
+import { u } from "../useBalances-BWufkhuy.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-Vfi3IkES.js");
+const reactjs_hooks_useBalances = require("../../useBalances-BwQplEkY.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-DTvWU9si.mjs";
+import { u as useBalances } from "../../useBalances-BWufkhuy.mjs";
 import "formik";
 import "axios";
 import "../context/Web3AppProvider.mjs";

package/reactjs/utils/getInitialTokens.d.ts

@@ -2,7 +2,10 @@ export interface InitialTokensType {
     firstTokenId?: string;
     secondTokenId?: string;
 }
-export declare const getInitialTokens: () => {
+export declare const getInitialTokens: (initialTokens?: {
+    firstTokenId?: string;
+    secondTokenId?: string;
+}) => {
     firstTokenId: string;
     secondTokenId: string;
 };

package/reactjs/utils/getInitialTokens.js

@@ -2,12 +2,12 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const reactjs_constants_index = require("../constants/index.js");
-const getInitialTokens = () => {
+const getInitialTokens = (initialTokens) => {
   const urlParams = new URLSearchParams(reactjs_constants_index.safeWindow.location.search);
   const { firstToken, secondToken } = Object.fromEntries(urlParams);
   return {
-    firstTokenId: firstToken,
-    secondTokenId: secondToken
+    firstTokenId: (initialTokens == null ? void 0 : initialTokens.firstTokenId) || firstToken,
+    secondTokenId: (initialTokens == null ? void 0 : initialTokens.secondTokenId) || secondToken
   };
 };
 exports.getInitialTokens = getInitialTokens;

package/reactjs/utils/getInitialTokens.mjs

@@ -1,10 +1,10 @@
 import { safeWindow } from "../constants/index.mjs";
-const getInitialTokens = () => {
+const getInitialTokens = (initialTokens) => {
   const urlParams = new URLSearchParams(safeWindow.location.search);
   const { firstToken, secondToken } = Object.fromEntries(urlParams);
   return {
-    firstTokenId: firstToken,
-    secondTokenId: secondToken
+    firstTokenId: (initialTokens == null ? void 0 : initialTokens.firstTokenId) || firstToken,
+    secondTokenId: (initialTokens == null ? void 0 : initialTokens.secondTokenId) || secondToken
   };
 };
 export {

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

@@ -214,13 +214,13 @@ const useBalances = () => {
             };
           }
           const chainType = (_a = chainsMap[token.chainId]) == null ? void 0 : _a.chainType;
-          console.log("chainType", {
-            chainType
-          });
           try {
             let balance = BigInt(0);
             switch (chainType) {
               case ChainType.evm:
+                if ((activeChain == null ? void 0 : activeChain.chainType) !== ChainType.evm) {
+                  break;
+                }
                 balance = (await getBalance(config, {
                   address,
                   chainId: Number(token.chainId),
@@ -229,6 +229,9 @@ const useBalances = () => {
                 })).value;
                 break;
               case ChainType.sol:
+                if ((activeChain == null ? void 0 : activeChain.chainType) !== ChainType.sol) {
+                  break;
+                }
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
                   throw new Error(
                     `RPC URL not found for chain ID: ${token.chainId}`
@@ -237,6 +240,9 @@ const useBalances = () => {
                 balance = await getSolBalance(activeChain == null ? void 0 : activeChain.rpc, address);
                 break;
               case ChainType.btc:
+                if ((activeChain == null ? void 0 : activeChain.chainType) !== ChainType.btc) {
+                  break;
+                }
                 balance = await getBtcBalance();
                 break;
               case ChainType.mvx:

package/{useBalances-Vfi3IkES.js → useBalances-BwQplEkY.js}

@@ -216,13 +216,13 @@ const useBalances = () => {
             };
           }
           const chainType = (_a = chainsMap[token.chainId]) == null ? void 0 : _a.chainType;
-          console.log("chainType", {
-            chainType
-          });
           try {
             let balance = BigInt(0);
             switch (chainType) {
               case types_chainType.ChainType.evm:
+                if ((activeChain == null ? void 0 : activeChain.chainType) !== types_chainType.ChainType.evm) {
+                  break;
+                }
                 balance = (await getBalance(config, {
                   address,
                   chainId: Number(token.chainId),
@@ -231,6 +231,9 @@ const useBalances = () => {
                 })).value;
                 break;
               case types_chainType.ChainType.sol:
+                if ((activeChain == null ? void 0 : activeChain.chainType) !== types_chainType.ChainType.sol) {
+                  break;
+                }
                 if (!(activeChain == null ? void 0 : activeChain.rpc)) {
                   throw new Error(
                     `RPC URL not found for chain ID: ${token.chainId}`
@@ -239,6 +242,9 @@ const useBalances = () => {
                 balance = await getSolBalance(activeChain == null ? void 0 : activeChain.rpc, address);
                 break;
               case types_chainType.ChainType.btc:
+                if ((activeChain == null ? void 0 : activeChain.chainType) !== types_chainType.ChainType.btc) {
+                  break;
+                }
                 balance = await getBtcBalance();
                 break;
               case types_chainType.ChainType.mvx: