@multiversx/sdk-dapp-liquidity 1.1.0-alpha.13 → 1.1.0-alpha.14

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-QuJwkRzs.js");
+const reactjs_hooks_useBalances = require("./useBalances-CPQr6NnQ.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-MNOkt0CT.mjs";
+import { u } from "./useBalances-DZcebYxR.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.13",
+  "version": "1.1.0-alpha.14",
   "main": "index.js",
   "module": "index.mjs",
   "types": "index.d.ts",

package/reactjs/components/BridgeForm/BridgeForm.js

@@ -9,6 +9,7 @@ const debounce = require("lodash/debounce");
 const React = require("react");
 const reactToastify = require("react-toastify");
 const helpers_getApiURL = require("../../../helpers/getApiURL.js");
+const types_chainType = require("../../../types/chainType.js");
 const reactjs_constants_index = require("../../constants/index.js");
 const reactjs_context_useWeb3App = require("../../context/useWeb3App.js");
 const reactjs_hooks_useAccount = require("../../hooks/useAccount.js");
@@ -43,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-QuJwkRzs.js");
+const reactjs_hooks_useBalances = require("../../../useBalances-CPQr6NnQ.js");
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -163,7 +164,7 @@ const BridgeForm = ({
       (chain) => chain.chainId.toString() === mvxChainId.toString()
     );
   }, [chainId, chains]);
-  const { signTransaction } = reactjs_hooks_useSignTransaction.useSignTransaction();
+  const { evm, solana } = reactjs_hooks_useSignTransaction.useSignTransaction();
   const sendTransactions = reactjs_hooks_useSendTransactions.useSendTransactions();
   const {
     mutate: getRate,
@@ -188,15 +189,30 @@ 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);
+      }
+    }
+    return foundTokens;
+  }, [mvxTokensWithBalances, firstToken == null ? void 0 : firstToken.availableTokens]);
   const toOptions = React.useMemo(
-    () => (mvxTokensWithBalances && mvxTokensWithBalances.map((token) => {
+    () => (availableTokens && availableTokens.map((token) => {
       return {
         ...token,
         identifier: token.address,
         ticker: token.symbol
       };
     })) ?? [],
-    [mvxTokensWithBalances]
+    [availableTokens]
   );
   const selectedChainOption = React.useMemo(
     () => (chains == null ? void 0 : chains.find(
@@ -209,7 +225,7 @@ const BridgeForm = ({
     selectedChainOption
   });
   const defaultReceivingToken = React.useMemo(
-    () => toOptions.find((x) => x.symbol.toLowerCase().includes("usdc")),
+    () => toOptions.find((x) => x.symbol.toLowerCase().includes("egld")),
     [toOptions]
   );
   const hasAmounts = firstAmount !== "" && secondAmount !== "";
@@ -354,15 +370,18 @@ const BridgeForm = ({
     if (hasOptionsSelected) {
       return;
     }
-    if (!firstOption || !secondOption) {
-      return;
+    if (firstOption) {
+      setFirstToken(firstOption);
+      updateUrlParams({
+        firstTokenId: firstOption == null ? void 0 : firstOption.address
+      });
+    }
+    if (secondOption) {
+      setSecondToken(secondOption);
+      updateUrlParams({
+        secondTokenId: secondOption == null ? void 0 : secondOption.address
+      });
     }
-    setFirstToken(firstOption);
-    setSecondToken(secondOption);
-    updateUrlParams({
-      firstTokenId: firstOption == null ? void 0 : firstOption.address,
-      secondTokenId: secondOption == null ? void 0 : secondOption.address
-    });
   };
   const onSubmit = React.useCallback(
     async ({
@@ -373,51 +392,82 @@ const BridgeForm = ({
       setPendingSigning(true);
       setSigningTransactionsCount(() => transactions.length);
       try {
-        let txIndex = -1;
-        for (const transaction of transactions) {
-          ++txIndex;
-          try {
-            const txHash = await signTransaction({
-              ...transaction,
-              value: BigInt(transaction.value),
-              gas: BigInt(transaction.gasLimit),
-              account: bridgeAddress
-            });
-            signedTransactions.push({
-              ...transaction,
-              txHash
-            });
-            setSigningTransactionsCount(
-              () => transactions.length - 1 - txIndex
-            );
-            if (txIndex === transactions.length - 1) {
-              continue;
+        switch (selectedChainOption == null ? void 0 : selectedChainOption.chainType) {
+          case types_chainType.ChainType.sol:
+            try {
+              for (const transaction of transactions) {
+                if (!transaction.instructions || !transaction.feePayer) {
+                  continue;
+                }
+                await solana.signTransaction({
+                  feePayer: transaction.feePayer,
+                  instructions: transaction.instructions
+                });
+              }
+              setPendingSigning(false);
+            } catch (e) {
+              reactToastify.toast.dismiss();
+              reactToastify.toast.error("Transaction aborted");
+              onFailedSentTransaction == null ? void 0 : onFailedSentTransaction("Transaction aborted");
+              setPendingSigning(false);
+              return;
             }
-            const transactionReceipt = await waitForTransactionReceipt(config, {
-              confirmations: 1,
-              hash: txHash
-            });
-            console.info({
-              transactionReceipt,
-              hash: txHash
+            break;
+          case types_chainType.ChainType.evm:
+            let txIndex = -1;
+            for (const transaction of transactions) {
+              ++txIndex;
+              try {
+                const txHash = await evm.signTransaction({
+                  ...transaction,
+                  value: BigInt(transaction.value),
+                  gas: BigInt(transaction.gasLimit),
+                  account: bridgeAddress
+                });
+                signedTransactions.push({
+                  ...transaction,
+                  txHash
+                });
+                setSigningTransactionsCount(
+                  () => transactions.length - 1 - txIndex
+                );
+                if (txIndex === transactions.length - 1) {
+                  continue;
+                }
+                const transactionReceipt = await waitForTransactionReceipt(
+                  config,
+                  {
+                    confirmations: 1,
+                    hash: txHash
+                  }
+                );
+                console.info({
+                  transactionReceipt,
+                  hash: txHash
+                });
+              } catch (e) {
+                reactToastify.toast.dismiss();
+                reactToastify.toast.error("Transaction aborted");
+                onFailedSentTransaction == null ? void 0 : onFailedSentTransaction("Transaction aborted");
+                setPendingSigning(false);
+                return;
+              }
+            }
+            await sendTransactions({
+              transactions: signedTransactions,
+              provider,
+              url: helpers_getApiURL.getApiURL() ?? "",
+              token: nativeAuthToken ?? ""
             });
-          } catch (e) {
-            reactToastify.toast.dismiss();
-            reactToastify.toast.error("Transaction aborted");
-            onFailedSentTransaction == null ? void 0 : onFailedSentTransaction("Transaction aborted");
+            const txHashes = signedTransactions.map((tx) => tx.txHash);
+            onSuccess(txHashes);
+            setPendingSigning(false);
+            break;
+          default:
+            reactToastify.toast.error("Provider not supported");
             setPendingSigning(false);
             return;
-          }
         }
-        await sendTransactions({
-          transactions: signedTransactions,
-          provider,
-          url: helpers_getApiURL.getApiURL() ?? "",
-          token: nativeAuthToken ?? ""
-        });
-        const txHashes = signedTransactions.map((tx) => tx.txHash);
-        onSuccess(txHashes);
-        setPendingSigning(false);
       } catch (e) {
         console.error(e);
         reactToastify.toast.dismiss();
@@ -437,7 +487,7 @@ const BridgeForm = ({
       nativeAuthToken,
       onSuccess,
       sendTransactions,
-      signTransaction
+      evm.signTransaction
     ]
   );
   const {
@@ -491,7 +541,12 @@ const BridgeForm = ({
       setSecondAmount("0");
     }
   }, [rateValidationError]);
-  React.useEffect(setInitialSelectedTokens, [isTokensLoading, chainId]);
+  React.useEffect(setInitialSelectedTokens, [
+    isTokensLoading,
+    fromOptions,
+    toOptions,
+    chainId
+  ]);
   React.useEffect(() => {
     const selectedTokenOption = evmTokensWithBalances == null ? void 0 : evmTokensWithBalances.find(
       (x) => x.address === (firstToken == null ? void 0 : firstToken.address)
@@ -631,10 +686,11 @@ const BridgeForm = ({
                   reactjs_components_TokenSelector_TokenSelector.TokenSelector,
                   {
                     name: "secondToken",
-                    disabled: true,
+                    disabled: isPendingRate,
                     omitDisableClass: true,
                     options: toOptions,
                     areOptionsLoading: isTokensLoading,
+                    isMvxSelector: true,
                     color: "neutral-850",
                     onChange: onChangeSecondSelect,
                     onBlur: handleBlur,

package/reactjs/components/BridgeForm/BridgeForm.mjs

@@ -6,6 +6,7 @@ import debounce from "lodash/debounce";
 import { useRef, useState, useMemo, useCallback, useEffect } from "react";
 import { toast } from "react-toastify";
 import { getApiURL } from "../../../helpers/getApiURL.mjs";
+import { ChainType } from "../../../types/chainType.mjs";
 import { safeWindow } from "../../constants/index.mjs";
 import { useWeb3App } from "../../context/useWeb3App.mjs";
 import { useAccount } from "../../hooks/useAccount.mjs";
@@ -40,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-MNOkt0CT.mjs";
+import { g as getAction } from "../../../useBalances-DZcebYxR.mjs";
 function deepEqual(a, b) {
   if (a === b)
     return true;
@@ -160,7 +161,7 @@ const BridgeForm = ({
       (chain) => chain.chainId.toString() === mvxChainId.toString()
     );
   }, [chainId, chains]);
-  const { signTransaction } = useSignTransaction();
+  const { evm, solana } = useSignTransaction();
   const sendTransactions = useSendTransactions();
   const {
     mutate: getRate,
@@ -185,15 +186,30 @@ 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);
+      }
+    }
+    return foundTokens;
+  }, [mvxTokensWithBalances, firstToken == null ? void 0 : firstToken.availableTokens]);
   const toOptions = useMemo(
-    () => (mvxTokensWithBalances && mvxTokensWithBalances.map((token) => {
+    () => (availableTokens && availableTokens.map((token) => {
       return {
         ...token,
         identifier: token.address,
         ticker: token.symbol
       };
     })) ?? [],
-    [mvxTokensWithBalances]
+    [availableTokens]
   );
   const selectedChainOption = useMemo(
     () => (chains == null ? void 0 : chains.find(
@@ -206,7 +222,7 @@ const BridgeForm = ({
     selectedChainOption
   });
   const defaultReceivingToken = useMemo(
-    () => toOptions.find((x) => x.symbol.toLowerCase().includes("usdc")),
+    () => toOptions.find((x) => x.symbol.toLowerCase().includes("egld")),
     [toOptions]
   );
   const hasAmounts = firstAmount !== "" && secondAmount !== "";
@@ -351,15 +367,18 @@ const BridgeForm = ({
     if (hasOptionsSelected) {
       return;
     }
-    if (!firstOption || !secondOption) {
-      return;
+    if (firstOption) {
+      setFirstToken(firstOption);
+      updateUrlParams({
+        firstTokenId: firstOption == null ? void 0 : firstOption.address
+      });
+    }
+    if (secondOption) {
+      setSecondToken(secondOption);
+      updateUrlParams({
+        secondTokenId: secondOption == null ? void 0 : secondOption.address
+      });
     }
-    setFirstToken(firstOption);
-    setSecondToken(secondOption);
-    updateUrlParams({
-      firstTokenId: firstOption == null ? void 0 : firstOption.address,
-      secondTokenId: secondOption == null ? void 0 : secondOption.address
-    });
   };
   const onSubmit = useCallback(
     async ({
@@ -370,51 +389,82 @@ const BridgeForm = ({
       setPendingSigning(true);
       setSigningTransactionsCount(() => transactions.length);
       try {
-        let txIndex = -1;
-        for (const transaction of transactions) {
-          ++txIndex;
-          try {
-            const txHash = await signTransaction({
-              ...transaction,
-              value: BigInt(transaction.value),
-              gas: BigInt(transaction.gasLimit),
-              account: bridgeAddress
-            });
-            signedTransactions.push({
-              ...transaction,
-              txHash
-            });
-            setSigningTransactionsCount(
-              () => transactions.length - 1 - txIndex
-            );
-            if (txIndex === transactions.length - 1) {
-              continue;
+        switch (selectedChainOption == null ? void 0 : selectedChainOption.chainType) {
+          case ChainType.sol:
+            try {
+              for (const transaction of transactions) {
+                if (!transaction.instructions || !transaction.feePayer) {
+                  continue;
+                }
+                await solana.signTransaction({
+                  feePayer: transaction.feePayer,
+                  instructions: transaction.instructions
+                });
+              }
+              setPendingSigning(false);
+            } catch (e) {
+              toast.dismiss();
+              toast.error("Transaction aborted");
+              onFailedSentTransaction == null ? void 0 : onFailedSentTransaction("Transaction aborted");
+              setPendingSigning(false);
+              return;
             }
-            const transactionReceipt = await waitForTransactionReceipt(config, {
-              confirmations: 1,
-              hash: txHash
-            });
-            console.info({
-              transactionReceipt,
-              hash: txHash
+            break;
+          case ChainType.evm:
+            let txIndex = -1;
+            for (const transaction of transactions) {
+              ++txIndex;
+              try {
+                const txHash = await evm.signTransaction({
+                  ...transaction,
+                  value: BigInt(transaction.value),
+                  gas: BigInt(transaction.gasLimit),
+                  account: bridgeAddress
+                });
+                signedTransactions.push({
+                  ...transaction,
+                  txHash
+                });
+                setSigningTransactionsCount(
+                  () => transactions.length - 1 - txIndex
+                );
+                if (txIndex === transactions.length - 1) {
+                  continue;
+                }
+                const transactionReceipt = await waitForTransactionReceipt(
+                  config,
+                  {
+                    confirmations: 1,
+                    hash: txHash
+                  }
+                );
+                console.info({
+                  transactionReceipt,
+                  hash: txHash
+                });
+              } catch (e) {
+                toast.dismiss();
+                toast.error("Transaction aborted");
+                onFailedSentTransaction == null ? void 0 : onFailedSentTransaction("Transaction aborted");
+                setPendingSigning(false);
+                return;
+              }
+            }
+            await sendTransactions({
+              transactions: signedTransactions,
+              provider,
+              url: getApiURL() ?? "",
+              token: nativeAuthToken ?? ""
             });
-          } catch (e) {
-            toast.dismiss();
-            toast.error("Transaction aborted");
-            onFailedSentTransaction == null ? void 0 : onFailedSentTransaction("Transaction aborted");
+            const txHashes = signedTransactions.map((tx) => tx.txHash);
+            onSuccess(txHashes);
+            setPendingSigning(false);
+            break;
+          default:
+            toast.error("Provider not supported");
             setPendingSigning(false);
             return;
-          }
         }
-        await sendTransactions({
-          transactions: signedTransactions,
-          provider,
-          url: getApiURL() ?? "",
-          token: nativeAuthToken ?? ""
-        });
-        const txHashes = signedTransactions.map((tx) => tx.txHash);
-        onSuccess(txHashes);
-        setPendingSigning(false);
       } catch (e) {
         console.error(e);
         toast.dismiss();
@@ -434,7 +484,7 @@ const BridgeForm = ({
       nativeAuthToken,
       onSuccess,
       sendTransactions,
-      signTransaction
+      evm.signTransaction
     ]
   );
   const {
@@ -488,7 +538,12 @@ const BridgeForm = ({
       setSecondAmount("0");
     }
   }, [rateValidationError]);
-  useEffect(setInitialSelectedTokens, [isTokensLoading, chainId]);
+  useEffect(setInitialSelectedTokens, [
+    isTokensLoading,
+    fromOptions,
+    toOptions,
+    chainId
+  ]);
   useEffect(() => {
     const selectedTokenOption = evmTokensWithBalances == null ? void 0 : evmTokensWithBalances.find(
       (x) => x.address === (firstToken == null ? void 0 : firstToken.address)
@@ -628,10 +683,11 @@ const BridgeForm = ({
                   TokenSelector,
                   {
                     name: "secondToken",
-                    disabled: true,
+                    disabled: isPendingRate,
                     omitDisableClass: true,
                     options: toOptions,
                     areOptionsLoading: isTokensLoading,
+                    isMvxSelector: true,
                     color: "neutral-850",
                     onChange: onChangeSecondSelect,
                     onBlur: handleBlur,

package/reactjs/components/TokenSelector/TokenSelector.d.ts

@@ -1,11 +1,12 @@
 import { TokenType } from '../../../types/token';
 
-export declare const TokenSelector: ({ name, options, selectedOption, areOptionsLoading, className, disabled, omitDisableClass, color, onBlur, onChange, onMaxBtnClick, onTokenSelectorDisplay }: {
+export declare const TokenSelector: ({ name, options, selectedOption, areOptionsLoading, className, disabled, isMvxSelector, omitDisableClass, color, onBlur, onChange, onMaxBtnClick, onTokenSelectorDisplay }: {
     name: string;
     options: TokenType[];
     selectedOption?: TokenType;
     areOptionsLoading?: boolean;
     disabled?: boolean;
+    isMvxSelector?: boolean;
     omitDisableClass?: boolean;
     className?: string;
     color?: "neutral-750" | "neutral-850";

package/reactjs/components/TokenSelector/TokenSelector.js

@@ -22,6 +22,7 @@ const TokenSelector = ({
   areOptionsLoading = false,
   className = "",
   disabled = false,
+  isMvxSelector = false,
   omitDisableClass = false,
   color = "neutral-750",
   onBlur,
@@ -35,6 +36,11 @@ const TokenSelector = ({
     token: selectedOption
   });
   const chains = React.useMemo(() => {
+    if (isMvxSelector) {
+      return (data == null ? void 0 : data.filter(
+        (chain) => constants_index.MVX_CHAIN_IDS.includes(chain.chainId.toString())
+      )) ?? [];
+    }
     return (data == null ? void 0 : data.filter(
       (chain) => !constants_index.MVX_CHAIN_IDS.includes(chain.chainId.toString())
     )) ?? [];
@@ -77,6 +83,7 @@ const TokenSelector = ({
         },
         tokens: options,
         chains,
+        isMvxSelector: true,
         areChainsLoading,
         selectedToken: selectedOption
       }

package/reactjs/components/TokenSelector/TokenSelector.mjs

@@ -19,6 +19,7 @@ const TokenSelector = ({
   areOptionsLoading = false,
   className = "",
   disabled = false,
+  isMvxSelector = false,
   omitDisableClass = false,
   color = "neutral-750",
   onBlur,
@@ -32,6 +33,11 @@ const TokenSelector = ({
     token: selectedOption
   });
   const chains = useMemo(() => {
+    if (isMvxSelector) {
+      return (data == null ? void 0 : data.filter(
+        (chain) => MVX_CHAIN_IDS.includes(chain.chainId.toString())
+      )) ?? [];
+    }
     return (data == null ? void 0 : data.filter(
       (chain) => !MVX_CHAIN_IDS.includes(chain.chainId.toString())
     )) ?? [];
@@ -74,6 +80,7 @@ const TokenSelector = ({
         },
         tokens: options,
         chains,
+        isMvxSelector: true,
         areChainsLoading,
         selectedToken: selectedOption
       }

package/reactjs/components/TokenSelector/components/ChainSelect/ChainSelect.d.ts

@@ -1,8 +1,9 @@
 import { ChainDTO } from '../../../../../dto/Chain.dto';
 
-export declare const ChainSelect: ({ isLoading, selectedChainId, onChange, chains }: {
+export declare const ChainSelect: ({ isLoading, selectedChainId, ignoreAllChains, onChange, chains }: {
     isLoading?: boolean;
     selectedChainId?: string;
+    ignoreAllChains?: boolean;
     onChange?: (chainId: string) => void;
     chains: ChainDTO[];
 }) => import("react/jsx-runtime").JSX.Element;

package/reactjs/components/TokenSelector/components/ChainSelect/ChainSelect.js

@@ -12,6 +12,7 @@ const reactjs_constants_chains = require("../../../../constants/chains.js");
 const ChainSelect = ({
   isLoading,
   selectedChainId,
+  ignoreAllChains = false,
   onChange,
   chains
 }) => {
@@ -26,6 +27,9 @@ const ChainSelect = ({
         svgUrl: chain.svgUrl
       }
     }));
+    if (ignoreAllChains) {
+      return options;
+    }
     options.unshift({
       label: "All",
       value: reactjs_constants_chains.ALL_NETWORK_ID,

package/reactjs/components/TokenSelector/components/ChainSelect/ChainSelect.mjs

@@ -9,6 +9,7 @@ import { ALL_NETWORK_ID } from "../../../../constants/chains.mjs";
 const ChainSelect = ({
   isLoading,
   selectedChainId,
+  ignoreAllChains = false,
   onChange,
   chains
 }) => {
@@ -23,6 +24,9 @@ const ChainSelect = ({
         svgUrl: chain.svgUrl
       }
     }));
+    if (ignoreAllChains) {
+      return options;
+    }
     options.unshift({
       label: "All",
       value: ALL_NETWORK_ID,

package/reactjs/components/TokenSelector/components/SelectContent.d.ts

@@ -1,10 +1,11 @@
 import { TokenType } from '../../../../types/token';
 import { ChainDTO } from '../../../../dto/Chain.dto';
 
-export declare const SelectContent: ({ onSelect, tokens, chains, areChainsLoading, selectedToken }: {
+export declare const SelectContent: ({ onSelect, tokens, chains, isMvxSelector, areChainsLoading, selectedToken }: {
     onSelect: (token: TokenType) => void;
     tokens: TokenType[];
     chains: ChainDTO[];
+    isMvxSelector?: boolean;
     areChainsLoading?: boolean;
     selectedToken?: TokenType;
 }) => import("react/jsx-runtime").JSX.Element;

package/reactjs/components/TokenSelector/components/SelectContent.js

@@ -13,15 +13,17 @@ const SelectContent = ({
   onSelect,
   tokens = [],
   chains = [],
+  isMvxSelector = false,
   areChainsLoading,
   selectedToken
 }) => {
+  var _a;
   const [filteredTokens, setFilteredTokens] = React.useState(tokens);
   const [selected, setSelected] = React.useState(selectedToken);
   const searchPatternRef = React.useRef("");
   const activeChainId = reactjs_hooks_useGetChainId.useGetChainId();
   const [selectedChainId, setSelectedChainId] = React.useState(
-    (activeChainId == null ? void 0 : activeChainId.toString()) ?? reactjs_constants_chains.ALL_NETWORK_ID
+    isMvxSelector ? ((_a = chains[0]) == null ? void 0 : _a.chainId.toString()) ?? reactjs_constants_chains.ALL_NETWORK_ID : (activeChainId == null ? void 0 : activeChainId.toString()) ?? reactjs_constants_chains.ALL_NETWORK_ID
   );
   const filteredTokensText = React.useMemo(() => {
     const selectedChain = chains.find(
@@ -71,6 +73,7 @@ const SelectContent = ({
         reactjs_components_TokenSelector_components_ChainSelect_ChainSelect.ChainSelect,
         {
           chains,
+          ignoreAllChains: isMvxSelector,
           selectedChainId,
           onChange: (chainId) => {
             setSelectedChainId(chainId);

package/reactjs/components/TokenSelector/components/SelectContent.mjs

@@ -10,15 +10,17 @@ const SelectContent = ({
   onSelect,
   tokens = [],
   chains = [],
+  isMvxSelector = false,
   areChainsLoading,
   selectedToken
 }) => {
+  var _a;
   const [filteredTokens, setFilteredTokens] = useState(tokens);
   const [selected, setSelected] = useState(selectedToken);
   const searchPatternRef = useRef("");
   const activeChainId = useGetChainId();
   const [selectedChainId, setSelectedChainId] = useState(
-    (activeChainId == null ? void 0 : activeChainId.toString()) ?? ALL_NETWORK_ID
+    isMvxSelector ? ((_a = chains[0]) == null ? void 0 : _a.chainId.toString()) ?? ALL_NETWORK_ID : (activeChainId == null ? void 0 : activeChainId.toString()) ?? ALL_NETWORK_ID
   );
   const filteredTokensText = useMemo(() => {
     const selectedChain = chains.find(
@@ -68,6 +70,7 @@ const SelectContent = ({
         ChainSelect,
         {
           chains,
+          ignoreAllChains: isMvxSelector,
           selectedChainId,
           onChange: (chainId) => {
             setSelectedChainId(chainId);

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

package/reactjs/hooks/useBalances.js

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

package/reactjs/hooks/useBalances.mjs

@@ -10,9 +10,10 @@ import "yup";
 import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
 import "../../bignumber-CKZkoo0g.mjs";
 import "wagmi";
-import { u } from "../../useBalances-MNOkt0CT.mjs";
+import { u } from "../../useBalances-DZcebYxR.mjs";
 import "formik";
 import "../constants/index.mjs";
+import "@reown/appkit-adapter-solana/react";
 export {
   u as useBalances
 };

package/reactjs/hooks/useSignTransaction.d.ts

@@ -1,69 +1,82 @@
+import { ServerTransactionInstruction } from '../../types';
+import { Provider } from '@reown/appkit-adapter-solana/react';
+
 export declare const useSignTransaction: () => {
-    error: null;
-    status: "idle";
-    reset: () => void;
-    context: unknown;
-    variables: undefined;
-    isError: false;
-    isIdle: true;
-    isPending: false;
-    isSuccess: false;
-    failureCount: number;
-    failureReason: import('@wagmi/core').SendTransactionErrorType | null;
-    isPaused: boolean;
-    submittedAt: number;
-    sendTransaction: import('wagmi/query').SendTransactionMutate<import('wagmi').Config, unknown>;
-    hash: `0x${string}` | undefined;
-    signTransaction: import('wagmi/query').SendTransactionMutateAsync<import('wagmi').Config, unknown>;
-} | {
-    error: null;
-    status: "pending";
-    reset: () => void;
-    context: unknown;
-    variables: import('wagmi/query').SendTransactionVariables<import('wagmi').Config, number>;
-    isError: false;
-    isIdle: false;
-    isPending: true;
-    isSuccess: false;
-    failureCount: number;
-    failureReason: import('@wagmi/core').SendTransactionErrorType | null;
-    isPaused: boolean;
-    submittedAt: number;
-    sendTransaction: import('wagmi/query').SendTransactionMutate<import('wagmi').Config, unknown>;
-    hash: `0x${string}` | undefined;
-    signTransaction: import('wagmi/query').SendTransactionMutateAsync<import('wagmi').Config, unknown>;
-} | {
-    error: import('@wagmi/core').SendTransactionErrorType;
-    status: "error";
-    reset: () => void;
-    context: unknown;
-    variables: import('wagmi/query').SendTransactionVariables<import('wagmi').Config, number>;
-    isError: true;
-    isIdle: false;
-    isPending: false;
-    isSuccess: false;
-    failureCount: number;
-    failureReason: import('@wagmi/core').SendTransactionErrorType | null;
-    isPaused: boolean;
-    submittedAt: number;
-    sendTransaction: import('wagmi/query').SendTransactionMutate<import('wagmi').Config, unknown>;
-    hash: `0x${string}` | undefined;
-    signTransaction: import('wagmi/query').SendTransactionMutateAsync<import('wagmi').Config, unknown>;
-} | {
-    error: null;
-    status: "success";
-    reset: () => void;
-    context: unknown;
-    variables: import('wagmi/query').SendTransactionVariables<import('wagmi').Config, number>;
-    isError: false;
-    isIdle: false;
-    isPending: false;
-    isSuccess: true;
-    failureCount: number;
-    failureReason: import('@wagmi/core').SendTransactionErrorType | null;
-    isPaused: boolean;
-    submittedAt: number;
-    sendTransaction: import('wagmi/query').SendTransactionMutate<import('wagmi').Config, unknown>;
-    hash: `0x${string}` | undefined;
-    signTransaction: import('wagmi/query').SendTransactionMutateAsync<import('wagmi').Config, unknown>;
+    evm: {
+        error: null;
+        status: "idle";
+        reset: () => void;
+        context: unknown;
+        variables: undefined;
+        isError: false;
+        isIdle: true;
+        isPending: false;
+        isSuccess: false;
+        failureCount: number;
+        failureReason: import('@wagmi/core').SendTransactionErrorType | null;
+        isPaused: boolean;
+        submittedAt: number;
+        sendTransaction: import('wagmi/query').SendTransactionMutate<import('wagmi').Config, unknown>;
+        hash: `0x${string}` | undefined;
+        signTransaction: import('wagmi/query').SendTransactionMutateAsync<import('wagmi').Config, unknown>;
+    } | {
+        error: null;
+        status: "pending";
+        reset: () => void;
+        context: unknown;
+        variables: import('wagmi/query').SendTransactionVariables<import('wagmi').Config, number>;
+        isError: false;
+        isIdle: false;
+        isPending: true;
+        isSuccess: false;
+        failureCount: number;
+        failureReason: import('@wagmi/core').SendTransactionErrorType | null;
+        isPaused: boolean;
+        submittedAt: number;
+        sendTransaction: import('wagmi/query').SendTransactionMutate<import('wagmi').Config, unknown>;
+        hash: `0x${string}` | undefined;
+        signTransaction: import('wagmi/query').SendTransactionMutateAsync<import('wagmi').Config, unknown>;
+    } | {
+        error: import('@wagmi/core').SendTransactionErrorType;
+        status: "error";
+        reset: () => void;
+        context: unknown;
+        variables: import('wagmi/query').SendTransactionVariables<import('wagmi').Config, number>;
+        isError: true;
+        isIdle: false;
+        isPending: false;
+        isSuccess: false;
+        failureCount: number;
+        failureReason: import('@wagmi/core').SendTransactionErrorType | null;
+        isPaused: boolean;
+        submittedAt: number;
+        sendTransaction: import('wagmi/query').SendTransactionMutate<import('wagmi').Config, unknown>;
+        hash: `0x${string}` | undefined;
+        signTransaction: import('wagmi/query').SendTransactionMutateAsync<import('wagmi').Config, unknown>;
+    } | {
+        error: null;
+        status: "success";
+        reset: () => void;
+        context: unknown;
+        variables: import('wagmi/query').SendTransactionVariables<import('wagmi').Config, number>;
+        isError: false;
+        isIdle: false;
+        isPending: false;
+        isSuccess: true;
+        failureCount: number;
+        failureReason: import('@wagmi/core').SendTransactionErrorType | null;
+        isPaused: boolean;
+        submittedAt: number;
+        sendTransaction: import('wagmi/query').SendTransactionMutate<import('wagmi').Config, unknown>;
+        hash: `0x${string}` | undefined;
+        signTransaction: import('wagmi/query').SendTransactionMutateAsync<import('wagmi').Config, unknown>;
+    };
+    solana: {
+        signTransaction: ({ feePayer, instructions }: {
+            feePayer: string;
+            instructions: ServerTransactionInstruction[];
+        }) => Promise<void>;
+        connection: import('@solana/web3.js').Connection | undefined;
+        walletProvider: Provider;
+    };
 };

package/reactjs/hooks/useSignTransaction.js

@@ -1,17 +1,53 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const react$1 = require("@reown/appkit/react");
+const react = require("@reown/appkit-adapter-solana/react");
+const web3_js = require("@solana/web3.js");
 const wagmi = require("wagmi");
 const useSignTransaction = () => {
   const {
     data: hash,
-    sendTransactionAsync: signTransaction,
+    sendTransactionAsync: signEvmTransaction,
     ...rest
   } = wagmi.useSendTransaction();
+  const { connection } = react.useAppKitConnection();
+  const { walletProvider } = react$1.useAppKitProvider("solana");
+  async function signTransactionSolanaTransaction({
+    feePayer,
+    instructions
+  }) {
+    for (const instruction of instructions) {
+      const instructionData = Buffer.from(instruction.data);
+      const sender = new web3_js.PublicKey(instruction.keys[0].pubkey);
+      const receiver = new web3_js.PublicKey(instruction.keys[1].pubkey);
+      const transactionInstruction = new web3_js.TransactionInstruction({
+        keys: [
+          { pubkey: sender, isSigner: true, isWritable: true },
+          { pubkey: receiver, isSigner: false, isWritable: true }
+        ],
+        programId: new web3_js.PublicKey(instruction.programId),
+        data: instructionData
+      });
+      const transaction = new web3_js.Transaction().add(transactionInstruction);
+      transaction.feePayer = new web3_js.PublicKey(feePayer);
+      if (connection) {
+        transaction.recentBlockhash = (await connection.getLatestBlockhash("confirmed")).blockhash;
+      }
+      await walletProvider.signAndSendTransaction(transaction);
+    }
+  }
   return {
-    hash,
-    signTransaction,
-    ...rest
+    evm: {
+      hash,
+      signTransaction: signEvmTransaction,
+      ...rest
+    },
+    solana: {
+      signTransaction: signTransactionSolanaTransaction,
+      connection,
+      walletProvider
+    }
   };
 };
 exports.useSignTransaction = useSignTransaction;

package/reactjs/hooks/useSignTransaction.mjs

@@ -1,14 +1,50 @@
+import { useAppKitProvider } from "@reown/appkit/react";
+import { useAppKitConnection } from "@reown/appkit-adapter-solana/react";
+import { PublicKey, TransactionInstruction, Transaction } from "@solana/web3.js";
 import { useSendTransaction } from "wagmi";
 const useSignTransaction = () => {
   const {
     data: hash,
-    sendTransactionAsync: signTransaction,
+    sendTransactionAsync: signEvmTransaction,
     ...rest
   } = useSendTransaction();
+  const { connection } = useAppKitConnection();
+  const { walletProvider } = useAppKitProvider("solana");
+  async function signTransactionSolanaTransaction({
+    feePayer,
+    instructions
+  }) {
+    for (const instruction of instructions) {
+      const instructionData = Buffer.from(instruction.data);
+      const sender = new PublicKey(instruction.keys[0].pubkey);
+      const receiver = new PublicKey(instruction.keys[1].pubkey);
+      const transactionInstruction = new TransactionInstruction({
+        keys: [
+          { pubkey: sender, isSigner: true, isWritable: true },
+          { pubkey: receiver, isSigner: false, isWritable: true }
+        ],
+        programId: new PublicKey(instruction.programId),
+        data: instructionData
+      });
+      const transaction = new Transaction().add(transactionInstruction);
+      transaction.feePayer = new PublicKey(feePayer);
+      if (connection) {
+        transaction.recentBlockhash = (await connection.getLatestBlockhash("confirmed")).blockhash;
+      }
+      await walletProvider.signAndSendTransaction(transaction);
+    }
+  }
   return {
-    hash,
-    signTransaction,
-    ...rest
+    evm: {
+      hash,
+      signTransaction: signEvmTransaction,
+      ...rest
+    },
+    solana: {
+      signTransaction: signTransactionSolanaTransaction,
+      connection,
+      walletProvider
+    }
   };
 };
 export {

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-QuJwkRzs.js");
+const reactjs_hooks_useBalances = require("../useBalances-CPQr6NnQ.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-MNOkt0CT.mjs";
+import { u } from "../useBalances-DZcebYxR.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,11 +9,13 @@ require("react");
 require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
 require("../../bignumber-B8vjg9qn.js");
 require("wagmi");
-const reactjs_hooks_useBalances = require("../../useBalances-QuJwkRzs.js");
+const reactjs_hooks_useBalances = require("../../useBalances-CPQr6NnQ.js");
 require("formik");
 require("axios");
 require("../context/Web3AppProvider.js");
 require("../constants/index.js");
+require("@reown/appkit-adapter-solana/react");
+require("@solana/web3.js");
 const useGetEvmTokensBalancesQuery = ({
   tokens,
   chainId

package/reactjs/queries/useGetEvmTokensBalances.query.mjs

@@ -6,11 +6,13 @@ import "react";
 import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
 import "../../bignumber-CKZkoo0g.mjs";
 import "wagmi";
-import { u as useBalances } from "../../useBalances-MNOkt0CT.mjs";
+import { u as useBalances } from "../../useBalances-DZcebYxR.mjs";
 import "formik";
 import "axios";
 import "../context/Web3AppProvider.mjs";
 import "../constants/index.mjs";
+import "@reown/appkit-adapter-solana/react";
+import "@solana/web3.js";
 const useGetEvmTokensBalancesQuery = ({
   tokens,
   chainId

package/types/transaction.d.ts

@@ -1,5 +1,21 @@
 import { TransactionBase, Transaction as ViemTransaction } from 'viem/types/transaction';
 
+export type ServerTransactionInstruction = {
+    keys: [
+        {
+            pubkey: string;
+            isSigner: boolean;
+            isWritable: boolean;
+        },
+        {
+            pubkey: string;
+            isSigner: boolean;
+            isWritable: boolean;
+        }
+    ];
+    programId: string;
+    data: ArrayBuffer;
+};
 export type ServerTransaction = {
     to: `0x${string}`;
     data: `0x${string}`;
@@ -7,6 +23,9 @@ export type ServerTransaction = {
     value: bigint;
     account: string;
     txHash: string;
+    signatures?: string[];
+    feePayer?: string;
+    instructions?: ServerTransactionInstruction[];
 };
 export type TransactionType = TransactionBase & {
     account: `0x${string}`;

package/{useBalances-QuJwkRzs.js → useBalances-CPQr6NnQ.js}

@@ -14,6 +14,7 @@ require("./bignumber-B8vjg9qn.js");
 require("wagmi");
 require("formik");
 require("./reactjs/constants/index.js");
+require("@reown/appkit-adapter-solana/react");
 const viem = require("viem");
 const actions = require("viem/actions");
 function getAction(client, actionFn, name) {

package/{useBalances-MNOkt0CT.mjs → useBalances-DZcebYxR.mjs}

@@ -12,6 +12,7 @@ import "./bignumber-CKZkoo0g.mjs";
 import "wagmi";
 import "formik";
 import "./reactjs/constants/index.mjs";
+import "@reown/appkit-adapter-solana/react";
 import { weiUnits, ContractFunctionExecutionError, hexToString, trim, formatUnits } from "viem";
 import { multicall as multicall$1, readContract as readContract$1, getBalance as getBalance$1 } from "viem/actions";
 function getAction(client, actionFn, name) {