@multiversx/sdk-dapp-liquidity 1.1.0-alpha.30 → 1.1.0-alpha.32

package/package.json

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

package/reactjs/components/BridgeForm/BridgeForm.js

@@ -271,11 +271,9 @@ const BridgeForm = ({
   );
   const handleOnChangeFirstAmount = React.useCallback((amount) => {
     setFirstAmount(() => amount);
-    setLastChangedField(reactjs_hooks_useBridgeFormik.BridgeFormikValuesEnum.firstAmount);
   }, []);
   const handleOnChangeSecondAmount = React.useCallback((amount) => {
     setSecondAmount(() => amount);
-    setLastChangedField(reactjs_hooks_useBridgeFormik.BridgeFormikValuesEnum.secondAmount);
   }, []);
   const handleHistoryClose = React.useCallback(() => {
     onHistoryClose == null ? void 0 : onHistoryClose();
@@ -365,6 +363,17 @@ const BridgeForm = ({
     },
     [fromOptions, updateUrlParams]
   );
+  React.useEffect(() => {
+    if ((selectedChainOption == null ? void 0 : selectedChainOption.chainId) !== (firstToken == null ? void 0 : firstToken.chainId)) {
+      const selectedOption = fromOptions == null ? void 0 : fromOptions.find(
+        (option) => option.chainId.toString() === (selectedChainOption == null ? void 0 : selectedChainOption.chainId)
+      );
+      if (!selectedOption) {
+        return;
+      }
+      onChangeFirstSelect(selectedOption);
+    }
+  }, [selectedChainOption == null ? void 0 : selectedChainOption.chainId]);
   const setInitialSelectedTokens = () => {
     var _a2, _b2, _c2, _d2;
     if (isTokensLoading || initializedInitialTokensRef.current) {
@@ -546,8 +555,7 @@ const BridgeForm = ({
     handleBlur,
     handleChange,
     handleSubmit,
-    resetSwapForm,
-    setLastChangedField
+    resetSwapForm
   } = reactjs_hooks_useBridgeFormik.useBridgeFormik({
     rate,
     nativeAuthToken,
@@ -680,7 +688,7 @@ const BridgeForm = ({
                     inputName: "firstAmount",
                     inputValue: formik.values.firstAmount ?? "",
                     amountError: firstAmount !== "" ? rateValidationError ?? firstAmountError : void 0,
-                    disabled: false,
+                    disabled: true,
                     onInputDebounceChange: handleOnChangeFirstAmount,
                     onInputChange: handleChange,
                     onBlur: handleBlur

package/reactjs/components/BridgeForm/BridgeForm.mjs

@@ -268,11 +268,9 @@ const BridgeForm = ({
   );
   const handleOnChangeFirstAmount = useCallback((amount) => {
     setFirstAmount(() => amount);
-    setLastChangedField(BridgeFormikValuesEnum.firstAmount);
   }, []);
   const handleOnChangeSecondAmount = useCallback((amount) => {
     setSecondAmount(() => amount);
-    setLastChangedField(BridgeFormikValuesEnum.secondAmount);
   }, []);
   const handleHistoryClose = useCallback(() => {
     onHistoryClose == null ? void 0 : onHistoryClose();
@@ -362,6 +360,17 @@ const BridgeForm = ({
     },
     [fromOptions, updateUrlParams]
   );
+  useEffect(() => {
+    if ((selectedChainOption == null ? void 0 : selectedChainOption.chainId) !== (firstToken == null ? void 0 : firstToken.chainId)) {
+      const selectedOption = fromOptions == null ? void 0 : fromOptions.find(
+        (option) => option.chainId.toString() === (selectedChainOption == null ? void 0 : selectedChainOption.chainId)
+      );
+      if (!selectedOption) {
+        return;
+      }
+      onChangeFirstSelect(selectedOption);
+    }
+  }, [selectedChainOption == null ? void 0 : selectedChainOption.chainId]);
   const setInitialSelectedTokens = () => {
     var _a2, _b2, _c2, _d2;
     if (isTokensLoading || initializedInitialTokensRef.current) {
@@ -543,8 +552,7 @@ const BridgeForm = ({
     handleBlur,
     handleChange,
     handleSubmit,
-    resetSwapForm,
-    setLastChangedField
+    resetSwapForm
   } = useBridgeFormik({
     rate,
     nativeAuthToken,
@@ -677,7 +685,7 @@ const BridgeForm = ({
                     inputName: "firstAmount",
                     inputValue: formik.values.firstAmount ?? "",
                     amountError: firstAmount !== "" ? rateValidationError ?? firstAmountError : void 0,
-                    disabled: false,
+                    disabled: true,
                     onInputDebounceChange: handleOnChangeFirstAmount,
                     onInputChange: handleChange,
                     onBlur: handleBlur

package/reactjs/hooks/useAccount.d.ts

@@ -6,7 +6,7 @@ export declare const useAccount: () => {
     embeddedWalletInfo?: {
         user: import('@reown/appkit/react').AccountControllerState["user"];
         authProvider: import('@reown/appkit/react').AccountControllerState["socialProvider"] | "email";
-        accountType: import("@reown/appkit-wallet").W3mFrameTypes.AccountType | undefined;
+        accountType: import('@reown/appkit/react').PreferredAccountTypes[import('@reown/appkit-common').ChainNamespace] | undefined;
         isSmartAccountDeployed: boolean;
     };
     status: import('@reown/appkit/react').AccountControllerState["status"];
@@ -25,7 +25,7 @@ export declare const useAccount: () => {
     embeddedWalletInfo?: {
         user: import('@reown/appkit/react').AccountControllerState["user"];
         authProvider: import('@reown/appkit/react').AccountControllerState["socialProvider"] | "email";
-        accountType: import("@reown/appkit-wallet").W3mFrameTypes.AccountType | undefined;
+        accountType: import('@reown/appkit/react').PreferredAccountTypes[import('@reown/appkit-common').ChainNamespace] | undefined;
         isSmartAccountDeployed: boolean;
     };
     status: import('@reown/appkit/react').AccountControllerState["status"];
@@ -44,7 +44,7 @@ export declare const useAccount: () => {
     embeddedWalletInfo?: {
         user: import('@reown/appkit/react').AccountControllerState["user"];
         authProvider: import('@reown/appkit/react').AccountControllerState["socialProvider"] | "email";
-        accountType: import("@reown/appkit-wallet").W3mFrameTypes.AccountType | undefined;
+        accountType: import('@reown/appkit/react').PreferredAccountTypes[import('@reown/appkit-common').ChainNamespace] | undefined;
         isSmartAccountDeployed: boolean;
     };
     status: import('@reown/appkit/react').AccountControllerState["status"];
@@ -63,7 +63,7 @@ export declare const useAccount: () => {
     embeddedWalletInfo?: {
         user: import('@reown/appkit/react').AccountControllerState["user"];
         authProvider: import('@reown/appkit/react').AccountControllerState["socialProvider"] | "email";
-        accountType: import("@reown/appkit-wallet").W3mFrameTypes.AccountType | undefined;
+        accountType: import('@reown/appkit/react').PreferredAccountTypes[import('@reown/appkit-common').ChainNamespace] | undefined;
         isSmartAccountDeployed: boolean;
     };
     status: import('@reown/appkit/react').AccountControllerState["status"];

package/reactjs/hooks/useBridgeFormik.d.ts

@@ -99,5 +99,4 @@ export declare const useBridgeFormik: ({ nativeAuthToken, mvxAccountAddress, fir
     setFieldValue: (field: string, value: any, shouldValidate?: boolean) => Promise<void> | Promise<import('formik').FormikErrors<TradeFormikValuesType>>;
     resetSwapForm: () => void;
     setFieldTouched: (field: string, touched?: boolean, shouldValidate?: boolean) => Promise<void> | Promise<import('formik').FormikErrors<TradeFormikValuesType>>;
-    setLastChangedField: import('react').Dispatch<import('react').SetStateAction<BridgeFormikValuesEnum.firstAmount | BridgeFormikValuesEnum.secondAmount | null>>;
 };

package/reactjs/hooks/useBridgeFormik.js

@@ -31,7 +31,6 @@ const useBridgeFormik = ({
   rate,
   onSubmit
 }) => {
-  const [lastChangedField, setLastChangedField] = React.useState(null);
   const pendingSigningRef = React.useRef();
   const account = reactjs_hooks_useAccount.useAccount();
   const initialValues = {
@@ -46,7 +45,7 @@ const useBridgeFormik = ({
     setFieldValue("firstAmount", "");
     setFieldValue("secondAmount", "");
   };
-  const onSubmitFormik = async (values2) => {
+  const onSubmitFormik = async (values) => {
     var _a, _b;
     if (pendingSigningRef.current) {
       return;
@@ -56,11 +55,11 @@ const useBridgeFormik = ({
       url: helpers_getApiURL.getApiURL(),
       nativeAuthToken: nativeAuthToken ?? "",
       body: {
-        tokenIn: ((_a = values2.firstToken) == null ? void 0 : _a.address) ?? "",
+        tokenIn: ((_a = values.firstToken) == null ? void 0 : _a.address) ?? "",
         amountIn: (firstAmount == null ? void 0 : firstAmount.toString()) ?? "",
-        fromChainId: values2.fromChainId ?? "",
-        tokenOut: ((_b = values2.secondToken) == null ? void 0 : _b.address) ?? "",
-        toChainId: values2.toChainId ?? "",
+        fromChainId: values.fromChainId ?? "",
+        tokenOut: ((_b = values.secondToken) == null ? void 0 : _b.address) ?? "",
+        toChainId: values.toChainId ?? "",
         amountOut: (secondAmount == null ? void 0 : secondAmount.toString()) ?? "",
         sender: account.address ?? "",
         receiver: mvxAccountAddress ?? "",
@@ -112,7 +111,6 @@ const useBridgeFormik = ({
     onSubmit: onSubmitFormik
   });
   const {
-    values,
     errors,
     touched,
     handleBlur,
@@ -121,29 +119,6 @@ const useBridgeFormik = ({
     setFieldValue,
     setFieldTouched
   } = formik$1;
-  React.useEffect(() => {
-    if (!values.firstAmount && touched.firstAmount) {
-      setFieldValue("secondAmount", 0, true);
-      return;
-    }
-    if (lastChangedField === "firstAmount" && values.firstAmount && values.firstAmount !== "" && (rate == null ? void 0 : rate.fee) && rate.fee !== "0") {
-      const calculatedSecondAmount = parseFloat(values.firstAmount) - Number(rate.fee);
-      setFieldValue(
-        "secondAmount",
-        calculatedSecondAmount > 0 ? calculatedSecondAmount : "0"
-      );
-    }
-  }, [values.firstAmount, rate == null ? void 0 : rate.fee, lastChangedField, touched.firstAmount]);
-  React.useEffect(() => {
-    if (!values.secondAmount && touched.secondAmount) {
-      setFieldValue("firstAmount", 0, true);
-      return;
-    }
-    if (lastChangedField === "secondAmount" && values.secondAmount && values.secondAmount !== "" && (rate == null ? void 0 : rate.fee) && rate.fee !== "0") {
-      const calculatedFirstAmount = parseFloat(values.secondAmount) + Number(rate.fee);
-      setFieldValue("firstAmount", calculatedFirstAmount);
-    }
-  }, [values.secondAmount, rate == null ? void 0 : rate.fee, lastChangedField, touched.secondAmount]);
   React.useEffect(() => {
     setFieldValue("firstToken", firstToken, true);
   }, [firstToken]);
@@ -173,8 +148,7 @@ const useBridgeFormik = ({
     handleSubmit,
     setFieldValue,
     resetSwapForm,
-    setFieldTouched,
-    setLastChangedField
+    setFieldTouched
   };
 };
 exports.BridgeFormikValuesEnum = BridgeFormikValuesEnum;

package/reactjs/hooks/useBridgeFormik.mjs

@@ -1,5 +1,5 @@
 import { useFormik } from "formik";
-import { useState, useRef, useEffect } from "react";
+import { useRef, useEffect } from "react";
 import { object, string } from "yup";
 import { useAccount } from "./useAccount.mjs";
 import { useAmountSchema } from "./validation/useAmountSchema.mjs";
@@ -28,7 +28,6 @@ const useBridgeFormik = ({
   rate,
   onSubmit
 }) => {
-  const [lastChangedField, setLastChangedField] = useState(null);
   const pendingSigningRef = useRef();
   const account = useAccount();
   const initialValues = {
@@ -43,7 +42,7 @@ const useBridgeFormik = ({
     setFieldValue("firstAmount", "");
     setFieldValue("secondAmount", "");
   };
-  const onSubmitFormik = async (values2) => {
+  const onSubmitFormik = async (values) => {
     var _a, _b;
     if (pendingSigningRef.current) {
       return;
@@ -53,11 +52,11 @@ const useBridgeFormik = ({
       url: getApiURL(),
       nativeAuthToken: nativeAuthToken ?? "",
       body: {
-        tokenIn: ((_a = values2.firstToken) == null ? void 0 : _a.address) ?? "",
+        tokenIn: ((_a = values.firstToken) == null ? void 0 : _a.address) ?? "",
         amountIn: (firstAmount == null ? void 0 : firstAmount.toString()) ?? "",
-        fromChainId: values2.fromChainId ?? "",
-        tokenOut: ((_b = values2.secondToken) == null ? void 0 : _b.address) ?? "",
-        toChainId: values2.toChainId ?? "",
+        fromChainId: values.fromChainId ?? "",
+        tokenOut: ((_b = values.secondToken) == null ? void 0 : _b.address) ?? "",
+        toChainId: values.toChainId ?? "",
         amountOut: (secondAmount == null ? void 0 : secondAmount.toString()) ?? "",
         sender: account.address ?? "",
         receiver: mvxAccountAddress ?? "",
@@ -109,7 +108,6 @@ const useBridgeFormik = ({
     onSubmit: onSubmitFormik
   });
   const {
-    values,
     errors,
     touched,
     handleBlur,
@@ -118,29 +116,6 @@ const useBridgeFormik = ({
     setFieldValue,
     setFieldTouched
   } = formik;
-  useEffect(() => {
-    if (!values.firstAmount && touched.firstAmount) {
-      setFieldValue("secondAmount", 0, true);
-      return;
-    }
-    if (lastChangedField === "firstAmount" && values.firstAmount && values.firstAmount !== "" && (rate == null ? void 0 : rate.fee) && rate.fee !== "0") {
-      const calculatedSecondAmount = parseFloat(values.firstAmount) - Number(rate.fee);
-      setFieldValue(
-        "secondAmount",
-        calculatedSecondAmount > 0 ? calculatedSecondAmount : "0"
-      );
-    }
-  }, [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 !== "" && (rate == null ? void 0 : rate.fee) && rate.fee !== "0") {
-      const calculatedFirstAmount = parseFloat(values.secondAmount) + Number(rate.fee);
-      setFieldValue("firstAmount", calculatedFirstAmount);
-    }
-  }, [values.secondAmount, rate == null ? void 0 : rate.fee, lastChangedField, touched.secondAmount]);
   useEffect(() => {
     setFieldValue("firstToken", firstToken, true);
   }, [firstToken]);
@@ -170,8 +145,7 @@ const useBridgeFormik = ({
     handleSubmit,
     setFieldValue,
     resetSwapForm,
-    setFieldTouched,
-    setLastChangedField
+    setFieldTouched
   };
 };
 export {