@multiversx/sdk-dapp-liquidity 1.0.4 → 1.0.5

package/api/tests/confirmRate.spec.js

@@ -18,7 +18,8 @@ describe("confirmRate", () => {
       toChainId: "44",
       sender: "0x123",
       receiver: "0x456",
-      provider: types_providerType.ProviderType.None
+      provider: types_providerType.ProviderType.None,
+      orderId: "123"
     };
     const nativeAuthToken = "ZXJkMXdoOWMwc2pyMnhuOGh6ZjAybHd3Y3I0amsyczg0dGF0OXVkMmthcTZ6cjd4enB2bDlsNXE4YXdtZXg.YUhSMGNITTZMeTlrWlhadVpYUXVkR1Z0Y0d4aGRHVXRaR0Z3Y0M1dGRXeDBhWFpsY25ONExtTnZiUS5lZjc2YjRjNzZlZjZlMTNhNjM5MDc2N2ZjNzhhODhjYTRiYmI1OTE4YTJiOWRkYzQ0OTQyOTI3NjkzNjUwNjUxLjg2NDAwLmV5SjBhVzFsYzNSaGJYQWlPakUzTXpNME9EazBNREI5.04a986df7f0142837f9b1ca1ae4829f7b471e4c3470602ca6a16f2a4d7c6616c4e7628a93b4ce87d9534e95ab9215f893faeb9e0904e1d834007c16e43b12d01";
     const config = {
@@ -64,7 +65,8 @@ describe("confirmRate", () => {
       toChainId: "44",
       sender: "0x123",
       receiver: "0x456",
-      provider: types_providerType.ProviderType.None
+      provider: types_providerType.ProviderType.None,
+      orderId: "123"
     };
     const nativeAuthToken = "";
     const config = {
@@ -108,7 +110,8 @@ describe("confirmRate", () => {
       toChainId: "44",
       sender: "0x123",
       receiver: "0x456",
-      provider: types_providerType.ProviderType.None
+      provider: types_providerType.ProviderType.None,
+      orderId: "123"
     };
     const nativeAuthToken = "";
     const config = {

package/api/tests/confirmRate.spec.mjs

@@ -16,7 +16,8 @@ describe("confirmRate", () => {
       toChainId: "44",
       sender: "0x123",
       receiver: "0x456",
-      provider: ProviderType.None
+      provider: ProviderType.None,
+      orderId: "123"
     };
     const nativeAuthToken = "ZXJkMXdoOWMwc2pyMnhuOGh6ZjAybHd3Y3I0amsyczg0dGF0OXVkMmthcTZ6cjd4enB2bDlsNXE4YXdtZXg.YUhSMGNITTZMeTlrWlhadVpYUXVkR1Z0Y0d4aGRHVXRaR0Z3Y0M1dGRXeDBhWFpsY25ONExtTnZiUS5lZjc2YjRjNzZlZjZlMTNhNjM5MDc2N2ZjNzhhODhjYTRiYmI1OTE4YTJiOWRkYzQ0OTQyOTI3NjkzNjUwNjUxLjg2NDAwLmV5SjBhVzFsYzNSaGJYQWlPakUzTXpNME9EazBNREI5.04a986df7f0142837f9b1ca1ae4829f7b471e4c3470602ca6a16f2a4d7c6616c4e7628a93b4ce87d9534e95ab9215f893faeb9e0904e1d834007c16e43b12d01";
     const config = {
@@ -62,7 +63,8 @@ describe("confirmRate", () => {
       toChainId: "44",
       sender: "0x123",
       receiver: "0x456",
-      provider: ProviderType.None
+      provider: ProviderType.None,
+      orderId: "123"
     };
     const nativeAuthToken = "";
     const config = {
@@ -106,7 +108,8 @@ describe("confirmRate", () => {
       toChainId: "44",
       sender: "0x123",
       receiver: "0x456",
-      provider: ProviderType.None
+      provider: ProviderType.None,
+      orderId: "123"
     };
     const nativeAuthToken = "";
     const config = {

package/api/tests/getRate.spec.js

@@ -26,7 +26,8 @@ describe("getRate", () => {
     const response = {
       fee: "5",
       amountOut: "100",
-      provider: types_providerType.ProviderType.None
+      provider: types_providerType.ProviderType.None,
+      orderId: "123"
     };
     mockedAxios.post.mockResolvedValue({ data: response });
     const result = await api_getRate.getRate({
@@ -53,7 +54,8 @@ describe("getRate", () => {
     const response = {
       fee: "5",
       amountOut: "100",
-      provider: types_providerType.ProviderType.None
+      provider: types_providerType.ProviderType.None,
+      orderId: "123"
     };
     mockedAxios.post.mockResolvedValue({ data: response });
     const result = await api_getRate.getRate({

package/api/tests/getRate.spec.mjs

@@ -24,7 +24,8 @@ describe("getRate", () => {
     const response = {
       fee: "5",
       amountOut: "100",
-      provider: ProviderType.None
+      provider: ProviderType.None,
+      orderId: "123"
     };
     mockedAxios.post.mockResolvedValue({ data: response });
     const result = await getRate({
@@ -51,7 +52,8 @@ describe("getRate", () => {
     const response = {
       fee: "5",
       amountOut: "100",
-      provider: ProviderType.None
+      provider: ProviderType.None,
+      orderId: "123"
     };
     mockedAxios.post.mockResolvedValue({ data: response });
     const result = await getRate({

package/package.json

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

package/reactjs/components/BridgeForm/BridgeForm.js

@@ -435,8 +435,7 @@ const BridgeForm = ({
     resetSwapForm,
     setLastChangedField
   } = reactjs_hooks_useBridgeFormik.useBridgeFormik({
-    fee: rate == null ? void 0 : rate.fee,
-    provider: rate == null ? void 0 : rate.provider,
+    rate,
     nativeAuthToken,
     mvxAccountAddress: mvxAddress,
     firstToken,
@@ -477,6 +476,23 @@ const BridgeForm = ({
       };
     });
   }, [evmTokensWithBalances, firstToken == null ? void 0 : firstToken.address]);
+  require$$0.useEffect(() => {
+    const selectedTokenOption = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+      (x) => x.address === (secondToken == null ? void 0 : secondToken.address)
+    );
+    if (!selectedTokenOption) {
+      return;
+    }
+    setSecondToken((prevState) => {
+      if (!prevState) {
+        return prevState;
+      }
+      return {
+        ...prevState,
+        balance: selectedTokenOption == null ? void 0 : selectedTokenOption.balance
+      };
+    });
+  }, [mvxTokensWithBalances, secondToken == null ? void 0 : secondToken.address]);
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: /* @__PURE__ */ jsxRuntime.jsxs(
     "form",
     {

package/reactjs/components/BridgeForm/BridgeForm.mjs

@@ -432,8 +432,7 @@ const BridgeForm = ({
     resetSwapForm,
     setLastChangedField
   } = useBridgeFormik({
-    fee: rate == null ? void 0 : rate.fee,
-    provider: rate == null ? void 0 : rate.provider,
+    rate,
     nativeAuthToken,
     mvxAccountAddress: mvxAddress,
     firstToken,
@@ -474,6 +473,23 @@ const BridgeForm = ({
       };
     });
   }, [evmTokensWithBalances, firstToken == null ? void 0 : firstToken.address]);
+  useEffect(() => {
+    const selectedTokenOption = mvxTokensWithBalances == null ? void 0 : mvxTokensWithBalances.find(
+      (x) => x.address === (secondToken == null ? void 0 : secondToken.address)
+    );
+    if (!selectedTokenOption) {
+      return;
+    }
+    setSecondToken((prevState) => {
+      if (!prevState) {
+        return prevState;
+      }
+      return {
+        ...prevState,
+        balance: selectedTokenOption == null ? void 0 : selectedTokenOption.balance
+      };
+    });
+  }, [mvxTokensWithBalances, secondToken == null ? void 0 : secondToken.address]);
   return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(
     "form",
     {

package/reactjs/hooks/useBridgeFormik.d.ts

@@ -1,6 +1,7 @@
 import { ServerTransaction } from '../../types/transaction';
 import { TokenType } from '../../types/token';
 import { ProviderType } from '../../types/providerType';
+import { RateRequestResponse } from '../../types';
 
 export declare enum BridgeFormikValuesEnum {
     firstToken = "firstToken",
@@ -18,7 +19,7 @@ export interface TradeFormikValuesType {
     fromChainId?: string;
     toChainId?: string;
 }
-export declare const useBridgeFormik: ({ nativeAuthToken, mvxAccountAddress, firstToken, firstAmount, secondToken, secondAmount, fromChainId, toChainId, fee, provider, onSubmit }: {
+export declare const useBridgeFormik: ({ nativeAuthToken, mvxAccountAddress, firstToken, firstAmount, secondToken, secondAmount, fromChainId, toChainId, rate, onSubmit }: {
     mvxAccountAddress?: string;
     nativeAuthToken?: string;
     firstAmount?: string;
@@ -27,8 +28,7 @@ export declare const useBridgeFormik: ({ nativeAuthToken, mvxAccountAddress, fir
     toChainId?: string;
     firstToken?: TokenType;
     secondToken?: TokenType;
-    fee?: string;
-    provider?: ProviderType;
+    rate?: RateRequestResponse;
     onSubmit: ({ transactions, provider }: {
         transactions: ServerTransaction[];
         provider: ProviderType;

package/reactjs/hooks/useBridgeFormik.js

@@ -29,8 +29,7 @@ const useBridgeFormik = ({
   secondAmount,
   fromChainId,
   toChainId,
-  fee = "0",
-  provider,
+  rate,
   onSubmit
 }) => {
   const [lastChangedField, setLastChangedField] = require$$0.useState(null);
@@ -69,11 +68,12 @@ const useBridgeFormik = ({
         fromChainId: values2.fromChainId ?? "",
         tokenOut: ((_b = values2.secondToken) == null ? void 0 : _b.address) ?? "",
         toChainId: values2.toChainId ?? "",
-        fee: fee ?? "0",
         amountOut: (secondAmount == null ? void 0 : secondAmount.toString()) ?? "",
         sender: account.address ?? "",
         receiver: mvxAccountAddress ?? "",
-        provider: provider ?? types_providerType.ProviderType.None
+        fee: (rate == null ? void 0 : rate.fee) ?? "0",
+        provider: (rate == null ? void 0 : rate.provider) ?? types_providerType.ProviderType.None,
+        orderId: (rate == null ? void 0 : rate.orderId) ?? ""
       }
     });
     const transactions = data;
@@ -84,7 +84,7 @@ const useBridgeFormik = ({
     resetSwapForm();
     onSubmit({
       transactions,
-      provider: provider ?? types_providerType.ProviderType.None
+      provider: (rate == null ? void 0 : rate.provider) ?? types_providerType.ProviderType.None
     });
     pendingSigningRef.current = false;
   };
@@ -134,23 +134,23 @@ const useBridgeFormik = ({
       return;
     }
     if (lastChangedField === "firstAmount" && values.firstAmount && values.firstAmount !== "") {
-      const calculatedSecondAmount = parseFloat(values.firstAmount) - Number(fee);
+      const calculatedSecondAmount = parseFloat(values.firstAmount) - Number((rate == null ? void 0 : rate.fee) ?? "0");
       setFieldValue(
         "secondAmount",
         calculatedSecondAmount > 0 ? calculatedSecondAmount : "0"
       );
     }
-  }, [values.firstAmount, fee, lastChangedField, touched.firstAmount]);
+  }, [values.firstAmount, rate == null ? void 0 : rate.fee, lastChangedField, touched.firstAmount]);
   require$$0.useEffect(() => {
     if (!values.secondAmount && touched.secondAmount) {
       setFieldValue("firstAmount", 0, true);
       return;
     }
     if (lastChangedField === "secondAmount" && values.secondAmount && values.secondAmount !== "") {
-      const calculatedFirstAmount = parseFloat(values.secondAmount) + Number(fee);
+      const calculatedFirstAmount = parseFloat(values.secondAmount) + Number((rate == null ? void 0 : rate.fee) ?? "0");
       setFieldValue("firstAmount", calculatedFirstAmount);
     }
-  }, [values.secondAmount, fee, lastChangedField, touched.secondAmount]);
+  }, [values.secondAmount, rate == null ? void 0 : rate.fee, lastChangedField, touched.secondAmount]);
   require$$0.useEffect(() => {
     setFieldValue("firstToken", firstToken, true);
   }, [firstToken]);

package/reactjs/hooks/useBridgeFormik.mjs

@@ -26,8 +26,7 @@ const useBridgeFormik = ({
   secondAmount,
   fromChainId,
   toChainId,
-  fee = "0",
-  provider,
+  rate,
   onSubmit
 }) => {
   const [lastChangedField, setLastChangedField] = useState(null);
@@ -66,11 +65,12 @@ const useBridgeFormik = ({
         fromChainId: values2.fromChainId ?? "",
         tokenOut: ((_b = values2.secondToken) == null ? void 0 : _b.address) ?? "",
         toChainId: values2.toChainId ?? "",
-        fee: fee ?? "0",
         amountOut: (secondAmount == null ? void 0 : secondAmount.toString()) ?? "",
         sender: account.address ?? "",
         receiver: mvxAccountAddress ?? "",
-        provider: provider ?? ProviderType.None
+        fee: (rate == null ? void 0 : rate.fee) ?? "0",
+        provider: (rate == null ? void 0 : rate.provider) ?? ProviderType.None,
+        orderId: (rate == null ? void 0 : rate.orderId) ?? ""
       }
     });
     const transactions = data;
@@ -81,7 +81,7 @@ const useBridgeFormik = ({
     resetSwapForm();
     onSubmit({
       transactions,
-      provider: provider ?? ProviderType.None
+      provider: (rate == null ? void 0 : rate.provider) ?? ProviderType.None
     });
     pendingSigningRef.current = false;
   };
@@ -131,23 +131,23 @@ const useBridgeFormik = ({
       return;
     }
     if (lastChangedField === "firstAmount" && values.firstAmount && values.firstAmount !== "") {
-      const calculatedSecondAmount = parseFloat(values.firstAmount) - Number(fee);
+      const calculatedSecondAmount = parseFloat(values.firstAmount) - Number((rate == null ? void 0 : rate.fee) ?? "0");
       setFieldValue(
         "secondAmount",
         calculatedSecondAmount > 0 ? calculatedSecondAmount : "0"
       );
     }
-  }, [values.firstAmount, fee, lastChangedField, touched.firstAmount]);
+  }, [values.firstAmount, rate == null ? void 0 : rate.fee, lastChangedField, touched.firstAmount]);
   useEffect(() => {
     if (!values.secondAmount && touched.secondAmount) {
       setFieldValue("firstAmount", 0, true);
       return;
     }
     if (lastChangedField === "secondAmount" && values.secondAmount && values.secondAmount !== "") {
-      const calculatedFirstAmount = parseFloat(values.secondAmount) + Number(fee);
+      const calculatedFirstAmount = parseFloat(values.secondAmount) + Number((rate == null ? void 0 : rate.fee) ?? "0");
       setFieldValue("firstAmount", calculatedFirstAmount);
     }
-  }, [values.secondAmount, fee, lastChangedField, touched.secondAmount]);
+  }, [values.secondAmount, rate == null ? void 0 : rate.fee, lastChangedField, touched.secondAmount]);
   useEffect(() => {
     setFieldValue("firstToken", firstToken, true);
   }, [firstToken]);

package/reactjs/queries/useGetMvxTokensBalances.query.js

@@ -46,6 +46,7 @@ const useGetMvxTokensBalancesQuery = ({
     refetchOnWindowFocus: false,
     refetchIntervalInBackground: true,
     refetchInterval: 2e4,
+    refetchOnReconnect: "always",
     gcTime: 0
   });
 };

package/reactjs/queries/useGetMvxTokensBalances.query.mjs

@@ -43,6 +43,7 @@ const useGetMvxTokensBalancesQuery = ({
     refetchOnWindowFocus: false,
     refetchIntervalInBackground: true,
     refetchInterval: 2e4,
+    refetchOnReconnect: "always",
     gcTime: 0
   });
 };

package/reactjs/queries/useGetRate.mutation.js

@@ -13,7 +13,16 @@ const useGetRateMutation = () => {
     return data;
   };
   return reactQuery.useMutation({
-    mutationFn
+    mutationFn,
+    onSuccess: (data) => {
+      const currentTime = (/* @__PURE__ */ new Date()).getTime();
+      if (data.expiresAt && new Date(data.expiresAt).getTime() < currentTime) {
+        throw new Error("Retrying due to expired rate");
+      }
+    },
+    retry: (failureCount, error) => {
+      return error.message === "Retrying due to expired rate" && failureCount < 2;
+    }
   });
 };
 exports.useGetRateMutation = useGetRateMutation;

package/reactjs/queries/useGetRate.mutation.mjs

@@ -10,7 +10,16 @@ const useGetRateMutation = () => {
     return data;
   };
   return useMutation({
-    mutationFn
+    mutationFn,
+    onSuccess: (data) => {
+      const currentTime = (/* @__PURE__ */ new Date()).getTime();
+      if (data.expiresAt && new Date(data.expiresAt).getTime() < currentTime) {
+        throw new Error("Retrying due to expired rate");
+      }
+    },
+    retry: (failureCount, error) => {
+      return error.message === "Retrying due to expired rate" && failureCount < 2;
+    }
   });
 };
 export {

package/types/rate.d.ts

@@ -11,4 +11,6 @@ export interface RateRequestResponse {
     fee: string;
     amountOut: string;
     provider: ProviderType;
+    orderId: string;
+    expiresAt?: number;
 }