@multiversx/sdk-dapp-liquidity 2.0.0-alpha.1 → 2.0.0-alpha.2

package/package.json

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

package/reactjs/components/BridgeHistory/BridgeHistory.js

@@ -10,10 +10,23 @@ const faClock = require("@fortawesome/free-solid-svg-icons/faClock");
 const faClose = require("@fortawesome/free-solid-svg-icons/faClose");
 const reactFontawesome = require("@fortawesome/react-fontawesome");
 const React = require("react");
-const constants_index = require("../../../constants/index.js");
-const types_providerType = require("../../../types/providerType.js");
+require("yup");
+require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
+require("bignumber.js");
+const reactjs_hooks_useAccount = require("../../hooks/useAccount.js");
+require("@reown/appkit/react");
+require("axios");
 const reactjs_context_useWeb3App = require("../../context/useWeb3App.js");
+require("formik");
+const types_providerType = require("../../../types/providerType.js");
 const reactjs_hooks_useFetchBridgeData = require("../../hooks/useFetchBridgeData.js");
+const constants_index = require("../../../constants/index.js");
+require("@tanstack/react-query");
+require("../../constants/index.js");
+require("@reown/appkit-adapter-solana/react");
+require("@solana/web3.js");
+require("wagmi");
+require("@reown/appkit-controllers");
 const reactjs_queries_useGetHistory_query = require("../../queries/useGetHistory.query.js");
 const reactjs_utils_formatAmount = require("../../utils/formatAmount.js");
 const reactjs_utils_mxClsx = require("../../utils/mxClsx.js");
@@ -28,10 +41,25 @@ const BridgeHistory = ({
   mvxAddress,
   onClose
 }) => {
-  const { options } = reactjs_context_useWeb3App.useWeb3App();
-  const { data, isLoading, isError } = reactjs_queries_useGetHistory_query.useGetHistoryQuery({
+  const { options, bridgeOnly } = reactjs_context_useWeb3App.useWeb3App();
+  const bridgeAccount = reactjs_hooks_useAccount.useAccount();
+  const {
+    data: mvxTransactions,
+    isLoading,
+    isError
+  } = reactjs_queries_useGetHistory_query.useGetHistoryQuery({
     address: mvxAddress
   });
+  const { data: bridgeTransactions } = reactjs_queries_useGetHistory_query.useGetHistoryQuery({
+    address: bridgeAccount.address ?? ""
+  });
+  const mergedTransactions = React.useMemo(() => {
+    const mvxTxs = mvxTransactions ?? [];
+    const bridgeTxs = bridgeOnly && bridgeTransactions ? bridgeTransactions : [];
+    return [...mvxTxs, ...bridgeTxs].sort(
+      (a, b) => b.depositTimestamp - a.depositTimestamp
+    );
+  }, [bridgeOnly, bridgeTransactions, mvxTransactions]);
   const resolveTransactionIcon = React.useCallback((transaction) => {
     switch (transaction.status) {
       case "success":
@@ -64,7 +92,7 @@ const BridgeHistory = ({
     }
   }, []);
   const transactions = React.useMemo(
-    () => data == null ? void 0 : data.map((transaction) => {
+    () => mergedTransactions == null ? void 0 : mergedTransactions.map((transaction) => {
       return {
         ...transaction,
         tokenDestination: transaction.tokenOut.toLowerCase(),
@@ -73,7 +101,7 @@ const BridgeHistory = ({
         statusIcon: resolveTransactionIcon(transaction)
       };
     }),
-    [data, resolveTransactionIcon]
+    [mergedTransactions, resolveTransactionIcon]
   );
   const {
     evmTokensWithBalances,

package/reactjs/components/BridgeHistory/BridgeHistory.mjs

@@ -6,11 +6,24 @@ import { faCircleXmark } from "@fortawesome/free-solid-svg-icons/faCircleXmark";
 import { faClock } from "@fortawesome/free-solid-svg-icons/faClock";
 import { faClose } from "@fortawesome/free-solid-svg-icons/faClose";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { useCallback, useMemo } from "react";
-import { MVX_CHAIN_IDS } from "../../../constants/index.mjs";
-import { ProviderType } from "../../../types/providerType.mjs";
+import { useMemo, useCallback } from "react";
+import "yup";
+import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
+import "bignumber.js";
+import { useAccount } from "../../hooks/useAccount.mjs";
+import "@reown/appkit/react";
+import "axios";
 import { useWeb3App } from "../../context/useWeb3App.mjs";
+import "formik";
+import { ProviderType } from "../../../types/providerType.mjs";
 import { useFetchBridgeData } from "../../hooks/useFetchBridgeData.mjs";
+import { MVX_CHAIN_IDS } from "../../../constants/index.mjs";
+import "@tanstack/react-query";
+import "../../constants/index.mjs";
+import "@reown/appkit-adapter-solana/react";
+import "@solana/web3.js";
+import "wagmi";
+import "@reown/appkit-controllers";
 import { useGetHistoryQuery } from "../../queries/useGetHistory.query.mjs";
 import { formatAmount } from "../../utils/formatAmount.mjs";
 import { mxClsx } from "../../utils/mxClsx.mjs";
@@ -25,10 +38,25 @@ const BridgeHistory = ({
   mvxAddress,
   onClose
 }) => {
-  const { options } = useWeb3App();
-  const { data, isLoading, isError } = useGetHistoryQuery({
+  const { options, bridgeOnly } = useWeb3App();
+  const bridgeAccount = useAccount();
+  const {
+    data: mvxTransactions,
+    isLoading,
+    isError
+  } = useGetHistoryQuery({
     address: mvxAddress
   });
+  const { data: bridgeTransactions } = useGetHistoryQuery({
+    address: bridgeAccount.address ?? ""
+  });
+  const mergedTransactions = useMemo(() => {
+    const mvxTxs = mvxTransactions ?? [];
+    const bridgeTxs = bridgeOnly && bridgeTransactions ? bridgeTransactions : [];
+    return [...mvxTxs, ...bridgeTxs].sort(
+      (a, b) => b.depositTimestamp - a.depositTimestamp
+    );
+  }, [bridgeOnly, bridgeTransactions, mvxTransactions]);
   const resolveTransactionIcon = useCallback((transaction) => {
     switch (transaction.status) {
       case "success":
@@ -61,7 +89,7 @@ const BridgeHistory = ({
     }
   }, []);
   const transactions = useMemo(
-    () => data == null ? void 0 : data.map((transaction) => {
+    () => mergedTransactions == null ? void 0 : mergedTransactions.map((transaction) => {
       return {
         ...transaction,
         tokenDestination: transaction.tokenOut.toLowerCase(),
@@ -70,7 +98,7 @@ const BridgeHistory = ({
         statusIcon: resolveTransactionIcon(transaction)
       };
     }),
-    [data, resolveTransactionIcon]
+    [mergedTransactions, resolveTransactionIcon]
   );
   const {
     evmTokensWithBalances,

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

@@ -2,8 +2,13 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
-const allNetworks = require("../../../../../../all-networks-NYACMyeN.js");
+require("@multiversx/sdk-dapp-utils/out/helpers/formatAmount");
+require("@multiversx/sdk-dapp-utils/out/helpers/stringIsInteger");
+require("bignumber.js");
 require("../../../../../constants/index.js");
+require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
+const reactjs_utils_mxClsx = require("../../../../../utils/mxClsx.js");
+const allNetworks = require("../../../../../../all-networks-NYACMyeN.js");
 const reactjs_constants_chains = require("../../../../../constants/chains.js");
 const ChainOptionLabel = ({
   chain,
@@ -21,7 +26,9 @@ const ChainOptionLabel = ({
             src: chain.pngUrl ?? reactjs_constants_chains.chainIdentifier[chain.name],
             alt: "",
             loading: "lazy",
-            className: "liq-h-full liq-w-full liq-rounded-lg"
+            className: reactjs_utils_mxClsx.mxClsx("liq-h-full liq-w-full", {
+              "liq-rounded-lg": chain.id !== reactjs_constants_chains.ALL_NETWORK_ID
+            })
           }
         ) : /* @__PURE__ */ jsxRuntime.jsx(
           "img",

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

@@ -1,7 +1,12 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { A as AllNetworks } from "../../../../../../all-networks-EJIVYZ_i.mjs";
+import "@multiversx/sdk-dapp-utils/out/helpers/formatAmount";
+import "@multiversx/sdk-dapp-utils/out/helpers/stringIsInteger";
+import "bignumber.js";
 import "../../../../../constants/index.mjs";
-import { chainIdentifier } from "../../../../../constants/chains.mjs";
+import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
+import { mxClsx } from "../../../../../utils/mxClsx.mjs";
+import { A as AllNetworks } from "../../../../../../all-networks-EJIVYZ_i.mjs";
+import { chainIdentifier, ALL_NETWORK_ID } from "../../../../../constants/chains.mjs";
 const ChainOptionLabel = ({
   chain,
   inDropdown = false
@@ -18,7 +23,9 @@ const ChainOptionLabel = ({
             src: chain.pngUrl ?? chainIdentifier[chain.name],
             alt: "",
             loading: "lazy",
-            className: "liq-h-full liq-w-full liq-rounded-lg"
+            className: mxClsx("liq-h-full liq-w-full", {
+              "liq-rounded-lg": chain.id !== ALL_NETWORK_ID
+            })
           }
         ) : /* @__PURE__ */ jsx(
           "img",

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

@@ -3,8 +3,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const Select = require("react-select");
-const allNetworks = require("../../../../../../all-networks-NYACMyeN.js");
+require("@multiversx/sdk-dapp-utils/out/helpers/formatAmount");
+require("@multiversx/sdk-dapp-utils/out/helpers/stringIsInteger");
+require("bignumber.js");
 require("../../../../../constants/index.js");
+require("@multiversx/sdk-dapp-utils/out/helpers/parseAmount");
+const reactjs_utils_mxClsx = require("../../../../../utils/mxClsx.js");
+const allNetworks = require("../../../../../../all-networks-NYACMyeN.js");
 const reactjs_constants_chains = require("../../../../../constants/chains.js");
 const SelectedChainOption = ({
   ...props
@@ -24,7 +29,9 @@ const SelectedChainOption = ({
           src: chain.pngUrl ?? reactjs_constants_chains.chainIdentifier[chain.name],
           alt: "",
           loading: "lazy",
-          className: "liq-h-full liq-w-full liq-rounded-lg"
+          className: reactjs_utils_mxClsx.mxClsx("liq-h-full liq-w-full", {
+            "liq-rounded-lg": (chain == null ? void 0 : chain.id) !== reactjs_constants_chains.ALL_NETWORK_ID
+          })
         }
       ) : /* @__PURE__ */ jsxRuntime.jsx("img", { src: allNetworks.AllNetworks, alt: "", className: "liq-h-full liq-w-full" })
     }

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

@@ -1,8 +1,13 @@
 import { jsx } from "react/jsx-runtime";
 import { components } from "react-select";
-import { A as AllNetworks } from "../../../../../../all-networks-EJIVYZ_i.mjs";
+import "@multiversx/sdk-dapp-utils/out/helpers/formatAmount";
+import "@multiversx/sdk-dapp-utils/out/helpers/stringIsInteger";
+import "bignumber.js";
 import "../../../../../constants/index.mjs";
-import { chainIdentifier } from "../../../../../constants/chains.mjs";
+import "@multiversx/sdk-dapp-utils/out/helpers/parseAmount";
+import { mxClsx } from "../../../../../utils/mxClsx.mjs";
+import { A as AllNetworks } from "../../../../../../all-networks-EJIVYZ_i.mjs";
+import { chainIdentifier, ALL_NETWORK_ID } from "../../../../../constants/chains.mjs";
 const SelectedChainOption = ({
   ...props
 }) => {
@@ -21,7 +26,9 @@ const SelectedChainOption = ({
           src: chain.pngUrl ?? chainIdentifier[chain.name],
           alt: "",
           loading: "lazy",
-          className: "liq-h-full liq-w-full liq-rounded-lg"
+          className: mxClsx("liq-h-full liq-w-full", {
+            "liq-rounded-lg": (chain == null ? void 0 : chain.id) !== ALL_NETWORK_ID
+          })
         }
       ) : /* @__PURE__ */ jsx("img", { src: AllNetworks, alt: "", className: "liq-h-full liq-w-full" })
     }