From d0c000a4f346ecf93c33e8c70935b36c27255762 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 16 Aug 2023 15:51:19 +0530
Subject: [PATCH 01/27] removed manage & addliq btn from unsupported farms

---
 src/components/Common/Layout/evmUtils.tsx | 8 +++-----
 src/components/FarmPage/index.tsx         | 4 ++++
 src/utils/farmListMethods.ts              | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/Common/Layout/evmUtils.tsx b/src/components/Common/Layout/evmUtils.tsx
index fde7c0e..06c81a6 100644
--- a/src/components/Common/Layout/evmUtils.tsx
+++ b/src/components/Common/Layout/evmUtils.tsx
@@ -1,9 +1,7 @@
-interface SupportedPoolsType {
-  [pool: string]: string[];
-}
-
 // Pools which are supported for interacting in current version
-export const supportedPools: SupportedPoolsType = {
+export const supportedPools: {
+  [pool: string]: string[];
+} = {
   moonriver: ["zenlink", "solarbeam", "sushiswap"],
   moonbeam: ["curve", "zenlink", "stellaswap", "solarflare", "beamswap"],
   astar: ["zenlink", "sirius", "arthswap"],
diff --git a/src/components/FarmPage/index.tsx b/src/components/FarmPage/index.tsx
index 8036409..4b9f7d2 100644
--- a/src/components/FarmPage/index.tsx
+++ b/src/components/FarmPage/index.tsx
@@ -25,6 +25,7 @@ import MetaTags from "@components/Common/metaTags/MetaTags";
 import useSpecificFarm from "@hooks/useSpecificFarm";
 import { fetchListicleFarms } from "@utils/api";
 import {
+  checkIfPoolSupported,
   farmURL,
   formatFarmType,
   formatFirstLetter,
@@ -156,6 +157,8 @@ const FarmPage: NextPage = () => {
   const safetyScore = parseFloat((farm?.safetyScore * 10).toFixed(1));
   const safetyScoreColor = useSafetyscoreColor(safetyScore);
 
+  const isSupported = checkIfPoolSupported(farm);
+
   return !isLoading && idQuery ? (
     <div className="px-6 sm:px-[72px] text-[#475467] z-0">
       <MetaTags title={`Farm • ${APP_NAME}`} />
@@ -189,6 +192,7 @@ const FarmPage: NextPage = () => {
                 </div>
               )}
             {!hasPosition &&
+              isSupported &&
               (farm?.chain.toLowerCase() == "mangata kusama" ||
               farm?.protocol.toLowerCase() == "mangata x"
                 ? isConnectedDot
diff --git a/src/utils/farmListMethods.ts b/src/utils/farmListMethods.ts
index a47bba1..7686eab 100644
--- a/src/utils/farmListMethods.ts
+++ b/src/utils/farmListMethods.ts
@@ -97,7 +97,8 @@ export function getWalletInstallUrl(walletName: string): string {
   }
 }
 
-export function checkIfPoolSupported(farm: FarmType) {
+export function checkIfPoolSupported(farm: FarmType): boolean {
+  if (farm?.farmType == "SingleStaking") return false;
   const protocols = supportedPools[farm.chain.toLocaleLowerCase()];
   if (!!protocols) return protocols.includes(farm.protocol.toLowerCase());
   return false;

From f6b8114c6eef1d77e3c0b40ff006080680277d8c Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 16 Aug 2023 17:02:06 +0530
Subject: [PATCH 02/27] Gas estimation loading state

---
 .../AddLiquidityModal/AddSectionMangata.tsx   | 18 ++++++++++-----
 .../AddLiquidityModal/AddSectionStable.tsx    | 22 +++++++++++--------
 .../AddLiquidityModal/AddSectionStandard.tsx  | 22 +++++++++++--------
 .../RemoveSectionStable.tsx                   | 18 +++++++++------
 .../RemoveSectionStandard.tsx                 | 18 +++++++++------
 src/components/Library/StakingModal/index.tsx | 18 +++++++++------
 .../Library/UnstakingModal/index.tsx          | 18 +++++++++------
 src/hooks/useGasEstimation.ts                 | 17 ++++++++++++--
 8 files changed, 97 insertions(+), 54 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx b/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
index c73ac37..6fb7706 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
@@ -65,6 +65,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
   // const [lpBalance, setLpBalance] = useState<any | null>(null);
   const [lpBalance, setLpBalance] = useState<number>(0);
   const [fees, setFees] = useState<number>(0);
+  const [isErrorFees, setIsErrorFees] = useState<boolean>(false);
 
   const [selectedFarm, setSelectedFarm] = useAtom(selectedFarmAtom);
   const [isSlippageModalOpen, setIsSlippageModalOpen] = useAtom(
@@ -376,6 +377,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
       setFees(parseFloat(fees));
     } catch (error) {
       console.log("Error while fetching Fees", error);
+      setIsErrorFees(true);
     }
   };
 
@@ -1048,12 +1050,16 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              <p className="inline-flex">
-                <span className="opacity-40 mr-2 font-semibold">
-                  {fees.toLocaleString("en-US") ?? 0} MGX
-                </span>
-                <span>${(fees * mgxPrice).toFixed(5)}</span>
-              </p>
+              {fees === 0 && !isErrorFees ? (
+                <p>Estimating Gas...</p>
+              ) : (
+                <p className="inline-flex">
+                  <span className="opacity-40 mr-2 font-semibold">
+                    {fees.toLocaleString("en-US") ?? 0} MGX
+                  </span>
+                  <span>${(fees * mgxPrice).toFixed(5)}</span>
+                </p>
+              )}
             </div>
             <div className="inline-flex items-center font-medium text-[14px] leading-5 text-[#344054]">
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index 3593ef4..9013544 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -441,7 +441,7 @@ const AddSectionStable: FC = () => {
 
   const ConfirmStep = () => {
     // Gas estimate
-    const { gasEstimate } = useGasEstimation(
+    const { gasEstimate, isError } = useGasEstimation(
       farm!.router,
       1,
       0,
@@ -528,7 +528,7 @@ const AddSectionStable: FC = () => {
         <div
           className={clsx(
             "rounded-xl",
-            parseFloat(nativeBal?.formatted ?? "0") > gasEstimate
+            fixedAmtNum(nativeBal?.formatted) > gasEstimate
               ? "bg-[#C0F9C9]"
               : "bg-[#FFB7B7]"
           )}
@@ -536,19 +536,23 @@ const AddSectionStable: FC = () => {
           <div
             className={clsx(
               "flex flex-col gap-y-3 rounded-xl px-6 py-3 bg-[#ECFFEF]",
-              parseFloat(nativeBal?.formatted ?? "0") > gasEstimate
+              fixedAmtNum(nativeBal?.formatted) > gasEstimate
                 ? "bg-[#ECFFEF]"
                 : "bg-[#FFE8E8]"
             )}
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              <p>
-                <span className="opacity-40 mr-2 font-semibold">
-                  {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
-                </span>
-                <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
-              </p>
+              {gasEstimate === 0 && !isError ? (
+                <p>Estimating Gas...</p>
+              ) : (
+                <p>
+                  <span className="opacity-40 mr-2 font-semibold">
+                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                  </span>
+                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                </p>
+              )}
             </div>
             <div className="inline-flex items-center font-medium text-[14px] leading-5 text-[#344054]">
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index a8196a1..482a1f0 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -89,8 +89,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const [positions, setPositions] = useAtom(positionsAtom);
   const [lpTokenPricesMap] = useAtom(lpTokenPricesAtom);
   const [tokenPricesMap] = useAtom(tokenPricesAtom);
-  const [, setIsEvmPosLoading] = useAtom(evmPosLoadingAtom);
-  const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
+  // const [, setIsEvmPosLoading] = useAtom(evmPosLoadingAtom);
+  // const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
 
   const [SLIPPAGE] = useAtom(slippageAtom);
   const [txnHash, setTxnHash] = useState<string>("");
@@ -917,7 +917,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
 
   const ConfirmStep = () => {
     // Gas estimate
-    const { gasEstimate } = useGasEstimation(
+    const { gasEstimate, isError } = useGasEstimation(
       selectedFarm!.router,
       1,
       0,
@@ -1052,12 +1052,16 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              <p className="inline-flex">
-                <span className="opacity-40 mr-2 font-semibold">
-                  {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
-                </span>
-                <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
-              </p>
+              {gasEstimate === 0 && !isError ? (
+                <p>Estimating Gas...</p>
+              ) : (
+                <p>
+                  <span className="opacity-40 mr-2 font-semibold">
+                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                  </span>
+                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                </p>
+              )}
             </div>
             <div className="inline-flex items-center font-medium text-[14px] leading-5 text-[#344054]">
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index e777ff7..01297ae 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -595,7 +595,7 @@ const RemoveSectionStable: FC = () => {
       ) as any
     );
     // Gas estimate
-    const { gasEstimate } = useGasEstimation(
+    const { gasEstimate, isError } = useGasEstimation(
       farm!.router,
       1,
       1,
@@ -684,12 +684,16 @@ const RemoveSectionStable: FC = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              <p>
-                <span className="opacity-40 mr-2 font-semibold">
-                  {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
-                </span>
-                <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
-              </p>
+              {gasEstimate === 0 && !isError ? (
+                <p>Estimating Gas...</p>
+              ) : (
+                <p>
+                  <span className="opacity-40 mr-2 font-semibold">
+                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                  </span>
+                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                </p>
+              )}
             </div>
             <div className="inline-flex items-center font-medium text-[14px] leading-5 text-[#344054]">
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index 2911cfe..c52cc0e 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -609,7 +609,7 @@ const RemoveSectionStandard = () => {
 
   const ConfirmStep = () => {
     // Gas estimate
-    const { gasEstimate } = useGasEstimation(
+    const { gasEstimate, isError } = useGasEstimation(
       farm!.router,
       1,
       1,
@@ -720,12 +720,16 @@ const RemoveSectionStandard = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              <p>
-                <span className="opacity-40 mr-2 font-semibold">
-                  {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
-                </span>
-                <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
-              </p>
+              {gasEstimate === 0 && !isError ? (
+                <p>Estimating Gas...</p>
+              ) : (
+                <p>
+                  <span className="opacity-40 mr-2 font-semibold">
+                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                  </span>
+                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                </p>
+              )}
             </div>
             <div className="inline-flex items-center font-medium text-[14px] leading-5 text-[#344054]">
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index 0a5f091..66dc4d0 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -435,7 +435,7 @@ const StakingModal = () => {
 
   const ConfirmStep = () => {
     // Gas estimate
-    const { gasEstimate } = useGasEstimation(
+    const { gasEstimate, isError } = useGasEstimation(
       farm!.chef,
       0,
       2,
@@ -505,12 +505,16 @@ const StakingModal = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              <p>
-                <span className="opacity-40 mr-2 font-semibold">
-                  {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
-                </span>
-                <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
-              </p>
+              {gasEstimate === 0 && !isError ? (
+                <p>Estimating Gas...</p>
+              ) : (
+                <p>
+                  <span className="opacity-40 mr-2 font-semibold">
+                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                  </span>
+                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                </p>
+              )}
             </div>
             <div className="inline-flex items-center font-medium text-[14px] leading-5 text-[#344054]">
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
diff --git a/src/components/Library/UnstakingModal/index.tsx b/src/components/Library/UnstakingModal/index.tsx
index 00b7866..8491c57 100644
--- a/src/components/Library/UnstakingModal/index.tsx
+++ b/src/components/Library/UnstakingModal/index.tsx
@@ -401,7 +401,7 @@ const UnstakingModal = () => {
 
   const ConfirmStep = () => {
     // Gas estimate
-    const { gasEstimate } = useGasEstimation(
+    const { gasEstimate, isError } = useGasEstimation(
       farm!.chef,
       0,
       3,
@@ -466,12 +466,16 @@ const UnstakingModal = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              <p>
-                <span className="opacity-40 mr-2 font-semibold">
-                  {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
-                </span>
-                <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
-              </p>
+              {gasEstimate === 0 && !isError ? (
+                <p>Estimating Gas...</p>
+              ) : (
+                <p>
+                  <span className="opacity-40 mr-2 font-semibold">
+                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                  </span>
+                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                </p>
+              )}
             </div>
             <div className="inline-flex items-center font-medium text-[14px] leading-5 text-[#344054]">
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
diff --git a/src/hooks/useGasEstimation.ts b/src/hooks/useGasEstimation.ts
index 74951d4..a19e3f6 100644
--- a/src/hooks/useGasEstimation.ts
+++ b/src/hooks/useGasEstimation.ts
@@ -69,7 +69,11 @@ const useGasEstimation = (
   farmition: FarmType | PortfolioPositionType,
   account: Address,
   args: Array<any>
-) => {
+): {
+  gasEstimate: number;
+  // isLoading: boolean;
+  isError: boolean;
+} => {
   // const { chain } = useNetwork();
   // const publicClient = usePublicClient({ chainId: 1284 });
   const publicClient = usePublicClient();
@@ -79,6 +83,8 @@ const useGasEstimation = (
   // });
   const [gasEstimateAmount, setGasEstimateAmount] = useState<number>(0);
   const [gasPrice, setGasPrice] = useState<number>(0);
+  // const [isLoading, setIsLoading] = useState<boolean>(false);
+  const [isError, setIsError] = useState<boolean>(false);
 
   // if any arg is 0
   if (
@@ -92,6 +98,8 @@ const useGasEstimation = (
     console.log("arg0");
     return {
       gasEstimate: 0,
+      // isLoading: false,
+      isError: false,
     };
   } else if (
     farmition.farmType == "StableAmm" &&
@@ -103,6 +111,8 @@ const useGasEstimation = (
     console.log("arg0");
     return {
       gasEstimate: 0,
+      // isLoading: false,
+      isError: false,
     };
     // } else {
   } else {
@@ -120,6 +130,7 @@ const useGasEstimation = (
         setGasEstimateAmount(Number(res));
       });
     } catch (error) {
+      setIsError(true);
       setGasEstimateAmount(0);
       console.log("Error: Estimating Gas", error);
     }
@@ -131,6 +142,7 @@ const useGasEstimation = (
       });
     } catch (error) {
       setGasPrice(0);
+      setIsError(true);
       console.log("Error: Getting Gas Price", error);
     }
 
@@ -142,9 +154,10 @@ const useGasEstimation = (
       "gas",
       (gasEstimateAmount * gasPrice) / 10 ** 18
     );
-
     return {
       gasEstimate: (gasEstimateAmount * gasPrice) / 10 ** 18,
+      // isLoading,
+      isError,
     };
   }
 };

From 08307f3499e03d1eb8aa963f7457be9d0599b1a4 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 16 Aug 2023 21:20:29 +0530
Subject: [PATCH 03/27] charcter restrictions in inputs

---
 .../AddLiquidityModal/AddSectionMangata.tsx   |  2 +-
 .../AddLiquidityModal/AddSectionStable.tsx    |  2 +-
 .../AddLiquidityModal/AddSectionStandard.tsx  | 15 ++++++++----
 .../Library/AddLiquidityModal/TokenInput.tsx  |  6 ++++-
 .../RemoveSectionMangata.tsx                  | 24 ++++++++-----------
 .../RemoveSectionStable.tsx                   | 19 ++++++++-------
 .../RemoveSectionStandard.tsx                 | 20 +++++++++-------
 src/components/Library/SlippageModal.tsx      |  5 +++-
 src/components/Library/StakingModal/index.tsx | 20 +++++++++++-----
 .../Library/UnstakingModal/index.tsx          | 20 +++++++++++-----
 10 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx b/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
index 6fb7706..58c84b7 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
@@ -1051,7 +1051,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
               {fees === 0 && !isErrorFees ? (
-                <p>Estimating Gas...</p>
+                <p>estimating gas...</p>
               ) : (
                 <p className="inline-flex">
                   <span className="opacity-40 mr-2 font-semibold">
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index 9013544..78d0290 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -544,7 +544,7 @@ const AddSectionStable: FC = () => {
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
               {gasEstimate === 0 && !isError ? (
-                <p>Estimating Gas...</p>
+                <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index 482a1f0..35311b3 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -506,18 +506,23 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const handleChangeFirstTokenAmount = async (
     e: React.ChangeEvent<HTMLInputElement>
   ) => {
-    setFirstTokenAmount(e.target.value);
+    const value = e.target.value;
+    // regex only let numerical values
+    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+      setFirstTokenAmount(value);
+    }
     // update first amount based on second
-    updateSecondTokenAmount(parseFloat(e.target.value));
+    updateSecondTokenAmount(parseFloat(value));
   };
 
   // update token values
   const handleChangeSecondTokenAmount = async (
     e: React.ChangeEvent<HTMLInputElement>
   ) => {
-    setSecondTokenAmount(e.target.value);
+    const value = e.target.value;
+    setSecondTokenAmount(value);
     // update first amount based on second
-    updateFirstTokenAmount(parseFloat(e.target.value));
+    updateFirstTokenAmount(parseFloat(value));
   };
 
   useEffect(() => {
@@ -1053,7 +1058,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
               {gasEstimate === 0 && !isError ? (
-                <p>Estimating Gas...</p>
+                <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
diff --git a/src/components/Library/AddLiquidityModal/TokenInput.tsx b/src/components/Library/AddLiquidityModal/TokenInput.tsx
index 7519c96..108de10 100644
--- a/src/components/Library/AddLiquidityModal/TokenInput.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenInput.tsx
@@ -107,7 +107,11 @@ const TokenInput: React.FC<TokenInputProps> = ({
           value={inputMap[token?.address] ?? ""}
           onChange={(event) => {
             event.preventDefault();
-            handleInput(token, event.target.value);
+            const value = event.target.value;
+            // regex for inputing decimals upto 10 digits
+            if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+              handleInput(token, value);
+            }
           }}
           ref={inputRef}
           onFocus={() => setFocusedInput(index)}
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
index 6e45959..eb5f3f3 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
@@ -237,10 +237,15 @@ const RemoveSectionMangata: FC = () => {
   const handlePercChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = parseFloat(event.target.value);
-    if ((value >= 0 && value <= 100) || event.target.value == "") {
-      setPercentage(event.target.value);
-    } else {
-      alert("Percentage must be between 0 & 100!");
+    if (
+      /^(?:[1-9][0-9]{0,1}|0|100)$/.test(event.target.value) ||
+      event.target.value === ""
+    ) {
+      if ((value >= 0 && value <= 100) || event.target.value == "") {
+        setPercentage(event.target.value);
+      } else {
+        alert("Percentage must be between 0 & 100!");
+      }
     }
   };
 
@@ -248,17 +253,8 @@ const RemoveSectionMangata: FC = () => {
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = event.target.value;
-    if (parseFloat(value) >= 0 || value == "") {
+    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
       setLpTokens(event.target.value);
-    } else {
-      alert("LP Amount can't be negative!");
-      // toast({
-      //   position: "top",
-      //   duration: 3000,
-      //   render: () => (
-      //     <ToastWrapper title="LP tokens can not be negative!" status="error" />
-      //   ),
-      // });
     }
   };
 
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index 01297ae..70d9d2c 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -108,10 +108,15 @@ const RemoveSectionStable: FC = () => {
   const handlePercChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = parseFloat(event.target.value);
-    if ((value >= 0 && value <= 100) || event.target.value == "") {
-      setPercentage(event.target.value);
-    } else {
-      alert("Percentage must be between 0 & 100!");
+    if (
+      /^(?:[1-9][0-9]{0,1}|0|100)$/.test(event.target.value) ||
+      event.target.value === ""
+    ) {
+      if ((value >= 0 && value <= 100) || event.target.value == "") {
+        setPercentage(event.target.value);
+      } else {
+        alert("Percentage must be between 0 & 100!");
+      }
     }
   };
 
@@ -119,10 +124,8 @@ const RemoveSectionStable: FC = () => {
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = event.target.value;
-    if (parseFloat(value) >= 0 || value == "") {
+    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
       setLpTokens(event.target.value);
-    } else {
-      alert("LP Amount can't be negative!");
     }
   };
 
@@ -685,7 +688,7 @@ const RemoveSectionStable: FC = () => {
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
               {gasEstimate === 0 && !isError ? (
-                <p>Estimating Gas...</p>
+                <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index c52cc0e..7ff3da5 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -110,10 +110,16 @@ const RemoveSectionStandard = () => {
   const handlePercChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = parseFloat(event.target.value); // Removes any non-number items and converts to Number
-    if ((value >= 0 && value <= 100) || event.target.value == "") {
-      setPercentage(event.target.value);
-    } else {
-      alert("Percentage must be between 0 & 100!");
+    // if ((value >= 0 && value <= 100) || event.target.value == "") {
+    if (
+      /^(?:[1-9][0-9]{0,1}|0|100)$/.test(event.target.value) ||
+      event.target.value === ""
+    ) {
+      if ((value >= 0 && value <= 100) || event.target.value == "") {
+        setPercentage(event.target.value);
+      } else {
+        alert("Percentage must be between 0 & 100!");
+      }
     }
   };
 
@@ -121,10 +127,8 @@ const RemoveSectionStandard = () => {
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = event.target.value;
-    if (parseFloat(value) >= 0 || value == "") {
+    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
       setLpTokens(event.target.value);
-    } else {
-      alert("LP Amount can't be negative!");
     }
   };
 
@@ -721,7 +725,7 @@ const RemoveSectionStandard = () => {
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
               {gasEstimate === 0 && !isError ? (
-                <p>Estimating Gas...</p>
+                <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
diff --git a/src/components/Library/SlippageModal.tsx b/src/components/Library/SlippageModal.tsx
index 56f50a0..1167816 100644
--- a/src/components/Library/SlippageModal.tsx
+++ b/src/components/Library/SlippageModal.tsx
@@ -51,7 +51,10 @@ const SlippageModal = () => {
             placeholder="0"
             className="text-lg leading-[27px] w-full font-bold text-[#344054] text-left bg-transparent focus:outline-none"
             onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-              setInputSlippage(event.target.value);
+              const value = event.target.value;
+              if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+                setInputSlippage(event.target.value);
+              }
             }}
             value={inputSlippage}
             name="slippage"
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index 66dc4d0..f5a7a07 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -89,17 +89,25 @@ const StakingModal = () => {
   const handlePercChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = parseFloat(event.target.value); // Removes any non-number items and converts to Number
-    if ((value >= 0 && value <= 100) || event.target.value == "") {
-      setPercentage(event.target.value);
-    } else {
-      alert("Percentage must be between 0 & 100!");
+    if (
+      /^(?:[1-9][0-9]{0,1}|0|100)$/.test(event.target.value) ||
+      event.target.value === ""
+    ) {
+      if ((value >= 0 && value <= 100) || event.target.value == "") {
+        setPercentage(event.target.value);
+      } else {
+        alert("Percentage must be between 0 & 100!");
+      }
     }
   };
 
   // When InputType.Token
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
-    setLpTokens(event.target.value);
+    const value = event.target.value;
+    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+      setLpTokens(value);
+    }
   };
 
   useEffect(() => {
@@ -506,7 +514,7 @@ const StakingModal = () => {
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
               {gasEstimate === 0 && !isError ? (
-                <p>Estimating Gas...</p>
+                <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
diff --git a/src/components/Library/UnstakingModal/index.tsx b/src/components/Library/UnstakingModal/index.tsx
index 8491c57..eed0668 100644
--- a/src/components/Library/UnstakingModal/index.tsx
+++ b/src/components/Library/UnstakingModal/index.tsx
@@ -82,17 +82,25 @@ const UnstakingModal = () => {
   const handlePercChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = parseFloat(event.target.value);
-    if ((value >= 0 && value <= 100) || event.target.value == "") {
-      setPercentage(event.target.value);
-    } else {
-      alert("Percentage must be between 0 & 100!");
+    if (
+      /^(?:[1-9][0-9]{0,1}|0|100)$/.test(event.target.value) ||
+      event.target.value === ""
+    ) {
+      if ((value >= 0 && value <= 100) || event.target.value == "") {
+        setPercentage(event.target.value);
+      } else {
+        alert("Percentage must be between 0 & 100!");
+      }
     }
   };
 
   // When InputType.Token
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
-    setLpTokens(event.target.value);
+    const value = event.target.value;
+    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+      setLpTokens(event.target.value);
+    }
   };
 
   useEffect(() => {
@@ -467,7 +475,7 @@ const UnstakingModal = () => {
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
               {gasEstimate === 0 && !isError ? (
-                <p>Estimating Gas...</p>
+                <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">

From 7ab09f64f306f02969f3ef6ab73a05c851a0e515 Mon Sep 17 00:00:00 2001
From: Jack Sparrow <capjacksparrow42@protonmail.com>
Date: Wed, 16 Aug 2023 22:21:48 +0530
Subject: [PATCH 04/27] skywalker: disable input @addstandard

---
 .../Library/AddLiquidityModal/AddSectionStandard.tsx        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index 35311b3..e6ecbf9 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -654,6 +654,12 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
             className={clsx(
               "text-base text-[#4E4C4C] font-bold leading-6 text-left bg-transparent focus:outline-none"
             )}
+            disabled={
+              approveToken0CallLoading ||
+              approveToken0TxnLoading ||
+              approveToken1CallLoading ||
+              approveToken1TxnLoading
+            }
             onChange={handleChangeFirstTokenAmount}
             value={firstTokenAmount}
             name="firstTokenAmount"

From a7dd778d686562221bf6fd0d055154e31ea42ce6 Mon Sep 17 00:00:00 2001
From: Jack Sparrow <capjacksparrow42@protonmail.com>
Date: Wed, 16 Aug 2023 23:00:11 +0530
Subject: [PATCH 05/27] skywalker: disable input @addstable wip

---
 .../AddLiquidityModal/AddSectionStable.tsx    |  9 ++++++-
 .../Library/AddLiquidityModal/TokenButton.tsx | 24 +++++++++++++++++++
 .../Library/AddLiquidityModal/TokenInput.tsx  | 17 +++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index 78d0290..962338f 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -58,6 +58,8 @@ const AddSectionStable: FC = () => {
   const { address, connector } = useAccount();
   const { chain } = useNetwork();
 
+  const [isApproving, setIsApproving] = useState(false);
+
   // Transaction Process Steps
   const [isConfirmStep, setIsConfirmStep] = useState(false);
   const [isProcessStep, setIsProcessStep] = useState(false);
@@ -81,8 +83,11 @@ const AddSectionStable: FC = () => {
   const [balanceMap, setBalanceMap] = useState<{
     [address: Address]: string;
   }>({});
+  const [isApprovingMap, setIsApprovingMap] = useState<{
+    [address: Address]: boolean;
+  }>({});
 
-  const [farms] = useAtom(farmsAtom);
+  // const [farms] = useAtom(farmsAtom);
   const [positions, setPositions] = useAtom(positionsAtom);
   const [lpTokenPricesMap, setLpTokenPricesMap] = useAtom(lpTokenPricesAtom);
   const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
@@ -365,6 +370,7 @@ const AddSectionStable: FC = () => {
             index={index}
             handleInput={handleInput}
             inputMap={inputMap}
+            isApproving={isApprovingMap}
             balanceMap={balanceMap}
             setBalanceMap={setBalanceMap}
             nativeBal={parseFloat(nativeBal?.formatted!).toLocaleString(
@@ -406,6 +412,7 @@ const AddSectionStable: FC = () => {
                 token={token}
                 inputMapAmount={inputMapAmount}
                 selectedFarm={farm!}
+                setIsApproving={setIsApprovingMap}
                 approvalMap={approvalMap}
                 setApprovalMap={setApprovalMap}
               />
diff --git a/src/components/Library/AddLiquidityModal/TokenButton.tsx b/src/components/Library/AddLiquidityModal/TokenButton.tsx
index 2fca4d7..92fd87c 100644
--- a/src/components/Library/AddLiquidityModal/TokenButton.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenButton.tsx
@@ -15,6 +15,11 @@ interface Props {
       [address: Address]: boolean;
     }>
   >;
+  setIsApproving: React.Dispatch<
+    React.SetStateAction<{
+      [address: `0x${string}`]: boolean;
+    }>
+  >;
 }
 
 const TokenButton: React.FC<Props> = ({
@@ -23,6 +28,7 @@ const TokenButton: React.FC<Props> = ({
   selectedFarm,
   approvalMap,
   setApprovalMap,
+  setIsApproving,
 }) => {
   // Check Approval Token
   const { isSuccess: isApprovedSuccess } = useIsApprovedToken(
@@ -38,6 +44,24 @@ const TokenButton: React.FC<Props> = ({
     writeAsync: approveToken,
   } = useApproveToken(token?.address, selectedFarm?.router, token?.symbol);
 
+  // useEffect(() => {
+  //   if (isLoadingApproveCall || isLoadingApproveTxn) {
+  //     setIsApproving((prev) => {
+  //       return {
+  //         ...prev,
+  //         [token?.address]: true,
+  //       };
+  //     });
+  //   } else {
+  //     setIsApproving((prev) => {
+  //       return {
+  //         ...prev,
+  //         [token?.address]: false,
+  //       };
+  //     });
+  //   }
+  // }, [isLoadingApproveCall || isLoadingApproveTxn]);
+
   useEffect(() => {
     // Either already approved or approved after transaction
     if (
diff --git a/src/components/Library/AddLiquidityModal/TokenInput.tsx b/src/components/Library/AddLiquidityModal/TokenInput.tsx
index 108de10..b5f9c9a 100644
--- a/src/components/Library/AddLiquidityModal/TokenInput.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenInput.tsx
@@ -19,6 +19,9 @@ interface TokenInputProps {
     }>
   >;
   nativeBal: string;
+  isApproving: {
+    [address: Address]: boolean;
+  };
   logos: string | string[];
   tokensLength: number;
   focusedInput: number;
@@ -33,6 +36,7 @@ const TokenInput: React.FC<TokenInputProps> = ({
   balanceMap,
   setBalanceMap,
   nativeBal,
+  isApproving,
   logos,
   tokensLength,
   focusedInput,
@@ -70,6 +74,18 @@ const TokenInput: React.FC<TokenInputProps> = ({
     }
   }, [isSuccess]);
 
+  function isAllTrue(isApprovingMap: { [address: string]: boolean }): boolean {
+    // Iterate over the keys in isApprovingMap
+    for (const address in isApprovingMap) {
+      // If any value is false, return false
+      if (!isApprovingMap[address]) {
+        return false;
+      }
+    }
+    // If all values are true, return true
+    return true;
+  }
+
   return (
     <div>
       <div className="relative flex flex-row justify-between px-6 py-[14px] border border-[#D0D5DD] rounded-lg">
@@ -104,6 +120,7 @@ const TokenInput: React.FC<TokenInputProps> = ({
               : "text-[#4E4C4C]"
           )}
           min={0}
+          disabled={isAllTrue(isApproving)}
           value={inputMap[token?.address] ?? ""}
           onChange={(event) => {
             event.preventDefault();

From f969a4b20609780f76aa56843a3a425f5211852c Mon Sep 17 00:00:00 2001
From: Jack Sparrow <capjacksparrow42@protonmail.com>
Date: Wed, 16 Aug 2023 23:17:17 +0530
Subject: [PATCH 06/27] lint fix

---
 src/utils/farmListMethods.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/farmListMethods.ts b/src/utils/farmListMethods.ts
index 7686eab..d3e562b 100644
--- a/src/utils/farmListMethods.ts
+++ b/src/utils/farmListMethods.ts
@@ -98,6 +98,7 @@ export function getWalletInstallUrl(walletName: string): string {
 }
 
 export function checkIfPoolSupported(farm: FarmType): boolean {
+  if (farm == undefined) return false;
   if (farm?.farmType == "SingleStaking") return false;
   const protocols = supportedPools[farm.chain.toLocaleLowerCase()];
   if (!!protocols) return protocols.includes(farm.protocol.toLowerCase());

From 2dc965620bc698b8c90171d4788e76502ad1639a Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Thu, 17 Aug 2023 14:56:55 +0530
Subject: [PATCH 07/27] Added max decimal places limit based on tokens

---
 .../AddLiquidityModal/AddSectionStandard.tsx  | 20 ++++++++++++-------
 .../Library/AddLiquidityModal/TokenInput.tsx  |  6 ++++--
 .../RemoveSectionMangata.tsx                  |  4 +++-
 .../RemoveSectionStable.tsx                   |  4 +++-
 .../RemoveSectionStandard.tsx                 |  4 +++-
 src/components/Library/StakingModal/index.tsx |  4 +++-
 .../Library/UnstakingModal/index.tsx          |  4 +++-
 src/utils/createRegex.ts                      |  6 ++++++
 8 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 src/utils/createRegex.ts

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index e6ecbf9..44541f8 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -62,6 +62,7 @@ import {
 } from "@utils/position-utils/evmPositions";
 import BigNumber from "bignumber.js";
 import Countdown from "../Countdown";
+import { createNumRegex } from "@utils/createRegex";
 
 enum InputType {
   Off = -1,
@@ -507,12 +508,13 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     e: React.ChangeEvent<HTMLInputElement>
   ) => {
     const value = e.target.value;
-    // regex only let numerical values
-    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+    // regex only let numerical values upto token decimals
+    const regex = createNumRegex(farmAsset0.decimals);
+    if (regex.test(value) || value === "") {
       setFirstTokenAmount(value);
+      // update first amount based on second
+      updateSecondTokenAmount(parseFloat(value));
     }
-    // update first amount based on second
-    updateSecondTokenAmount(parseFloat(value));
   };
 
   // update token values
@@ -520,9 +522,13 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     e: React.ChangeEvent<HTMLInputElement>
   ) => {
     const value = e.target.value;
-    setSecondTokenAmount(value);
-    // update first amount based on second
-    updateFirstTokenAmount(parseFloat(value));
+    // regex only let numerical values upto token decimals
+    const regex = createNumRegex(farmAsset1.decimals);
+    if (regex.test(value) || value === "") {
+      setSecondTokenAmount(value);
+      // update first amount based on second
+      updateFirstTokenAmount(parseFloat(value));
+    }
   };
 
   useEffect(() => {
diff --git a/src/components/Library/AddLiquidityModal/TokenInput.tsx b/src/components/Library/AddLiquidityModal/TokenInput.tsx
index b5f9c9a..96b2f05 100644
--- a/src/components/Library/AddLiquidityModal/TokenInput.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenInput.tsx
@@ -4,6 +4,7 @@ import Image from "next/image";
 import { Address, useAccount, useBalance, useNetwork } from "wagmi";
 import clsx from "clsx";
 import { fixedAmtNum } from "@utils/abis/contract-helper-methods";
+import { createNumRegex } from "@utils/createRegex";
 
 interface TokenInputProps {
   token: UnderlyingAssets;
@@ -125,8 +126,9 @@ const TokenInput: React.FC<TokenInputProps> = ({
           onChange={(event) => {
             event.preventDefault();
             const value = event.target.value;
-            // regex for inputing decimals upto 10 digits
-            if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+            // regex for inputing decimals upto token decimal places
+            const regex = createNumRegex(token?.decimals);
+            if (regex.test(value) || value === "") {
               handleInput(token, value);
             }
           }}
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
index eb5f3f3..477db9d 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
@@ -45,6 +45,7 @@ import getTimestamp from "@utils/getTimestamp";
 import { fixedAmtNum } from "@utils/abis/contract-helper-methods";
 import { fetchTokenPricesMangata } from "@utils/fetch-prices";
 import Countdown from "../Countdown";
+import { createNumRegex } from "@utils/createRegex";
 
 interface ChosenMethodProps {
   farm: FarmType;
@@ -253,7 +254,8 @@ const RemoveSectionMangata: FC = () => {
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = event.target.value;
-    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+    const regex = createNumRegex(18);
+    if (regex.test(value) || value === "") {
       setLpTokens(event.target.value);
     }
   };
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index 70d9d2c..1077f33 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -52,6 +52,7 @@ import { handleRemoveLiquidityEvent } from "@utils/tracking";
 import getTimestamp from "@utils/getTimestamp";
 import { updateEvmPositions } from "@utils/position-utils/evmPositions";
 import Countdown from "../Countdown";
+import { createNumRegex } from "@utils/createRegex";
 
 enum RemoveMethod {
   ALL = 0,
@@ -124,7 +125,8 @@ const RemoveSectionStable: FC = () => {
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = event.target.value;
-    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+    const regex = createNumRegex(18);
+    if (regex.test(value) || value === "") {
       setLpTokens(event.target.value);
     }
   };
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index 7ff3da5..ca3f3d1 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -55,6 +55,7 @@ import { handleRemoveLiquidityEvent } from "@utils/tracking";
 import getTimestamp from "@utils/getTimestamp";
 import BigNumber from "bignumber.js";
 import Countdown from "../Countdown";
+import { createNumRegex } from "@utils/createRegex";
 
 const RemoveSectionStandard = () => {
   const { address, connector } = useAccount();
@@ -127,7 +128,8 @@ const RemoveSectionStandard = () => {
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = event.target.value;
-    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+    const regex = createNumRegex(18);
+    if (regex.test(value) || value === "") {
       setLpTokens(event.target.value);
     }
   };
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index f5a7a07..d85c691 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -41,6 +41,7 @@ import toUnits from "@utils/toUnits";
 import BigNumber from "bignumber.js";
 import { updateEvmPositions } from "@utils/position-utils/evmPositions";
 import Countdown from "../Countdown";
+import { createNumRegex } from "@utils/createRegex";
 
 interface ChosenMethodProps {
   farm: FarmType;
@@ -105,7 +106,8 @@ const StakingModal = () => {
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = event.target.value;
-    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+    const regex = createNumRegex(18);
+    if (regex.test(value) || value === "") {
       setLpTokens(value);
     }
   };
diff --git a/src/components/Library/UnstakingModal/index.tsx b/src/components/Library/UnstakingModal/index.tsx
index eed0668..4857538 100644
--- a/src/components/Library/UnstakingModal/index.tsx
+++ b/src/components/Library/UnstakingModal/index.tsx
@@ -40,6 +40,7 @@ import getTimestamp from "@utils/getTimestamp";
 import BigNumber from "bignumber.js";
 import { updateEvmPositions } from "@utils/position-utils/evmPositions";
 import Countdown from "../Countdown";
+import { createNumRegex } from "@utils/createRegex";
 
 interface ChosenMethodProps {
   farm: FarmType;
@@ -98,7 +99,8 @@ const UnstakingModal = () => {
   const handleLpTokensChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     event.preventDefault();
     const value = event.target.value;
-    if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+    const regex = createNumRegex(18);
+    if (regex.test(value) || value === "") {
       setLpTokens(event.target.value);
     }
   };
diff --git a/src/utils/createRegex.ts b/src/utils/createRegex.ts
new file mode 100644
index 0000000..e126f60
--- /dev/null
+++ b/src/utils/createRegex.ts
@@ -0,0 +1,6 @@
+export function createNumRegex(decimal: number): RegExp {
+  if (!decimal || decimal == undefined) {
+    return new RegExp(`^(\\d+\\.?\\d*|\\.\\d+)$`);
+  }
+  return new RegExp(`^(\\d+\\.?\\d{0,${decimal}}|\\.\\d{1,${decimal}})$`);
+}

From d7ffe3a0163edf8b6473ce2b356f46da649353d4 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Thu, 17 Aug 2023 17:00:41 +0530
Subject: [PATCH 08/27] updated // token allownace method

---
 .../AddLiquidityModal/AddSectionStandard.tsx  |  18 +++-
 .../Library/AddLiquidityModal/TokenButton.tsx |  28 ++++-
 .../RemoveSectionStable.tsx                   |   5 +-
 .../RemoveSectionStandard.tsx                 |   5 +-
 src/components/Library/StakingModal/index.tsx |   9 +-
 src/hooks/useApprovalHooks.ts                 | 102 ++++++++++--------
 6 files changed, 110 insertions(+), 57 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index 44541f8..2b0a5d3 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -312,13 +312,21 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     // data: isToken0Approved,
     isLoading: isToken0ApprovedLoading,
     isSuccess: isToken0ApprovedSuccess,
-  } = useIsApprovedToken(farmAsset0?.address, selectedFarm?.router!);
+  } = useIsApprovedToken(
+    farmAsset0?.address,
+    selectedFarm?.router!,
+    token0Balance?.formatted
+  );
 
   const {
     // data: isToken1Approved,
     isLoading: isToken1ApprovedLoading,
     isSuccess: isToken1ApprovedSuccess,
-  } = useIsApprovedToken(farmAsset1?.address, selectedFarm?.router!);
+  } = useIsApprovedToken(
+    farmAsset1?.address,
+    selectedFarm?.router!,
+    token1Balance?.formatted
+  );
 
   // To approve token0 and token1
   const {
@@ -330,7 +338,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   } = useApproveToken(
     farmAsset0?.address,
     selectedFarm?.router!,
-    farmAsset0?.symbol
+    farmAsset0?.symbol,
+    token0Balance?.formatted
   );
   const {
     isLoadingApproveCall: approveToken1CallLoading,
@@ -341,7 +350,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   } = useApproveToken(
     farmAsset1?.address,
     selectedFarm?.router!,
-    farmAsset1?.symbol
+    farmAsset1?.symbol,
+    token1Balance?.formatted
   );
 
   const {
diff --git a/src/components/Library/AddLiquidityModal/TokenButton.tsx b/src/components/Library/AddLiquidityModal/TokenButton.tsx
index 92fd87c..f97594f 100644
--- a/src/components/Library/AddLiquidityModal/TokenButton.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenButton.tsx
@@ -4,6 +4,7 @@ import MButton from "../MButton";
 import { useApproveToken, useIsApprovedToken } from "@hooks/useApprovalHooks";
 import { Address } from "viem";
 import clsx from "clsx";
+import { useAccount, useBalance, useNetwork } from "wagmi";
 
 interface Props {
   token: UnderlyingAssets;
@@ -30,10 +31,28 @@ const TokenButton: React.FC<Props> = ({
   setApprovalMap,
   setIsApproving,
 }) => {
+  const { address } = useAccount();
+  const { chain } = useNetwork();
+
+  // Balance Token
+  const {
+    data: balance,
+    isLoading: balanceLoading,
+    isSuccess,
+  } = useBalance({
+    address: address,
+    chainId: chain?.id,
+    token: token?.address,
+    enabled: !!address && !!token,
+  });
+
+  console.log("balance in tokenbutton", balance, isSuccess);
+
   // Check Approval Token
   const { isSuccess: isApprovedSuccess } = useIsApprovedToken(
     token?.address,
-    selectedFarm?.router
+    selectedFarm?.router,
+    balance?.formatted
   );
 
   // Approve token
@@ -42,7 +61,12 @@ const TokenButton: React.FC<Props> = ({
     isLoadingApproveTxn,
     isSuccessApproveTxn,
     writeAsync: approveToken,
-  } = useApproveToken(token?.address, selectedFarm?.router, token?.symbol);
+  } = useApproveToken(
+    token?.address,
+    selectedFarm?.router,
+    token?.symbol,
+    balance?.formatted
+  );
 
   // useEffect(() => {
   //   if (isLoadingApproveCall || isLoadingApproveTxn) {
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index 1077f33..9df08c7 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -223,7 +223,7 @@ const RemoveSectionStable: FC = () => {
     data: isLpApprovedData,
     isLoading: isLpApprovedLoading,
     isSuccess: isLpApprovedSuccess,
-  } = useIsApprovedToken(farm?.asset.address!, farm?.router!);
+  } = useIsApprovedToken(farm?.asset.address!, farm?.router!, lpBalance);
 
   // Approve LP token
   const {
@@ -234,7 +234,8 @@ const RemoveSectionStable: FC = () => {
   } = useApproveToken(
     farm?.asset.address!,
     farm?.router!,
-    getLpTokenSymbol(tokenNames)
+    getLpTokenSymbol(tokenNames),
+    lpBalance
   );
 
   // Remove Liquidity Call
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index ca3f3d1..66105e0 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -171,7 +171,7 @@ const RemoveSectionStandard = () => {
     data: isLpApprovedData,
     isLoading: isLpApprovedLoading,
     isSuccess: isLpApprovedSuccess,
-  } = useIsApprovedToken(farm?.asset.address!, farm?.router!);
+  } = useIsApprovedToken(farm?.asset.address!, farm?.router!, lpBalance);
 
   const {
     isLoadingApproveCall: approveLpLoading,
@@ -181,7 +181,8 @@ const RemoveSectionStandard = () => {
   } = useApproveToken(
     farm?.asset.address!,
     farm?.router!,
-    getLpTokenSymbol(tokenNames)
+    getLpTokenSymbol(tokenNames),
+    lpBalance
   );
 
   // Remove Liquidity
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index d85c691..284c19f 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -218,7 +218,11 @@ const StakingModal = () => {
     // data: isApprovedData,
     // isLoading: isApprovedLoading,
     isSuccess: isApprovedSuccess,
-  } = useIsApprovedToken(farm?.asset.address!, farm?.chef as Address);
+  } = useIsApprovedToken(
+    farm?.asset.address!,
+    farm?.chef as Address,
+    lpBalance?.formatted
+  );
 
   const {
     isLoadingApproveCall,
@@ -228,7 +232,8 @@ const StakingModal = () => {
   } = useApproveToken(
     farm?.asset.address!,
     farm?.chef as Address,
-    getLpTokenSymbol(tokenNames)
+    getLpTokenSymbol(tokenNames),
+    lpBalance?.formatted
   );
 
   // Stake LP Tokens
diff --git a/src/hooks/useApprovalHooks.ts b/src/hooks/useApprovalHooks.ts
index 6395556..a12e1f6 100644
--- a/src/hooks/useApprovalHooks.ts
+++ b/src/hooks/useApprovalHooks.ts
@@ -16,7 +16,11 @@ import toast from "react-hot-toast";
  * @param spender spender Contract Address
  * @returns data, isLoading, isError, isSuccess
  */
-const useIsApprovedToken = (tokenAddress: Address, spender: Address) => {
+const useIsApprovedToken = (
+  tokenAddress: Address,
+  spender: Address,
+  tokenBalance: string | undefined
+) => {
   const { address } = useAccount();
   const { data, isLoading, isError } = useContractRead({
     address: tokenAddress,
@@ -33,40 +37,45 @@ const useIsApprovedToken = (tokenAddress: Address, spender: Address) => {
     console.log(
       "appdata",
       tokenAddress,
-      data,
-      Number(data) ==
-        parseInt(
-          (
-            BigInt(
-              2 **
-                (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
-                tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
-                  ? 128
-                  : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
-                  ? 96
-                  : 256)
-            ) - BigInt(1)
-          ).toString()
-        )
+      Number(data),
+      !tokenBalance ? false : Number(data) >= parseInt(tokenBalance)
+      // Number(data) ==
+      //   parseInt(
+      //     (
+      //       BigInt(
+      //         2 **
+      //           (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
+      //           tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
+      //             ? 128
+      //             : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
+      //             ? 96
+      //             : 256)
+      //       ) - BigInt(1)
+      //     ).toString()
+      //   )
     );
-    return (
-      Number(data) ==
-      parseInt(
-        (
-          BigInt(
-            2 **
-              (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
-              tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
-                ? 128
-                : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
-                ? 96
-                : 256)
-          ) - BigInt(1)
-        ).toString()
-      )
-    );
-  }, [data]);
+    // allowed tokens >= token balance
+    if (!tokenBalance) return false; // if balance not fetched yet show false
+    return Number(data) >= parseInt(tokenBalance);
 
+    // Allowed tokens are equal to MaxInt
+    // return (
+    //   Number(data) ==
+    //   parseInt(
+    //     (
+    //       BigInt(
+    //         2 **
+    //           (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
+    //           tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
+    //             ? 128
+    //             : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
+    //             ? 96
+    //             : 256)
+    //       ) - BigInt(1)
+    //     ).toString()
+    //   )
+    // );
+  }, [data]);
   return { data, isLoading, isError, isSuccess };
 };
 
@@ -79,9 +88,11 @@ const useIsApprovedToken = (tokenAddress: Address, spender: Address) => {
 const useApproveToken = (
   tokenAddress: Address,
   spender: Address,
-  tokenSymbol: string
+  tokenSymbol: string,
+  tokenBalance: string | undefined
 ) => {
   const { chain } = useNetwork();
+  console.log("token", tokenSymbol, "\ntokenBalance", tokenBalance);
   const {
     data,
     isLoading: isLoadingApproveCall,
@@ -95,17 +106,18 @@ const useApproveToken = (
     chainId: chain?.id,
     args: [
       spender, // spender
-      (
-        BigInt(
-          2 **
-            (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
-            tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
-              ? 128
-              : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
-              ? 96
-              : 256)
-        ) - BigInt(1)
-      ).toString(),
+      tokenBalance,
+      // (
+      //   BigInt(
+      //     2 **
+      //       (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
+      //       tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
+      //         ? 128
+      //         : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
+      //         ? 96
+      //         : 256)
+      //   ) - BigInt(1)
+      // ).toString(),
     ],
     onError: (error) => {
       console.log(`Error while Approving:`, error);

From ab0903569677606b697249470a3960f178a26bed Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Fri, 18 Aug 2023 16:33:03 +0530
Subject: [PATCH 09/27] fixed: token approval limit

---
 src/hooks/useApprovalHooks.ts | 50 ++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/hooks/useApprovalHooks.ts b/src/hooks/useApprovalHooks.ts
index a12e1f6..167f96d 100644
--- a/src/hooks/useApprovalHooks.ts
+++ b/src/hooks/useApprovalHooks.ts
@@ -33,32 +33,33 @@ const useIsApprovedToken = (
     enabled: !!address && !!spender,
   });
 
+  const formatData = (num: number) => {
+    if (!num) return 0;
+    const parts = num.toString().split(".");
+    return parseFloat(parts[0] + "." + parts[1].substring(0, 12));
+  };
+
   const isSuccess = useMemo(() => {
+    const numdata = Number(data) / 10 ** 12;
     console.log(
-      "appdata",
+      "token_address",
       tokenAddress,
-      Number(data),
-      !tokenBalance ? false : Number(data) >= parseInt(tokenBalance)
-      // Number(data) ==
-      //   parseInt(
-      //     (
-      //       BigInt(
-      //         2 **
-      //           (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
-      //           tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
-      //             ? 128
-      //             : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
-      //             ? 96
-      //             : 256)
-      //       ) - BigInt(1)
-      //     ).toString()
-      //   )
+      "\ndata",
+      data,
+      "\nnumber_data",
+      numdata,
+      "\ntokenBalance",
+      formatData(parseFloat(tokenBalance ?? "0")),
+      "\nisApproved: should be true if data >= tokenBalance",
+      !tokenBalance ? false : numdata >= formatData(parseFloat(tokenBalance))
     );
+
     // allowed tokens >= token balance
-    if (!tokenBalance) return false; // if balance not fetched yet show false
-    return Number(data) >= parseInt(tokenBalance);
+    return !tokenBalance
+      ? false
+      : numdata >= formatData(parseFloat(tokenBalance));
 
-    // Allowed tokens are equal to MaxInt
+    // Infinite token allowance
     // return (
     //   Number(data) ==
     //   parseInt(
@@ -106,9 +107,11 @@ const useApproveToken = (
     chainId: chain?.id,
     args: [
       spender, // spender
-      tokenBalance,
-      // (
-      //   BigInt(
+      BigInt(
+        parseInt((parseFloat(tokenBalance ?? "0") * 10 ** 12).toString())
+      ).toString(),
+      // BigInt(
+      //   parseFloat(tokenBalance!) *
       //     2 **
       //       (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
       //       tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
@@ -116,7 +119,6 @@ const useApproveToken = (
       //         : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
       //         ? 96
       //         : 256)
-      //   ) - BigInt(1)
       // ).toString(),
     ],
     onError: (error) => {

From 08425c51814bb47bffe8e26ec7809b0c1b710040 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Fri, 18 Aug 2023 17:44:19 +0530
Subject: [PATCH 10/27] revamped the approval logic, using input for checking

---
 .../AddLiquidityModal/AddSectionStable.tsx    |   4 +-
 .../AddLiquidityModal/AddSectionStandard.tsx  |  14 ++-
 .../Library/AddLiquidityModal/TokenButton.tsx |   3 +-
 .../RemoveSectionStable.tsx                   |   9 +-
 .../RemoveSectionStandard.tsx                 |   9 +-
 src/components/Library/StakingModal/index.tsx |   5 +-
 src/hooks/useApprovalHooks.ts                 | 102 ++++++++----------
 7 files changed, 78 insertions(+), 68 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index 962338f..f615604 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -46,7 +46,7 @@ import WrongNetworkModal from "../WrongNetworkModal";
 import useGasEstimation from "@hooks/useGasEstimation";
 import { getNativeTokenAddress } from "@utils/network";
 import {
-  fetchEvmPositions,
+  // fetchEvmPositions,
   updateEvmPositions,
 } from "@utils/position-utils/evmPositions";
 import { handleAddLiquidityEvent } from "@utils/tracking";
@@ -58,7 +58,7 @@ const AddSectionStable: FC = () => {
   const { address, connector } = useAccount();
   const { chain } = useNetwork();
 
-  const [isApproving, setIsApproving] = useState(false);
+  // const [isApproving, setIsApproving] = useState(false);
 
   // Transaction Process Steps
   const [isConfirmStep, setIsConfirmStep] = useState(false);
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index 2b0a5d3..dd02d85 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -299,6 +299,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     enabled: !!address && !!selectedFarm,
   });
 
+  console.log("token0Balance", token0Balance);
+
   // Balance Token1
   const { data: token1Balance, isLoading: token1BalanceLoading } = useBalance({
     address,
@@ -307,6 +309,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     enabled: !!address && !!selectedFarm,
   });
 
+  console.log("token0Balance", token0Balance);
+
   // Check Approval Token0 & Token1
   const {
     // data: isToken0Approved,
@@ -315,7 +319,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   } = useIsApprovedToken(
     farmAsset0?.address,
     selectedFarm?.router!,
-    token0Balance?.formatted
+    token0Balance,
+    fixedAmtNum(firstTokenAmount)
   );
 
   const {
@@ -325,7 +330,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   } = useIsApprovedToken(
     farmAsset1?.address,
     selectedFarm?.router!,
-    token1Balance?.formatted
+    token1Balance,
+    fixedAmtNum(secondTokenAmount)
   );
 
   // To approve token0 and token1
@@ -339,7 +345,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     farmAsset0?.address,
     selectedFarm?.router!,
     farmAsset0?.symbol,
-    token0Balance?.formatted
+    token0Balance
   );
   const {
     isLoadingApproveCall: approveToken1CallLoading,
@@ -351,7 +357,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     farmAsset1?.address,
     selectedFarm?.router!,
     farmAsset1?.symbol,
-    token1Balance?.formatted
+    token1Balance
   );
 
   const {
diff --git a/src/components/Library/AddLiquidityModal/TokenButton.tsx b/src/components/Library/AddLiquidityModal/TokenButton.tsx
index f97594f..d11010b 100644
--- a/src/components/Library/AddLiquidityModal/TokenButton.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenButton.tsx
@@ -52,7 +52,8 @@ const TokenButton: React.FC<Props> = ({
   const { isSuccess: isApprovedSuccess } = useIsApprovedToken(
     token?.address,
     selectedFarm?.router,
-    balance?.formatted
+    balance?.formatted,
+    inputMapAmount[token?.address]
   );
 
   // Approve token
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index 9df08c7..c2906f1 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -223,7 +223,14 @@ const RemoveSectionStable: FC = () => {
     data: isLpApprovedData,
     isLoading: isLpApprovedLoading,
     isSuccess: isLpApprovedSuccess,
-  } = useIsApprovedToken(farm?.asset.address!, farm?.router!, lpBalance);
+  } = useIsApprovedToken(
+    farm?.asset.address!,
+    farm?.router!,
+    lpBalance,
+    methodId == Method.PERCENTAGE
+      ? (fixedAmtNum(lpBalance) * fixedAmtNum(percentage)) / 100
+      : fixedAmtNum(lpTokens)
+  );
 
   // Approve LP token
   const {
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index 66105e0..ac9436f 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -171,7 +171,14 @@ const RemoveSectionStandard = () => {
     data: isLpApprovedData,
     isLoading: isLpApprovedLoading,
     isSuccess: isLpApprovedSuccess,
-  } = useIsApprovedToken(farm?.asset.address!, farm?.router!, lpBalance);
+  } = useIsApprovedToken(
+    farm?.asset.address!,
+    farm?.router!,
+    lpBalance,
+    methodId == Method.PERCENTAGE
+      ? (fixedAmtNum(lpBalance) * fixedAmtNum(percentage)) / 100
+      : fixedAmtNum(lpTokens)
+  );
 
   const {
     isLoadingApproveCall: approveLpLoading,
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index 284c19f..64c7a5e 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -221,7 +221,10 @@ const StakingModal = () => {
   } = useIsApprovedToken(
     farm?.asset.address!,
     farm?.chef as Address,
-    lpBalance?.formatted
+    lpBalance?.formatted,
+    methodId == 0
+      ? (lpBalanceNum * fixedAmtNum(percentage)) / 100
+      : fixedAmtNum(lpTokens)
   );
 
   const {
diff --git a/src/hooks/useApprovalHooks.ts b/src/hooks/useApprovalHooks.ts
index 167f96d..9635630 100644
--- a/src/hooks/useApprovalHooks.ts
+++ b/src/hooks/useApprovalHooks.ts
@@ -7,8 +7,9 @@ import {
   useWaitForTransaction,
 } from "wagmi";
 import { tokenAbi } from "@components/Common/Layout/evmUtils";
-import { useEffect, useMemo } from "react";
+import { useEffect } from "react";
 import toast from "react-hot-toast";
+import BigNumber from "bignumber.js";
 
 /**
  *
@@ -19,7 +20,8 @@ import toast from "react-hot-toast";
 const useIsApprovedToken = (
   tokenAddress: Address,
   spender: Address,
-  tokenBalance: string | undefined
+  tokenBalance: any | undefined,
+  input: number
 ) => {
   const { address } = useAccount();
   const { data, isLoading, isError } = useContractRead({
@@ -33,51 +35,44 @@ const useIsApprovedToken = (
     enabled: !!address && !!spender,
   });
 
-  const formatData = (num: number) => {
-    if (!num) return 0;
-    const parts = num.toString().split(".");
-    return parseFloat(parts[0] + "." + parts[1].substring(0, 12));
-  };
+  const allow = data as bigint;
+
+  const allowance = BigNumber(allow.toString(), 10)
+    // .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
+    .decimalPlaces(0, 1);
+  // console.log("allowance bigint", allow);
+  console.log("allowance", allowance.toString());
+
+  const inputAmount = BigNumber(input.toString(), 10)
+    .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
+    .decimalPlaces(0, 1);
+  console.log("inputAmount", inputAmount.toString());
 
-  const isSuccess = useMemo(() => {
-    const numdata = Number(data) / 10 ** 12;
-    console.log(
-      "token_address",
-      tokenAddress,
-      "\ndata",
-      data,
-      "\nnumber_data",
-      numdata,
-      "\ntokenBalance",
-      formatData(parseFloat(tokenBalance ?? "0")),
-      "\nisApproved: should be true if data >= tokenBalance",
-      !tokenBalance ? false : numdata >= formatData(parseFloat(tokenBalance))
-    );
+  const compare = inputAmount.isLessThanOrEqualTo(allowance);
+  console.log("compare", compare);
 
-    // allowed tokens >= token balance
-    return !tokenBalance
-      ? false
-      : numdata >= formatData(parseFloat(tokenBalance));
+  // const isSuccess = useMemo(() => {
+  //   const numdata = Number(data) / 10 ** 12;
+  //   // console.log(
+  //   //   "token_address",
+  //   //   tokenAddress,
+  //   //   "\ndata",
+  //   //   data,
+  //   //   "\nnumber_data",
+  //   //   numdata,
+  //   //   "\ntokenBalance",
+  //   //   parseFloat(tokenBalance ?? "0"),
+  //   //   "\nisApproved: should be true if data >= tokenBalance"
+  //   //   // !tokenBalance ? false : numdata >= formatData(parseFloat(tokenBalance))
+  //   //   // !input ? false : numdata >= formatData(parseFloat(tokenBalance))
+  //   // );
 
-    // Infinite token allowance
-    // return (
-    //   Number(data) ==
-    //   parseInt(
-    //     (
-    //       BigInt(
-    //         2 **
-    //           (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
-    //           tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
-    //             ? 128
-    //             : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
-    //             ? 96
-    //             : 256)
-    //       ) - BigInt(1)
-    //     ).toString()
-    //   )
-    // );
-  }, [data]);
-  return { data, isLoading, isError, isSuccess };
+  //   // allowed tokens >= token balance
+  //   // return !tokenBalance
+  //   //   ? false
+  //   //   : numdata >= formatData(parseFloat(tokenBalance));
+  //   return compare;
+  return { data, isLoading, isError, isSuccess: compare };
 };
 
 /**
@@ -90,7 +85,7 @@ const useApproveToken = (
   tokenAddress: Address,
   spender: Address,
   tokenSymbol: string,
-  tokenBalance: string | undefined
+  tokenBalance: any | undefined
 ) => {
   const { chain } = useNetwork();
   console.log("token", tokenSymbol, "\ntokenBalance", tokenBalance);
@@ -107,19 +102,10 @@ const useApproveToken = (
     chainId: chain?.id,
     args: [
       spender, // spender
-      BigInt(
-        parseInt((parseFloat(tokenBalance ?? "0") * 10 ** 12).toString())
-      ).toString(),
-      // BigInt(
-      //   parseFloat(tokenBalance!) *
-      //     2 **
-      //       (tokenAddress == "0xFFFFFFfFea09FB06d082fd1275CD48b191cbCD1d" ||
-      //       tokenAddress == "0xFfFFfFff1FcaCBd218EDc0EbA20Fc2308C778080"
-      //         ? 128
-      //         : tokenAddress == "0x511aB53F793683763E5a8829738301368a2411E3"
-      //         ? 96
-      //         : 256)
-      // ).toString(),
+      BigNumber(tokenBalance?.formatted, 10)
+        .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
+        .decimalPlaces(0, 1)
+        .toString(),
     ],
     onError: (error) => {
       console.log(`Error while Approving:`, error);

From a81001a6a8b4a9cdfac526868a6d6391790ccddd Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Fri, 18 Aug 2023 22:08:49 +0530
Subject: [PATCH 11/27] set slippage box revamp/fix

---
 .../AddLiquidityModal/AddSectionMangata.tsx   | 12 ++-
 .../AddLiquidityModal/AddSectionStable.tsx    | 13 ++-
 .../AddLiquidityModal/AddSectionStandard.tsx  | 13 ++-
 .../RemoveSectionMangata.tsx                  | 12 ++-
 .../RemoveSectionStable.tsx                   | 13 ++-
 .../RemoveSectionStandard.tsx                 | 67 ++-----------
 src/components/Library/SlippageBox.tsx        | 97 +++++++++++++++++++
 src/components/Library/StakingModal/index.tsx | 13 ++-
 .../Library/UnstakingModal/index.tsx          | 13 ++-
 9 files changed, 177 insertions(+), 76 deletions(-)
 create mode 100644 src/components/Library/SlippageBox.tsx

diff --git a/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx b/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
index 58c84b7..c1c08c5 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
@@ -52,6 +52,7 @@ import { handleAddLiquidityEvent } from "@utils/tracking";
 import getTimestamp from "@utils/getTimestamp";
 import { fetchTokenPricesMangata } from "@utils/fetch-prices";
 import Countdown from "../Countdown";
+import SlippageBox from "../SlippageBox";
 
 enum InputType {
   Off = -1,
@@ -86,6 +87,8 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
   const [tokenPricesMap] = useAtom(tokenPricesAtom);
   const [, setIsSubPosLoading] = useAtom(subPosLoadingAtom);
 
+  const [isSlippageStep, setIsSlippageStep] = useState(false);
+
   const [SLIPPAGE] = useAtom(slippageAtom);
 
   // Input focus states
@@ -1065,8 +1068,8 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
               <button
                 onClick={() => {
-                  setIsSlippageModalOpen(true);
-                  setIsOpen(false);
+                  setIsSlippageStep(true);
+                  setIsConfirmStep(false);
                 }}
               >
                 <CogIcon className="w-4 h-4 text-[#344054] ml-2 transform origin-center hover:rotate-[30deg] transition-all duration-200" />
@@ -1191,6 +1194,11 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
             <span>Loading Pool data...</span>
             <Spinner />
           </div>
+        ) : isSlippageStep ? (
+          <SlippageBox
+            setPrevStep={setIsConfirmStep}
+            setCurrentStep={setIsSlippageStep}
+          />
         ) : isProcessStep ? (
           <ProcessStep />
         ) : isConfirmStep ? (
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index f615604..b16a853 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -52,6 +52,7 @@ import {
 import { handleAddLiquidityEvent } from "@utils/tracking";
 import getTimestamp from "@utils/getTimestamp";
 import Countdown from "../Countdown";
+import SlippageBox from "../SlippageBox";
 
 const AddSectionStable: FC = () => {
   const publicClient = usePublicClient();
@@ -63,6 +64,7 @@ const AddSectionStable: FC = () => {
   // Transaction Process Steps
   const [isConfirmStep, setIsConfirmStep] = useState(false);
   const [isProcessStep, setIsProcessStep] = useState(false);
+  const [isSlippageStep, setIsSlippageStep] = useState(false);
 
   const [isSlippageModalOpen, setIsSlippageModalOpen] = useAtom(
     slippageModalOpenAtom
@@ -565,8 +567,8 @@ const AddSectionStable: FC = () => {
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
               <button
                 onClick={() => {
-                  setIsSlippageModalOpen(true);
-                  setIsOpen(false);
+                  setIsSlippageStep(true);
+                  setIsConfirmStep(false);
                 }}
               >
                 <CogIcon className="w-4 h-4 text-[#344054] ml-2 transform origin-center hover:rotate-[30deg] transition-all duration-200" />
@@ -705,7 +707,12 @@ const AddSectionStable: FC = () => {
         setOpen={isOpenModalCondition ? () => {} : setIsOpen}
         title="Add Liquidity"
       >
-        {isProcessStep ? (
+        {isSlippageStep ? (
+          <SlippageBox
+            setPrevStep={setIsConfirmStep}
+            setCurrentStep={setIsSlippageStep}
+          />
+        ) : isProcessStep ? (
           <ProcessStep />
         ) : isConfirmStep ? (
           <ConfirmStep />
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index dd02d85..a026e33 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -63,6 +63,7 @@ import {
 import BigNumber from "bignumber.js";
 import Countdown from "../Countdown";
 import { createNumRegex } from "@utils/createRegex";
+import SlippageBox from "../SlippageBox";
 
 enum InputType {
   Off = -1,
@@ -108,6 +109,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   // Transaction Process Steps
   const [isConfirmStep, setIsConfirmStep] = useState(false);
   const [isProcessStep, setIsProcessStep] = useState(false);
+  const [isSlippageStep, setIsSlippageStep] = useState(false);
 
   useEffect(() => {
     console.log("selectedFarm", selectedFarm);
@@ -1100,8 +1102,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
               <button
                 onClick={() => {
-                  setIsSlippageModalOpen(true);
-                  setIsOpen(false);
+                  setIsSlippageStep(true);
+                  setIsConfirmStep(false);
                 }}
               >
                 <CogIcon className="w-4 h-4 text-[#344054] ml-2 transform origin-center hover:rotate-[30deg] transition-all duration-200" />
@@ -1256,7 +1258,12 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
         setOpen={isOpenModalCondition ? () => {} : setIsOpen}
         title="Add Liquidity"
       >
-        {isProcessStep ? (
+        {isSlippageStep ? (
+          <SlippageBox
+            setPrevStep={setIsConfirmStep}
+            setCurrentStep={setIsSlippageStep}
+          />
+        ) : isProcessStep ? (
           <ProcessStep />
         ) : isConfirmStep ? (
           <ConfirmStep />
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
index 477db9d..3185cae 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
@@ -46,6 +46,7 @@ import { fixedAmtNum } from "@utils/abis/contract-helper-methods";
 import { fetchTokenPricesMangata } from "@utils/fetch-prices";
 import Countdown from "../Countdown";
 import { createNumRegex } from "@utils/createRegex";
+import SlippageBox from "../SlippageBox";
 
 interface ChosenMethodProps {
   farm: FarmType;
@@ -71,6 +72,8 @@ const RemoveSectionMangata: FC = () => {
   const [isOpen, setIsOpen] = useAtom(removeLiqModalOpenAtom);
   const [farm, setFarm] = useAtom(selectedFarmAtom);
 
+  const [isSlippageStep, setIsSlippageStep] = useState(false);
+
   const [account] = useAtom(dotAccountAtom);
   const [mangataHelper] = useAtom(mangataHelperAtom);
   const [account1] = useAtom(accountInitAtom);
@@ -620,8 +623,8 @@ const RemoveSectionMangata: FC = () => {
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
               <button
                 onClick={() => {
-                  setIsSlippageModalOpen(true);
-                  setIsOpen(false);
+                  setIsSlippageStep(true);
+                  setIsConfirmStep(false);
                 }}
               >
                 <CogIcon className="w-4 h-4 text-[#344054] ml-2 transform origin-center hover:rotate-[30deg] transition-all duration-200" />
@@ -860,6 +863,11 @@ const RemoveSectionMangata: FC = () => {
             <span>Loading Pool data...</span>
             <Spinner />
           </div>
+        ) : isSlippageStep ? (
+          <SlippageBox
+            setPrevStep={setIsConfirmStep}
+            setCurrentStep={setIsSlippageStep}
+          />
         ) : isProcessStep ? (
           <ProcessStep />
         ) : isConfirmStep ? (
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index c2906f1..8f97109 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -53,6 +53,7 @@ import getTimestamp from "@utils/getTimestamp";
 import { updateEvmPositions } from "@utils/position-utils/evmPositions";
 import Countdown from "../Countdown";
 import { createNumRegex } from "@utils/createRegex";
+import SlippageBox from "../SlippageBox";
 
 enum RemoveMethod {
   ALL = 0,
@@ -78,6 +79,7 @@ const RemoveSectionStable: FC = () => {
   const [positions, setPositions] = useAtom(positionsAtom);
   const [lpTokenPricesMap, setLpTokenPricesMap] = useAtom(lpTokenPricesAtom);
   const [tokenPricesMap] = useAtom(tokenPricesAtom);
+  const [isSlippageStep, setIsSlippageStep] = useState(false);
   // const [, setIsEvmPosLoading] = useAtom(evmPosLoadingAtom);
 
   useEffect(() => console.log("farm @removeliq", farm), [farm]);
@@ -712,8 +714,8 @@ const RemoveSectionStable: FC = () => {
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
               <button
                 onClick={() => {
-                  setIsSlippageModalOpen(true);
-                  setIsOpen(false);
+                  setIsSlippageStep(true);
+                  setIsConfirmStep(false);
                 }}
               >
                 <CogIcon className="w-4 h-4 text-[#344054] ml-2 transform origin-center hover:rotate-[30deg] transition-all duration-200" />
@@ -863,7 +865,12 @@ const RemoveSectionStable: FC = () => {
         setOpen={isOpenModalCondition ? () => {} : setIsOpen}
         title="Remove Liquidity"
       >
-        {isProcessStep ? (
+        {isSlippageStep ? (
+          <SlippageBox
+            setPrevStep={setIsConfirmStep}
+            setCurrentStep={setIsSlippageStep}
+          />
+        ) : isProcessStep ? (
           <ProcessStep />
         ) : isConfirmStep ? (
           <ConfirmStep />
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index ac9436f..375bfb1 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -56,13 +56,13 @@ import getTimestamp from "@utils/getTimestamp";
 import BigNumber from "bignumber.js";
 import Countdown from "../Countdown";
 import { createNumRegex } from "@utils/createRegex";
+import SlippageBox from "../SlippageBox";
 
 const RemoveSectionStandard = () => {
   const { address, connector } = useAccount();
   const publicClient = usePublicClient();
 
-  // const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
-
+  const [isSlippageStep, setIsSlippageStep] = useState(false);
   const [isSlippageModalOpen, setIsSlippageModalOpen] = useAtom(
     slippageModalOpenAtom
   );
@@ -506,58 +506,6 @@ const RemoveSectionStandard = () => {
             ))}
           </div>
         </div>
-        {/* Estimate Gas and Slippage Tolerance */}
-        {/* Gas Fees // Slippage // Suff. Wallet balance */}
-        {/* <div
-          className={clsx(
-            "rounded-xl",
-            parseFloat(nativeBal?.formatted ?? "0") > gasEstimate
-              ? "bg-[#C0F9C9]"
-              : "bg-[#FFB7B7]"
-          )}
-        >
-          <div
-            className={clsx(
-              "flex flex-col gap-y-3 rounded-xl px-6 py-3 bg-[#ECFFEF]",
-              parseFloat(nativeBal?.formatted ?? "0") > gasEstimate
-                ? "bg-[#ECFFEF]"
-                : "bg-[#FFE8E8]"
-            )}
-          >
-            <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
-              <span>Estimated Gas Fees:</span>
-              <p>
-                <span className="opacity-40 mr-2 font-semibold">
-                  {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
-                </span>
-                <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
-              </p>
-            </div>
-            <div className="inline-flex items-center font-medium text-[14px] leading-5 text-[#344054]">
-              <span>Slippage Tolerance: {SLIPPAGE}%</span>
-              <button
-                onClick={() => {
-                  setIsSlippageModalOpen(true);
-                  setIsOpen(false);
-                }}
-              >
-                <CogIcon className="w-4 h-4 text-[#344054] ml-2 transform origin-center hover:rotate-[30deg] transition-all duration-200" />
-              </button>
-            </div>
-          </div>
-          <div className="flex flex-col gap-y-2 items-center rounded-b-xl pt-[14px] pb-2 text-center">
-            <h3 className="text-[#4E4C4C] text-base font-bold">
-              {parseFloat(nativeBal?.formatted ?? "0") > gasEstimate
-                ? "Sufficient"
-                : "Insufficient"}{" "}
-              Wallet Balance
-            </h3>
-            <span className="text-[#344054] opacity-50 text-sm font-medium leading-5">
-              {parseFloat(nativeBal?.formatted!).toLocaleString("en-US")}{" "}
-              {nativeBal?.symbol}
-            </span>
-          </div>
-        </div> */}
         <div className="flex flex-row mt-6 gap-2">
           {isLpApprovedLoading ? (
             <MButton
@@ -749,8 +697,8 @@ const RemoveSectionStandard = () => {
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
               <button
                 onClick={() => {
-                  setIsSlippageModalOpen(true);
-                  setIsOpen(false);
+                  setIsSlippageStep(true);
+                  setIsConfirmStep(false);
                 }}
               >
                 <CogIcon className="w-4 h-4 text-[#344054] ml-2 transform origin-center hover:rotate-[30deg] transition-all duration-200" />
@@ -881,7 +829,12 @@ const RemoveSectionStandard = () => {
         setOpen={isOpenModalCondition ? () => {} : setIsOpen}
         title="Remove Liquidity"
       >
-        {isProcessStep ? (
+        {isSlippageStep ? (
+          <SlippageBox
+            setPrevStep={setIsConfirmStep}
+            setCurrentStep={setIsSlippageStep}
+          />
+        ) : isProcessStep ? (
           <ProcessStep />
         ) : isConfirmStep ? (
           <ConfirmStep />
diff --git a/src/components/Library/SlippageBox.tsx b/src/components/Library/SlippageBox.tsx
new file mode 100644
index 0000000..a051fd0
--- /dev/null
+++ b/src/components/Library/SlippageBox.tsx
@@ -0,0 +1,97 @@
+import { useAtom } from "jotai";
+import { QuestionMarkCircleIcon } from "@heroicons/react/outline";
+import { slippageAtom } from "@store/atoms";
+import Image from "next/image";
+import { useState } from "react";
+import MButton from "./MButton";
+import Tooltip from "./Tooltip";
+
+interface Props {
+  setPrevStep: React.Dispatch<React.SetStateAction<boolean>>;
+  setCurrentStep: React.Dispatch<React.SetStateAction<boolean>>;
+}
+
+const SlippageBox: React.FC<Props> = ({ setPrevStep, setCurrentStep }) => {
+  // const [isOpen, setIsOpen] = useAtom(slippageModalOpenAtom);
+  const [slippage, setSlippage] = useAtom(slippageAtom);
+  const [inputSlippage, setInputSlippage] = useState<string>(
+    slippage.toString(10)
+  );
+
+  const submitSlippage = () => {
+    const slppg = parseFloat(inputSlippage);
+    if (!isNaN(slppg) && slppg > 0 && slppg < 100) {
+      setSlippage(slppg);
+    } else {
+      alert("Invalid slippage value!");
+    }
+  };
+
+  return (
+    <div className="flex flex-col gap-y-8">
+      <div className="inline-flex items-center justify-start gap-x-4 text-base leading-5 text-[#1D2939]">
+        <button
+          className="max-w-fit hover:translate-x-1 active:-translate-x-0 transition-all duration-200 ease-in-out"
+          onClick={() => {
+            setPrevStep(true);
+            setCurrentStep(false);
+          }}
+        >
+          <Image
+            src="/icons/ArrowLeft.svg"
+            alt="Go back"
+            height={24}
+            width={24}
+          />
+        </button>
+        <h1 className="font-bold">Set Slippage Tolerance</h1>
+        <Tooltip label="Update the Slippage" placement="top">
+          <QuestionMarkCircleIcon className="-ml-2 h-5 w-5 text-[#C0CBDC]" />
+        </Tooltip>
+      </div>
+      <div className="inline-flex items-center gap-x-3">
+        <div className="relative w-full border border-[#BEBEBE] p-6 rounded-lg">
+          <input
+            autoFocus
+            placeholder="0"
+            className="text-lg leading-[27px] w-full font-bold text-[#344054] text-left bg-transparent focus:outline-none"
+            onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+              const value = event.target.value;
+              if (/^(\d+\.?\d*|\.\d+)$/.test(value) || value === "") {
+                setInputSlippage(event.target.value);
+              }
+            }}
+            value={inputSlippage}
+            name="slippage"
+            id="slippage"
+          />
+          <span className="absolute select-none right-6 opacity-50 text-[#344054] text-lg leading-[27px]">
+            %
+          </span>
+        </div>
+        <button
+          className="px-8 py-[28px] bg-[#F9FAFB] border border-[#D0D5DD] shadow-sm rounded-lg text-base font-semibold leading-5 text-[#1D2939]"
+          onClick={() => {
+            setInputSlippage("0.05");
+            submitSlippage();
+          }}
+        >
+          Auto
+        </button>
+      </div>
+      <MButton
+        text="Confirm Slippage Tolerance"
+        isLoading={false}
+        type="primary"
+        className="w-full"
+        onClick={() => {
+          submitSlippage();
+          setPrevStep(true);
+          setCurrentStep(false);
+        }}
+      />
+    </div>
+  );
+};
+
+export default SlippageBox;
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index 64c7a5e..6745613 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -42,6 +42,7 @@ import BigNumber from "bignumber.js";
 import { updateEvmPositions } from "@utils/position-utils/evmPositions";
 import Countdown from "../Countdown";
 import { createNumRegex } from "@utils/createRegex";
+import SlippageBox from "../SlippageBox";
 
 interface ChosenMethodProps {
   farm: FarmType;
@@ -79,6 +80,7 @@ const StakingModal = () => {
   // Transaction Process Steps
   const [isConfirmStep, setIsConfirmStep] = useState(false);
   const [isProcessStep, setIsProcessStep] = useState(false);
+  const [isSlippageStep, setIsSlippageStep] = useState(false);
 
   const tokenNames = formatTokenSymbols(farm?.asset.symbol ?? "");
 
@@ -538,8 +540,8 @@ const StakingModal = () => {
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
               <button
                 onClick={() => {
-                  setIsSlippageModalOpen(true);
-                  setIsOpen(false);
+                  setIsSlippageStep(true);
+                  setIsConfirmStep(false);
                 }}
               >
                 <CogIcon className="w-4 h-4 text-[#344054] ml-2 transform origin-center hover:rotate-[30deg] transition-all duration-200" />
@@ -665,7 +667,12 @@ const StakingModal = () => {
         setOpen={isOpenModalCondition ? () => {} : setIsOpen}
         title="Stake LP Tokens"
       >
-        {isProcessStep ? (
+        {isSlippageStep ? (
+          <SlippageBox
+            setPrevStep={setIsConfirmStep}
+            setCurrentStep={setIsSlippageStep}
+          />
+        ) : isProcessStep ? (
           <ProcessStep />
         ) : isConfirmStep ? (
           <ConfirmStep />
diff --git a/src/components/Library/UnstakingModal/index.tsx b/src/components/Library/UnstakingModal/index.tsx
index 4857538..2a534d7 100644
--- a/src/components/Library/UnstakingModal/index.tsx
+++ b/src/components/Library/UnstakingModal/index.tsx
@@ -41,6 +41,7 @@ import BigNumber from "bignumber.js";
 import { updateEvmPositions } from "@utils/position-utils/evmPositions";
 import Countdown from "../Countdown";
 import { createNumRegex } from "@utils/createRegex";
+import SlippageBox from "../SlippageBox";
 
 interface ChosenMethodProps {
   farm: FarmType;
@@ -73,6 +74,7 @@ const UnstakingModal = () => {
   // Transaction Process Steps
   const [isConfirmStep, setIsConfirmStep] = useState(false);
   const [isProcessStep, setIsProcessStep] = useState(false);
+  const [isSlippageStep, setIsSlippageStep] = useState(false);
 
   const [percentage, setPercentage] = useState<string>("");
   const [lpTokens, setLpTokens] = useState<string>("");
@@ -491,8 +493,8 @@ const UnstakingModal = () => {
               <span>Slippage Tolerance: {SLIPPAGE}%</span>
               <button
                 onClick={() => {
-                  setIsSlippageModalOpen(true);
-                  setIsOpen(false);
+                  setIsSlippageStep(true);
+                  setIsConfirmStep(false);
                 }}
               >
                 <CogIcon className="w-4 h-4 text-[#344054] ml-2 transform origin-center hover:rotate-[30deg] transition-all duration-200" />
@@ -621,7 +623,12 @@ const UnstakingModal = () => {
         setOpen={isOpenModalCondition ? () => {} : setIsOpen}
         title="Unstake LP Tokens"
       >
-        {isProcessStep ? (
+        {isSlippageStep ? (
+          <SlippageBox
+            setPrevStep={setIsConfirmStep}
+            setCurrentStep={setIsSlippageStep}
+          />
+        ) : isProcessStep ? (
           <ProcessStep />
         ) : isConfirmStep ? (
           <ConfirmStep />

From 2ede98899a78219ccdfa2a9a59675fe8a75ba895 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Fri, 18 Aug 2023 22:16:52 +0530
Subject: [PATCH 12/27] approval balance bug // wrong obj passed

---
 src/components/Library/AddLiquidityModal/TokenButton.tsx  | 4 ++--
 .../Library/RemoveLiquidityModal/RemoveSectionStable.tsx  | 8 +++++---
 .../RemoveLiquidityModal/RemoveSectionStandard.tsx        | 8 +++++---
 src/components/Library/StakingModal/index.tsx             | 4 ++--
 src/hooks/useApprovalHooks.ts                             | 5 ++++-
 src/hooks/useLPBalance.ts                                 | 2 +-
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/TokenButton.tsx b/src/components/Library/AddLiquidityModal/TokenButton.tsx
index d11010b..9aa7c7b 100644
--- a/src/components/Library/AddLiquidityModal/TokenButton.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenButton.tsx
@@ -52,7 +52,7 @@ const TokenButton: React.FC<Props> = ({
   const { isSuccess: isApprovedSuccess } = useIsApprovedToken(
     token?.address,
     selectedFarm?.router,
-    balance?.formatted,
+    balance,
     inputMapAmount[token?.address]
   );
 
@@ -66,7 +66,7 @@ const TokenButton: React.FC<Props> = ({
     token?.address,
     selectedFarm?.router,
     token?.symbol,
-    balance?.formatted
+    balance
   );
 
   // useEffect(() => {
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index 8f97109..c9b4134 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -85,7 +85,9 @@ const RemoveSectionStable: FC = () => {
   useEffect(() => console.log("farm @removeliq", farm), [farm]);
 
   // Balance of LP Token
-  const { lpBalance, lpBalanceLoading } = useLPBalance(farm?.asset.address!);
+  const { lpBalanceObj, lpBalance, lpBalanceLoading } = useLPBalance(
+    farm?.asset.address!
+  );
 
   const [percentage, setPercentage] = useState("");
   const [lpTokens, setLpTokens] = useState("");
@@ -228,7 +230,7 @@ const RemoveSectionStable: FC = () => {
   } = useIsApprovedToken(
     farm?.asset.address!,
     farm?.router!,
-    lpBalance,
+    lpBalanceObj,
     methodId == Method.PERCENTAGE
       ? (fixedAmtNum(lpBalance) * fixedAmtNum(percentage)) / 100
       : fixedAmtNum(lpTokens)
@@ -244,7 +246,7 @@ const RemoveSectionStable: FC = () => {
     farm?.asset.address!,
     farm?.router!,
     getLpTokenSymbol(tokenNames),
-    lpBalance
+    lpBalanceObj
   );
 
   // Remove Liquidity Call
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index 375bfb1..107f024 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -77,7 +77,9 @@ const RemoveSectionStandard = () => {
   useEffect(() => console.log("farm @removeliq", farm), [farm]);
 
   // Balance of LP Token
-  const { lpBalance, lpBalanceLoading } = useLPBalance(farm?.asset.address!);
+  const { lpBalanceObj, lpBalance, lpBalanceLoading } = useLPBalance(
+    farm?.asset.address!
+  );
 
   const [percentage, setPercentage] = useState("");
   const [lpTokens, setLpTokens] = useState("");
@@ -174,7 +176,7 @@ const RemoveSectionStandard = () => {
   } = useIsApprovedToken(
     farm?.asset.address!,
     farm?.router!,
-    lpBalance,
+    lpBalanceObj,
     methodId == Method.PERCENTAGE
       ? (fixedAmtNum(lpBalance) * fixedAmtNum(percentage)) / 100
       : fixedAmtNum(lpTokens)
@@ -189,7 +191,7 @@ const RemoveSectionStandard = () => {
     farm?.asset.address!,
     farm?.router!,
     getLpTokenSymbol(tokenNames),
-    lpBalance
+    lpBalanceObj
   );
 
   // Remove Liquidity
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index 6745613..099cab2 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -223,7 +223,7 @@ const StakingModal = () => {
   } = useIsApprovedToken(
     farm?.asset.address!,
     farm?.chef as Address,
-    lpBalance?.formatted,
+    lpBalance,
     methodId == 0
       ? (lpBalanceNum * fixedAmtNum(percentage)) / 100
       : fixedAmtNum(lpTokens)
@@ -238,7 +238,7 @@ const StakingModal = () => {
     farm?.asset.address!,
     farm?.chef as Address,
     getLpTokenSymbol(tokenNames),
-    lpBalance?.formatted
+    lpBalance
   );
 
   // Stake LP Tokens
diff --git a/src/hooks/useApprovalHooks.ts b/src/hooks/useApprovalHooks.ts
index 9635630..2c75c8e 100644
--- a/src/hooks/useApprovalHooks.ts
+++ b/src/hooks/useApprovalHooks.ts
@@ -37,12 +37,15 @@ const useIsApprovedToken = (
 
   const allow = data as bigint;
 
-  const allowance = BigNumber(allow.toString(), 10)
+  const allowance = BigNumber(allow?.toString() ?? "0", 10)
     // .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
     .decimalPlaces(0, 1);
   // console.log("allowance bigint", allow);
   console.log("allowance", allowance.toString());
 
+  console.log("rawinput", input);
+  console.log("tokenbalance", tokenBalance);
+
   const inputAmount = BigNumber(input.toString(), 10)
     .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
     .decimalPlaces(0, 1);
diff --git a/src/hooks/useLPBalance.ts b/src/hooks/useLPBalance.ts
index 7174e23..ff97a94 100644
--- a/src/hooks/useLPBalance.ts
+++ b/src/hooks/useLPBalance.ts
@@ -13,7 +13,7 @@ const useLPBalance = (lpAddress: Address) => {
   });
 
   const lpBalance = lpBalanceLoading ? "0" : lpbalance?.formatted;
-  return { lpBalance, lpBalanceLoading };
+  return { lpBalanceObj: lpbalance, lpBalance, lpBalanceLoading };
 };
 
 export default useLPBalance;

From 11f9978966596c0b6d66ee216f1a1877bd6308b8 Mon Sep 17 00:00:00 2001
From: Sahil <sahilnanda1995@gmail.com>
Date: Mon, 21 Aug 2023 13:29:59 +0530
Subject: [PATCH 13/27] estimate gas fees hook revamp

---
 .../AddLiquidityModal/AddSectionStandard.tsx  |   3 +
 src/hooks/useGasEstimation.ts                 | 161 +++++++-----------
 2 files changed, 65 insertions(+), 99 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index a026e33..ebb5a0e 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -985,6 +985,9 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
       ]
     );
 
+    console.log("firstTokenAmount", firstTokenAmount);
+    console.log("secondTokenAmount", secondTokenAmount);
+
     return (
       <div className="flex flex-col gap-y-8 text-left">
         <button
diff --git a/src/hooks/useGasEstimation.ts b/src/hooks/useGasEstimation.ts
index a19e3f6..8278cae 100644
--- a/src/hooks/useGasEstimation.ts
+++ b/src/hooks/useGasEstimation.ts
@@ -4,61 +4,58 @@ import { Address, PublicClient, parseAbi } from "viem";
 import { getChefAbi, getRouterAbi } from "@utils/abis/contract-helper-methods";
 import { FarmType, PortfolioPositionType } from "@utils/types/common";
 
+const determineAbi = (
+  contractType: number,
+  farmition: FarmType | PortfolioPositionType
+) => {
+  if (contractType === 0) {
+    return parseAbi(getChefAbi(farmition.protocol!, farmition.chef));
+  } else {
+    return parseAbi(
+      getRouterAbi(farmition.protocol!, farmition.farmType !== "StandardAmm")
+    );
+  }
+};
+
 const estimateGas = async (
   publicClient: PublicClient,
   address: Address,
   contractType: number, // 0: chef, 1: router, 2: lp
-  functionType: number, // 0: addliq, 1: removeliq, 2: stake, 3: unstake, 4: claimrewards
+  // functionType: number, // 0: addliq, 1: removeliq, 2: stake, 3: unstake, 4: claimrewards
   functionName: string,
   farmition: FarmType | PortfolioPositionType,
   account: Address,
   args: Array<any>
 ) => {
-  console.log(
-    "estimateGas @params",
-    address,
-    contractType,
-    functionType,
-    functionName,
-    farmition,
-    account,
-    args,
-    contractType == 0
-      ? parseAbi(getChefAbi(farmition?.protocol!, farmition?.chef))
-      : parseAbi(
-          getRouterAbi(
-            farmition?.protocol!,
-            farmition?.farmType == "StandardAmm" ? false : true
-          )
-        )
-  );
+  const abi = determineAbi(contractType, farmition);
+  console.log("Estimating gas with parameters:");
+  console.log("Address:", address);
+  console.log("ABI:", abi);
+  console.log("Function Name:", functionName);
+  console.log("Arguments:", args);
+  console.log("Account:", account);
 
-  let gasEstimate = BigInt(0);
   try {
-    gasEstimate = await publicClient.estimateContractGas({
+    return await publicClient.estimateContractGas({
       address,
-      abi:
-        contractType == 0
-          ? parseAbi(getChefAbi(farmition.protocol!, farmition.chef))
-          : parseAbi(
-              getRouterAbi(
-                farmition.protocol!,
-                farmition.farmType == "StandardAmm" ? false : true
-              )
-            ),
+      abi,
       functionName,
-      args: args,
+      args,
       account,
     });
   } catch (error) {
-    console.log("estimateContractGas error:", error);
+    console.error("Error estimating gas:", error);
+    return BigInt(0);
   }
-  console.log("gas estimate", gasEstimate);
-  return gasEstimate;
 };
 
 const getGasPrice = async (publicClient: PublicClient): Promise<bigint> => {
-  return await publicClient.getGasPrice();
+  try {
+    return await publicClient.getGasPrice();
+  } catch (error) {
+    console.error("Error getting gas price:", error);
+    return BigInt(0);
+  }
 };
 
 const useGasEstimation = (
@@ -74,89 +71,55 @@ const useGasEstimation = (
   // isLoading: boolean;
   isError: boolean;
 } => {
-  // const { chain } = useNetwork();
-  // const publicClient = usePublicClient({ chainId: 1284 });
   const publicClient = usePublicClient();
-  // const publicClient = createPublicClient({
-  //   chain: moonbeam,
-  //   transport: http(),
-  // });
-  const [gasEstimateAmount, setGasEstimateAmount] = useState<number>(0);
-  const [gasPrice, setGasPrice] = useState<number>(0);
-  // const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [isError, setIsError] = useState<boolean>(false);
+  const [gasEstimateAmount, setGasEstimateAmount] = useState(0);
+  const [gasPrice, setGasPrice] = useState(0);
+  const [isError, setIsError] = useState(false);
 
-  // if any arg is 0
-  if (
-    args.some(
-      (a) =>
-        (a == 0 || a == BigInt(0)) &&
-        functionName != "removeLiquidityOneToken" &&
-        functionName != "remove_liquidity_one_coin"
-    )
-  ) {
-    console.log("arg0");
-    return {
-      gasEstimate: 0,
-      // isLoading: false,
-      isError: false,
-    };
-  } else if (
-    farmition.farmType == "StableAmm" &&
-    functionType == 0 && // addliquidity
-    args[0].every((a: any) => a == 0 || a == BigInt(0)) // at least 1 amounts arg should be non zero
-  ) {
-    // if (functionType == 0 &&
-    //   args.every((a) => a == 0)) {
-    console.log("arg0");
+  const invalidArgs = args.some(
+    (a) =>
+      (a === 0 || a === BigInt(0)) &&
+      !["removeLiquidityOneToken", "remove_liquidity_one_coin"].includes(
+        functionName
+      )
+  );
+
+  const invalidStableAmmArgs =
+    farmition.farmType === "StableAmm" &&
+    functionType === 0 &&
+    args[0].every((a) => a === 0 || a === BigInt(0));
+
+  if (invalidArgs || invalidStableAmmArgs) {
     return {
       gasEstimate: 0,
-      // isLoading: false,
       isError: false,
     };
-    // } else {
   } else {
-    try {
-      estimateGas(
+    (async () => {
+      const gasEstimate = await estimateGas(
         publicClient,
         address,
         contractType,
-        functionType,
         functionName,
         farmition,
         account,
         args
-      ).then((res) => {
-        setGasEstimateAmount(Number(res));
-      });
-    } catch (error) {
-      setIsError(true);
-      setGasEstimateAmount(0);
-      console.log("Error: Estimating Gas", error);
-    }
-    // const eg = estimateGas()
+      );
+      const price = await getGasPrice(publicClient);
 
-    try {
-      getGasPrice(publicClient).then((res) => {
-        setGasPrice(Number(res));
-      });
-    } catch (error) {
-      setGasPrice(0);
+      setGasEstimateAmount(Number(gasEstimate));
+      setGasPrice(Number(price));
+    })().catch((error) => {
       setIsError(true);
-      console.log("Error: Getting Gas Price", error);
-    }
+      console.error("Error in gas estimation:", error);
+    });
+
+    // Todo: Handle BigInt properly
+    const estimate = (gasEstimateAmount * gasPrice) / 10 ** 18;
+    console.log("estimate", estimate);
 
-    console.log(
-      "gasEstimateAmount",
-      gasEstimateAmount,
-      "gasPrice",
-      gasPrice,
-      "gas",
-      (gasEstimateAmount * gasPrice) / 10 ** 18
-    );
     return {
       gasEstimate: (gasEstimateAmount * gasPrice) / 10 ** 18,
-      // isLoading,
       isError,
     };
   }

From ea2194523f9dbe98e9bff1c1aae751361dec431c Mon Sep 17 00:00:00 2001
From: Sahil <sahilnanda1995@gmail.com>
Date: Wed, 23 Aug 2023 00:53:05 +0530
Subject: [PATCH 14/27] commented logs

---
 src/components/Common/Layout/index.tsx        |   54 +-
 src/components/Common/Providers/index.tsx     |    2 +-
 src/components/FarmPage/index.tsx             |   14 +-
 .../AddLiquidityModal/AddSectionMangata.tsx   |  164 +-
 .../AddLiquidityModal/AddSectionStable.tsx    |   40 +-
 .../AddLiquidityModal/AddSectionStandard.tsx  |  120 +-
 .../Library/AddLiquidityModal/TokenButton.tsx |    6 +-
 .../Library/AddLiquidityModal/TokenInput.tsx  |   14 +-
 .../AddLiquidityModal/useStableAmounts.ts     |    8 +-
 .../ClaimRewardsModal/ClaimSectionDot.tsx     |   54 +-
 .../ClaimRewardsModal/ClaimSectionEvm.tsx     |   36 +-
 .../Library/ConnectWallet/ConnectBtnDot.tsx   |    4 +-
 .../ConnectWallet/SelectAccountMenu.tsx       |    4 +-
 .../RemoveSectionMangata.tsx                  |  126 +-
 .../RemoveSectionStable.tsx                   |   72 +-
 .../RemoveSectionStandard.tsx                 |   86 +-
 .../useMinUnderlyingTokens.ts                 |   16 +-
 src/components/Library/SelectChain.tsx        |    2 +-
 src/components/Library/StakingModal/index.tsx |   44 +-
 .../Library/UnstakingModal/index.tsx          |   46 +-
 src/components/Portfolio/index.tsx            |    4 +-
 src/hooks/useApprovalHooks.ts                 |   18 +-
 src/hooks/useEthersGas.ts                     |   10 +-
 src/hooks/useGasEstimation.ts                 |   14 +-
 src/hooks/useMinLPTokens.ts                   |   46 +-
 src/hooks/useMinLPTokensStable.ts             |    2 +-
 src/hooks/useTokensOrder.ts                   |    2 +-
 src/hooks/useTotalSupply.ts                   |    2 +-
 src/utils/abis/contract-helper-methods.ts     |    4 +-
 src/utils/farmPageMethods.ts                  |    4 +-
 src/utils/portfolioMethods.ts                 |    4 +-
 src/utils/position-utils/evmPositions.ts      | 1774 ++++++++---------
 .../position-utils/substratePositions.ts      |   64 +-
 src/utils/toUnits.ts                          |    2 +-
 src/utils/tracking.ts                         |   24 +-
 src/utils/useCalcMinAmount.ts                 |    6 +-
 src/utils/xcm/common/account.js               |    2 +-
 src/utils/xcm/common/mangataHelper.js         |  142 +-
 src/utils/xcm/common/turingHelper.js          |   16 +-
 src/utils/xcm/common/utils.js                 |   22 +-
 src/utils/xcm/mangata/common.js               |   82 +-
 src/utils/xcm/mangata/mangata-kusama.js       |    2 +-
 src/utils/xcm/mangata/mangata-rococo.js       |    2 +-
 src/utils/xcm/mangata/mangata.js              |   54 +-
 src/utils/xcm/mangata/setup-mangata.js        |   46 +-
 src/utils/xcm/rocstar.js                      |   66 +-
 src/utils/xcm/shibuya.js                      |   68 +-
 src/utils/xcm/utils.js                        |   42 +-
 48 files changed, 1718 insertions(+), 1718 deletions(-)

diff --git a/src/components/Common/Layout/index.tsx b/src/components/Common/Layout/index.tsx
index 8680519..141727f 100644
--- a/src/components/Common/Layout/index.tsx
+++ b/src/components/Common/Layout/index.tsx
@@ -95,7 +95,7 @@ const Layout: FC<Props> = ({ children }) => {
   const [tokenPricesMap, setTokenPricesMap] = useAtom(tokenPricesAtom);
 
   useEffect(() => {
-    console.log("---- Updated Positions ----\n", positions);
+    // console.log("---- Updated Positions ----\n", positions);
   }, [positions]);
 
   const { isConnected, address, connector } = useAccount();
@@ -143,7 +143,7 @@ const Layout: FC<Props> = ({ children }) => {
   });
   useEffect(() => {
     if (isLpPricesLoading) {
-      console.log("loading lp prices...");
+      // console.log("loading lp prices...");
     } else {
       const tempLpTokenPrices: { [key: string]: number } = {};
       lpTokenPrices?.forEach((lptp: TokenPriceType) => {
@@ -151,7 +151,7 @@ const Layout: FC<Props> = ({ children }) => {
           `${lptp.chain}-${lptp.protocol}-${lptp.symbol}-${lptp.address}` // key
         ] = lptp.price; // assigning lp token price to the key
       });
-      console.log("lpTokenPricesMap", tempLpTokenPrices);
+      // console.log("lpTokenPricesMap", tempLpTokenPrices);
       setLpTokenPricesMap(tempLpTokenPrices);
     }
   }, [isLpPricesLoading]);
@@ -170,10 +170,10 @@ const Layout: FC<Props> = ({ children }) => {
   });
   useEffect(() => {
     if (isTPricesLoading) {
-      console.log("loading token prices...");
+      // console.log("loading token prices...");
     } else {
       // Setting Token prices data
-      // console.log("token prices", tokenPrices);
+      // // console.log("token prices", tokenPrices);
       // Mapped token prices in a variable
       const tokenPricesMap: any = {};
       tokenPrices?.forEach((tp: any) => {
@@ -181,54 +181,54 @@ const Layout: FC<Props> = ({ children }) => {
           `${tp.chain}-${tp.protocol}-${tp.symbol}-${tp.address}` // key
         ] = tp.price; // assigning token price to the key
       });
-      console.log("tokenPricesMap", tokenPricesMap);
+      // console.log("tokenPricesMap", tokenPricesMap);
       setTokenPricesMap(tokenPricesMap);
     }
   }, [isTPricesLoading]);
 
   useEffect(() => {
-    console.log("lpTokenPrices useeffect", lpTokenPricesMap);
+    // console.log("lpTokenPrices useeffect", lpTokenPricesMap);
   }, [lpTokenPricesMap]);
 
   useEffect(() => {
-    console.log("tokenPrices useeffect", tokenPricesMap);
+    // console.log("tokenPrices useeffect", tokenPricesMap);
   }, [tokenPricesMap]);
 
   const setupMangataHelper = async (accountInit: Account | null) => {
     if (account?.address == null) {
-      console.log("Connect wallet to use App!");
+      // console.log("Connect wallet to use App!");
       return;
     }
 
     if (mangataHelperx != null && accountInit?.address === account.address) {
-      console.log("accountinit", accountInit?.address);
-      console.log("account address", account.address);
-      console.log("Already initialised!");
+      // console.log("accountinit", accountInit?.address);
+      // console.log("account address", account.address);
+      // console.log("Already initialised!");
       return;
     }
 
-    console.log("Initializing APIs of both chains ...");
+    // console.log("Initializing APIs of both chains ...");
 
     let mangataConfig = MangataConfig;
     const mangataHelper = new MangataHelper(mangataConfig);
-    console.log("initiliazing mangata helper...");
+    // console.log("initiliazing mangata helper...");
     await mangataHelper.initialize();
-    console.log("✅ mangata helper initialized\n", mangataHelper);
+    // console.log("✅ mangata helper initialized\n", mangataHelper);
     setMangataHelper(mangataHelper);
 
     const mangataChainName = mangataHelper.config.key;
 
-    console.log("mangata Assets", mangataHelper.config.assets);
+    // console.log("mangata Assets", mangataHelper.config.assets);
 
     const mangataNativeToken = _.first(mangataHelper.config.assets);
 
-    console.log(
-      `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
-        mangataNativeToken
-      )}\n`
-    );
+    // console.log(
+    //   `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
+    //     mangataNativeToken
+    //   )}\n`
+    // );
 
-    console.log("1. Reading token and balance of account ...");
+    // console.log("1. Reading token and balance of account ...");
 
     // New account instance from connected account
     const account1 = new Account({
@@ -238,7 +238,7 @@ const Layout: FC<Props> = ({ children }) => {
       },
     });
     await account1.init([mangataHelper]);
-    console.log("account1", account1);
+    // console.log("account1", account1);
     // It is setting Account1 here, and this fn runs only once in starting
     // it should re-run when an account is updated.
     setAccountInit(account1);
@@ -247,7 +247,7 @@ const Layout: FC<Props> = ({ children }) => {
     setMangataAddress(mangataAddress);
 
     const pools = await mangataHelper.getPools({ isPromoted: true });
-    console.log("Promoted Pools", pools);
+    // console.log("Promoted Pools", pools);
     setPools(pools);
     setIsInitialised(true);
   };
@@ -260,7 +260,7 @@ const Layout: FC<Props> = ({ children }) => {
         walletType: "DOT",
         connector: account?.wallet?.extensionName!,
       });
-      console.log("running mangata setup\n==> account", account);
+      // console.log("running mangata setup\n==> account", account);
       fetchSubstratePositions({
         farms,
         positions,
@@ -270,7 +270,7 @@ const Layout: FC<Props> = ({ children }) => {
       });
       setupMangataHelper(accountInit);
     } else if (!isConnectedDot && farms.length > 0) {
-      console.log("emptying mangata positions...");
+      // console.log("emptying mangata positions...");
       emptySubstratePositions({
         farms,
         positions,
@@ -309,7 +309,7 @@ const Layout: FC<Props> = ({ children }) => {
       lpTokensPricesLength > 0 &&
       tokenPricesLength > 0
     ) {
-      console.log("emptying evm positions running...");
+      // console.log("emptying evm positions running...");
       emptyEvmPositions({
         farms,
         positions,
diff --git a/src/components/Common/Providers/index.tsx b/src/components/Common/Providers/index.tsx
index 87f2513..9ce9120 100644
--- a/src/components/Common/Providers/index.tsx
+++ b/src/components/Common/Providers/index.tsx
@@ -61,7 +61,7 @@ const Providers = ({ children }: { children: ReactNode }) => {
             }
           );
         } catch (err) {
-          console.log("Error in subscribing accounts: ", err);
+          // console.log("Error in subscribing accounts: ", err);
         }
       })();
     }
diff --git a/src/components/FarmPage/index.tsx b/src/components/FarmPage/index.tsx
index 4b9f7d2..feda03b 100644
--- a/src/components/FarmPage/index.tsx
+++ b/src/components/FarmPage/index.tsx
@@ -125,12 +125,12 @@ const FarmPage: NextPage = () => {
       const unclaimedRewardsUSD = parseFloat(
         calcUnclaimedRewardUSD(farmPosition.unclaimedRewards)
       );
-      console.log(
-        "total unclaimed rewards",
-        farmPosition.unclaimedRewards,
-        farm?.asset.symbol,
-        unclaimedRewards
-      );
+      // console.log(
+      //   "total unclaimed rewards",
+      //   farmPosition.unclaimedRewards,
+      //   farm?.asset.symbol,
+      //   unclaimedRewards
+      // );
       setUnclaimedReward(unclaimedRewards);
       setUnclaimedRewardUSD(unclaimedRewardsUSD);
     }
@@ -201,7 +201,7 @@ const FarmPage: NextPage = () => {
                   size="custom"
                   style="inline-flex justify-between items-center gap-x-2 bg-[#F0F0FF]"
                   onButtonClick={() => {
-                    console.log("farm in farmpage", farm);
+                    // console.log("farm in farmpage", farm);
                     setSelectedFarm(farm);
                     setAddLiqModalOpen(true);
                   }}
diff --git a/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx b/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
index c1c08c5..c7410b7 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionMangata.tsx
@@ -102,7 +102,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
   useEffect(() => {
     (async () => {
       const mgxp = (await fetchTokenPricesMangata()).get("mgx")!;
-      console.log("mgxp", mgxp);
+      // console.log("mgxp", mgxp);
       setMgxPrice(mgxp);
     })();
   }, []);
@@ -170,8 +170,8 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
               Number(BigInt(element).toString(10)) /
               10 ** assetsInfo[key]["decimals"];
             if (pool.liquidityTokenId == key) {
-              console.log("--> bal:", e, "\n----------");
-              console.log("match id");
+              // console.log("--> bal:", e, "\n----------");
+              // console.log("match id");
               setLpTotalBalance(e);
             }
           }
@@ -190,10 +190,10 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
           account1?.address
         );
         const balFree = parseFloat(BigInt(bal.free).toString(10)) / 10 ** 18; // MGX decimals == 18
-        console.log("fetched mgxbalance", balFree);
+        // console.log("fetched mgxbalance", balFree);
         setMgxBalance(balFree);
       } catch (error) {
-        console.log("error fetching mgx balance", error);
+        // console.log("error fetching mgx balance", error);
       }
     })();
   }, [account1]);
@@ -202,15 +202,15 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
     if (pools == null) return;
     const [token0, token1] = formatTokenSymbols(selectedFarm?.asset.symbol!);
     const poolName = `${token0}-${token1}`;
-    console.log("selected poolname", poolName);
-    // console.log("balance in componding tab", allLpBalances[poolName]);
+    // console.log("selected poolname", poolName);
+    // // console.log("balance in componding tab", allLpBalances[poolName]);
 
     // Make a state for this
     const pool = _.find(pools, {
       firstTokenId: mangataHelper.getTokenIdBySymbol(token0),
       secondTokenId: mangataHelper.getTokenIdBySymbol(token1),
     });
-    console.log(`Found a pool of ${poolName}`, pool);
+    // console.log(`Found a pool of ${poolName}`, pool);
     setPool(pool);
 
     if (_.isUndefined(pool)) {
@@ -232,9 +232,9 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
     // Calculate rwards amount in pool
     const { liquidityTokenId } = pool;
 
-    console.log(
-      `Checking how much reward available in ${poolName} pool, tokenId: ${liquidityTokenId} ...`
-    );
+    // console.log(
+    //   `Checking how much reward available in ${poolName} pool, tokenId: ${liquidityTokenId} ...`
+    // );
 
     // Issue: current we couldn’t read this rewards value correct by always getting 0 on the claimable rewards.
     // The result is different from that in src/mangata.js
@@ -242,7 +242,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
       mangataAddress,
       liquidityTokenId
     );
-    console.log(`Claimable reward in ${poolName}: `, rewardAmount);
+    // console.log(`Claimable reward in ${poolName}: `, rewardAmount);
 
     const liquidityBalance = await mangataHelper.mangata?.getTokenBalance(
       liquidityTokenId,
@@ -251,26 +251,26 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
     const poolNameDecimalBN = getDecimalBN(
       mangataHelper.getDecimalsBySymbol(poolName)
     );
-    console.log(
-      "liquidity balance",
-      liquidityBalance?.reserved,
-      "poolName DecimalBN",
-      poolNameDecimalBN,
-      "decimal",
-      mangataHelper.getDecimalsBySymbol(poolName)
-    );
+    // console.log(
+    //   "liquidity balance",
+    //   liquidityBalance?.reserved,
+    //   "poolName DecimalBN",
+    //   poolNameDecimalBN,
+    //   "decimal",
+    //   mangataHelper.getDecimalsBySymbol(poolName)
+    // );
 
     const numReserved = new BN(liquidityBalance.reserved).div(
       poolNameDecimalBN
     );
 
-    console.log(
-      `Before auto-compound, ${
-        account?.name
-      } reserved "${poolName}": ${numReserved.toString()} ... lb ${liquidityBalance.reserved.toString()}`
-    );
+    // console.log(
+    //   `Before auto-compound, ${
+    //     account?.name
+    //   } reserved "${poolName}": ${numReserved.toString()} ... lb ${liquidityBalance.reserved.toString()}`
+    // );
 
-    console.log("num reserved", numReserved);
+    // console.log("num reserved", numReserved);
 
     // setting selected pool's LP token balance
     const lpBalance = await mangataHelper.mangata.getTokenBalance(
@@ -283,7 +283,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
     //   parseFloat(BigInt(lpBalance.free).toString(10)) / 10 ** decimal;
     const lpBalanceNum =
       parseFloat(BigInt(lpBalance.reserved).toString(10)) / 10 ** decimal;
-    console.log("LP Balance lpBalanceNum: ", lpBalanceNum);
+    // console.log("LP Balance lpBalanceNum: ", lpBalanceNum);
     setLpBalance(lpBalanceNum);
 
     // Required setup finished
@@ -330,7 +330,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
         //     <ToastWrapper title="Please connect wallet!" status="error" />
         //   ),
         // });
-        console.log("Account1 is empty");
+        // console.log("Account1 is empty");
       }
     })();
   }, [account1, pool]);
@@ -364,9 +364,9 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
   // Estimate of fees; no need to be accurate
   // Method to fetch trnx fees based on token Amounts
   const handleFees = async (firstTokenAmt: number, secondTokenAmt: string) => {
-    console.log("Calculating fees...");
-    console.log("first token in feemint: ", firstTokenAmt);
-    console.log("second token in feemint: ", secondTokenAmt);
+    // console.log("Calculating fees...");
+    // console.log("first token in feemint: ", firstTokenAmt);
+    // console.log("second token in feemint: ", secondTokenAmt);
     try {
       // Estimate of fees; no need to be accurate
       const fees = await mangataHelper.getMintLiquidityFee({
@@ -376,10 +376,10 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
         secondTokenId: pool?.secondTokenId,
         expectedSecondTokenAmount: secondTokenAmt,
       });
-      console.log("fees:", fees, parseFloat(fees));
+      // console.log("fees:", fees, parseFloat(fees));
       setFees(parseFloat(fees));
     } catch (error) {
-      console.log("Error while fetching Fees", error);
+      // console.log("Error while fetching Fees", error);
       setIsErrorFees(true);
     }
   };
@@ -389,19 +389,19 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
     const poolRatio =
       Number(pool?.firstTokenAmountFloat) /
       Number(pool?.secondTokenAmountFloat);
-    console.log("poolRatio", poolRatio, secondTokenAmount);
+    // console.log("poolRatio", poolRatio, secondTokenAmount);
 
     // Estimated LP to be minted
     const lpAmount =
       (secondTokenAmount * lpTotalBalance) /
       (parseFloat(pool?.secondTokenAmountFloat.toString()!) * (1 + SLIPPAGE));
-    console.log("lpAmount via secondToken", lpAmount);
+    // console.log("lpAmount via secondToken", lpAmount);
     setEstimateLpMinted(lpAmount);
 
     // Calculate first token amount
     const expFirstTokenAmount =
       (poolRatio * secondTokenAmount) / (1 + SLIPPAGE);
-    console.log("First Token Amount:", expFirstTokenAmount);
+    // console.log("First Token Amount:", expFirstTokenAmount);
     const firstTokenAmount = isNaN(expFirstTokenAmount)
       ? "0"
       : expFirstTokenAmount.toString();
@@ -418,13 +418,13 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
     const lpAmount =
       (firstTokenAmount * lpTotalBalance) /
       parseFloat(pool?.firstTokenAmountFloat.toString()!);
-    console.log("lpAmount via first token", lpAmount);
+    // console.log("lpAmount via first token", lpAmount);
     setEstimateLpMinted(lpAmount);
 
     // Calculate second token amount
     const expSecondTokenAmount =
       (firstTokenAmount / poolRatio) * (1 + SLIPPAGE);
-    console.log("Second Token Amount:", expSecondTokenAmount);
+    // console.log("Second Token Amount:", expSecondTokenAmount);
     const secondTokenAmount = isNaN(expSecondTokenAmount)
       ? "0"
       : expSecondTokenAmount.toString();
@@ -531,25 +531,25 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
     setIsInProcess(true);
     const signer = account?.wallet?.signer;
 
-    console.log(
-      "pool.firstTokenAmountFloat",
-      pool?.firstTokenAmountFloat,
-      "pool.secondTokenAmountFloat",
-      pool?.secondTokenAmountFloat,
-      "firstTokenAmount",
-      firstTokenAmount,
-      "expectedSecondTokenAmount",
-      secondTokenAmount
-    );
+    // console.log(
+    //   "pool.firstTokenAmountFloat",
+    //   pool?.firstTokenAmountFloat,
+    //   "pool.secondTokenAmountFloat",
+    //   pool?.secondTokenAmountFloat,
+    //   "firstTokenAmount",
+    //   firstTokenAmount,
+    //   "expectedSecondTokenAmount",
+    //   secondTokenAmount
+    // );
 
     try {
       setIsSigning(true);
-      console.log(
-        "liquidityTokenId",
-        pool?.liquidityTokenId,
-        "estimatedLpMinted",
-        estimateLpMinted
-      );
+      // console.log(
+      //   "liquidityTokenId",
+      //   pool?.liquidityTokenId,
+      //   "estimatedLpMinted",
+      //   estimateLpMinted
+      // );
       // Method to Add Liquidity
       const mintLiquidityTxn = await mangataHelper.mintLiquidityTx(
         pool?.firstTokenId,
@@ -563,35 +563,35 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
           { signer: signer },
           ({ status }: any) => {
             if (status.isInBlock) {
-              console.log(
-                `Mint liquidity trxn is in Block with hash ${status.asInBlock.toHex()}`
-              );
+              // console.log(
+              //   `Mint liquidity trxn is in Block with hash ${status.asInBlock.toHex()}`
+              // );
               // unsub();
             } else if (status.isFinalized) {
               (async () => {
                 const tranHash = status.asFinalized.toString();
-                console.log(
-                  `Batch Tx finalized with hash ${tranHash}\n\nbefore delay\n`
-                );
+                // console.log(
+                //   `Batch Tx finalized with hash ${tranHash}\n\nbefore delay\n`
+                // );
                 setTxnHash(tranHash);
                 await delay(20000);
-                console.log("after delay");
+                // console.log("after delay");
                 const block = await mangataHelper.api.rpc.chain.getBlock(
                   tranHash
                 );
-                console.log("block", block);
-                console.log("block", JSON.stringify(block));
+                // console.log("block", block);
+                // console.log("block", JSON.stringify(block));
                 const bhn = parseInt(block.block.header.number) + 1;
-                console.log("num", bhn);
+                // console.log("num", bhn);
                 const blockHash =
                   await mangataHelper.api.rpc.chain.getBlockHash(bhn);
-                console.log(`blockHash ${blockHash}`);
-                console.log("bhjs", JSON.stringify(blockHash) ?? "nothing");
+                // console.log(`blockHash ${blockHash}`);
+                // console.log("bhjs", JSON.stringify(blockHash) ?? "nothing");
                 // const blockEvents =
                 //   await mangataHelper.api.query.system.events.at(tranHash);
                 const at = await mangataHelper.api.at(blockHash);
                 const blockEvents = await at.query.system.events();
-                console.log("blockEvents", blockEvents);
+                // console.log("blockEvents", blockEvents);
                 let allSuccess = true;
                 blockEvents.forEach((d: any) => {
                   const {
@@ -604,9 +604,9 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
                     method === "BatchInterrupted" ||
                     method === "ExtrinsicFailed"
                   ) {
-                    console.log("failed is true");
+                    // console.log("failed is true");
                     // failed = true;
-                    console.log("Error in addliq Tx:");
+                    // console.log("Error in addliq Tx:");
                     allSuccess = false;
                     setIsSuccess(false);
                     setIsSigning(false);
@@ -624,11 +624,11 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
                   }
                 });
                 if (allSuccess) {
-                  console.log("allSuccess", allSuccess);
+                  // console.log("allSuccess", allSuccess);
                   setIsSuccess(true);
                   setIsInProcess(false);
                   setIsSigning(false);
-                  console.log("Mint liquidity trxn finalised.");
+                  // console.log("Mint liquidity trxn finalised.");
                   // toast({
                   //   position: "top",
                   //   duration: 3000,
@@ -651,13 +651,13 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
                 }
               })();
             } else {
-              console.log("Status:", status.type);
+              // console.log("Status:", status.type);
               // setIsSigning(false);
             }
           }
         )
         .catch((err: any) => {
-          console.log("Error while minting liquidity: ", err);
+          // console.log("Error while minting liquidity: ", err);
           setIsInProcess(false);
           setIsSigning(false);
           setIsSuccess(false);
@@ -674,7 +674,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
         });
     } catch (error) {
       let errorString = `${error}`;
-      console.log("error while adding liquidity:", errorString);
+      // console.log("error while adding liquidity:", errorString);
       // toast({
       //   position: "top",
       //   duration: 3000,
@@ -687,7 +687,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
 
   useEffect(() => {
     if (isSuccess) {
-      console.log("addliq txn success!");
+      // console.log("addliq txn success!");
 
       // Tracking
       handleAddLiquidityEvent({
@@ -730,11 +730,11 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
         },
       });
       (async () => {
-        console.log(
-          "beforeuepos",
-          selectedFarm?.chain!,
-          selectedFarm?.protocol!
-        );
+        // console.log(
+        //   "beforeuepos",
+        //   selectedFarm?.chain!,
+        //   selectedFarm?.protocol!
+        // );
 
         const a = await updateSubstratePositions({
           farm: {
@@ -751,7 +751,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
           positions,
           account,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
@@ -946,7 +946,7 @@ const AddSectionMangata: FC<PropsWithChildren> = () => {
                   parseFloat(firstTokenAmount) <= 0 &&
                   parseFloat(secondTokenAmount) <= 0
                 ) {
-                  console.log("Both token amount can't be zero");
+                  // console.log("Both token amount can't be zero");
                 } else {
                   setIsConfirmStep(true);
                 }
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index b16a853..894e710 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -126,7 +126,7 @@ const AddSectionStable: FC = () => {
   const tokens = farm?.asset.underlyingAssets ?? [];
 
   // useEffect(() => {
-  //   console.log("balancemap", balanceMap);
+  //   // console.log("balancemap", balanceMap);
   // }, [balanceMap]);
 
   // Input focus states
@@ -148,18 +148,18 @@ const AddSectionStable: FC = () => {
       tokenPricesMap[
         `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
       ];
-    console.log(
-      "tokenkey",
-      `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
-    );
-    console.log("token", tokenPrice);
+    // console.log(
+    //   "tokenkey",
+    //   `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
+    // );
+    // console.log("token", tokenPrice);
     if (!!tokenPrice && typeof tokenPrice == "number") {
-      console.log("...setting tokenprice", tokenPrice);
+      // console.log("...setting tokenprice", tokenPrice);
       setNativePrice(tokenPrice);
     }
   }, [farm, tokenPricesMap]);
 
-  useEffect(() => console.log("selectedfarm", farm), [farm]);
+  // useEffect(() => console.log("selectedfarm", farm), [farm]);
 
   // const tokens = farm?.asset.underlyingAssets ?? [];
 
@@ -201,7 +201,7 @@ const AddSectionStable: FC = () => {
     functionName: getAddLiqFunctionName(farm?.protocol!) as any,
     chainId: chain?.id,
     onError: (error) => {
-      console.log(
+      console.error(
         `Error: Adding Liquidity in ${farm?.asset.symbol} Farm:`,
         error
       );
@@ -220,7 +220,7 @@ const AddSectionStable: FC = () => {
 
   useEffect(() => {
     if (isSuccessAddLiqTxn) {
-      console.log("addliq txn success!");
+      // console.log("addliq txn success!");
 
       // Tracking
       handleAddLiquidityEvent({
@@ -257,7 +257,7 @@ const AddSectionStable: FC = () => {
         },
       });
       (async () => {
-        console.log("beforeuepos", farm?.chain!, farm?.protocol!);
+        // console.log("beforeuepos", farm?.chain!, farm?.protocol!);
 
         const a = await updateEvmPositions({
           farm: {
@@ -275,7 +275,7 @@ const AddSectionStable: FC = () => {
           tokenPricesMap,
           lpTokenPricesMap,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
@@ -302,7 +302,7 @@ const AddSectionStable: FC = () => {
   }, [approvalMap, inputMapAmount]);
 
   useEffect(() => {
-    console.log("balanceMap", balanceMap);
+    // console.log("balanceMap", balanceMap);
   }, [balanceMap]);
 
   const isSufficientBalance = useMemo(() => {
@@ -316,9 +316,9 @@ const AddSectionStable: FC = () => {
   }, [inputMapAmount, balanceMap]);
 
   useEffect(() => {
-    console.log("isRequirementApproved", isRequirementApproved);
-    console.log("approvalMap", approvalMap);
-    console.log("inputMapAmount", inputMapAmount);
+    // console.log("isRequirementApproved", isRequirementApproved);
+    // console.log("approvalMap", approvalMap);
+    // console.log("inputMapAmount", inputMapAmount);
   }, [isRequirementApproved]);
 
   const handleAddLiquidity = async () => {
@@ -327,8 +327,8 @@ const AddSectionStable: FC = () => {
       const block = await publicClient.getBlock();
       const blocktimestamp =
         Number(block.timestamp.toString() + "000") + 60000 * 30; // Adding 30 minutes
-      console.log("timestamp fetched //", blocktimestamp);
-      console.log("calling addliquidity method...", amounts, estLpAmount);
+      // console.log("timestamp fetched //", blocktimestamp);
+      // console.log("calling addliquidity method...", amounts, estLpAmount);
 
       const args_to_pass =
         farm?.protocol.toLowerCase() == "curve"
@@ -347,7 +347,7 @@ const AddSectionStable: FC = () => {
         value:
           farm?.asset.symbol == "nASTR-ASTR LP" ? amounts[0] : parseEther("0"),
       });
-      console.log(`Adding Liquidity in ${farm?.asset.symbol} Farm`, txnRes);
+      // console.log(`Adding Liquidity in ${farm?.asset.symbol} Farm`, txnRes);
       setTxnHash(txnRes?.hash);
     } catch (error) {
       console.error(
@@ -593,7 +593,7 @@ const AddSectionStable: FC = () => {
           isLoading={false}
           text="Confirm Supply"
           onClick={() => {
-            console.log("args:", {});
+            // console.log("args:", {});
             handleAddLiquidity();
             setIsProcessStep(true);
           }}
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index ebb5a0e..1c7d779 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -112,7 +112,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const [isSlippageStep, setIsSlippageStep] = useState(false);
 
   useEffect(() => {
-    console.log("selectedFarm", selectedFarm);
+    // console.log("selectedFarm", selectedFarm);
   }, [selectedFarm]);
 
   // Amount States
@@ -212,7 +212,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   //     });
   //     reserve0 = (bal0 as bigint).toString();
   //     reserve1 = (bal1 as bigint).toString();
-  //     console.log("sirbal", bal0, bal1, router, selectedFarm?.protocol!);
+  //     // console.log("sirbal", bal0, bal1, router, selectedFarm?.protocol!);
   //     // return {
   //     //   reserve0: (bal0 as bigint).toString(),
   //     //   reserve1: (bal1 as bigint).toString(),
@@ -234,7 +234,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   //   args: [1],
   //   enabled: !!selectedFarm?.protocol! && !!selectedFarm?.router!,
   // });
-  // console.log("sirbal", bal0, bal1, router, selectedFarm?.protocol!);
+  // // console.log("sirbal", bal0, bal1, router, selectedFarm?.protocol!);
   // // return {
   // //   reserve0: (bal0 as bigint).toString(),
   // //   reserve1: (bal1 as bigint).toString(),
@@ -282,13 +282,13 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
       tokenPricesMap[
         `${selectedFarm?.chain!}-${selectedFarm?.protocol!}-${tokenSymbol}-${tokenAddress}`
       ];
-    // console.log(
+    // // console.log(
     //   "tokenkey",
     //   `${selectedFarm?.chain!}-${selectedFarm?.protocol!}-${tokenSymbol}-${tokenAddress}`
     // );
-    console.log("token", tokenPrice);
+    // console.log("token", tokenPrice);
     if (!!tokenPrice && typeof tokenPrice == "number") {
-      console.log("...setting tokenprice", tokenPrice);
+      // console.log("...setting tokenprice", tokenPrice);
       setNativePrice(tokenPrice);
     }
   }, [selectedFarm, tokenPricesMap]);
@@ -301,7 +301,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     enabled: !!address && !!selectedFarm,
   });
 
-  console.log("token0Balance", token0Balance);
+  // console.log("token0Balance", token0Balance);
 
   // Balance Token1
   const { data: token1Balance, isLoading: token1BalanceLoading } = useBalance({
@@ -311,7 +311,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     enabled: !!address && !!selectedFarm,
   });
 
-  console.log("token0Balance", token0Balance);
+  // console.log("token0Balance", token0Balance);
 
   // Check Approval Token0 & Token1
   const {
@@ -381,7 +381,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     ) as any,
     chainId: chain?.id,
     onError: (error) => {
-      console.log(
+      console.error(
         `Error: Adding Liquidity in ${selectedFarm?.asset.symbol} Farm:`,
         error
       );
@@ -404,9 +404,9 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
       const block = await publicClient.getBlock();
       const blocktimestamp =
         Number(block.timestamp.toString() + "000") + 60000 * 30; // Adding  30 minutes
-      console.log("timestamp fetched //", blocktimestamp);
+      // console.log("timestamp fetched //", blocktimestamp);
 
-      console.log("calling addliquidity method...");
+      // console.log("calling addliquidity method...");
 
       const addArgs = [
         farmAsset0?.address,
@@ -432,7 +432,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
         address, // To
         blocktimestamp, // deadline (uint256)
       ];
-      console.log("addArgs", addArgs);
+      // console.log("addArgs", addArgs);
 
       const txnRes = await addLiquidity?.({
         args: addArgs,
@@ -440,10 +440,10 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
       if (!!txnRes) {
         setTxnHash(txnRes.hash);
       }
-      console.log(
-        `Adding Liquidity in ${selectedFarm?.asset.symbol} Farm`,
-        txnRes
-      );
+      // console.log(
+      //   `Adding Liquidity in ${selectedFarm?.asset.symbol} Farm`,
+      //   txnRes
+      // );
     } catch (error) {
       console.error(
         `Error while adding liquidity -> ${selectedFarm?.asset.symbol} Farm\n`,
@@ -492,14 +492,14 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
       farmAsset0.decimals,
       farmAsset1.decimals
     );
-    console.log(
-      "siri",
-      poolRatio,
-      reserve0,
-      reserve1,
-      farmAsset0.decimals,
-      farmAsset1.decimals
-    );
+    // console.log(
+    //   "siri",
+    //   poolRatio,
+    //   reserve0,
+    //   reserve1,
+    //   farmAsset0.decimals,
+    //   farmAsset1.decimals
+    // );
     const expectedSecondTokenAmount = firstTokenAmount / poolRatio;
     const secondTokenAmount = isNaN(expectedSecondTokenAmount)
       ? "0"
@@ -551,24 +551,24 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
 
   useEffect(() => {
     if (!isToken0ApprovedLoading || !isToken1ApprovedLoading) {
-      console.log("isToken0ApprovedSuccess", isToken0ApprovedSuccess);
-      console.log("isToken1ApprovedSuccess", isToken1ApprovedSuccess);
+      // console.log("isToken0ApprovedSuccess", isToken0ApprovedSuccess);
+      // console.log("isToken1ApprovedSuccess", isToken1ApprovedSuccess);
     }
   }, [isToken1ApprovedSuccess, isToken0ApprovedSuccess]);
 
   // Remove after testing
   useEffect(() => {
     if (isLoadingAddLiqCall) {
-      console.log("addliq method loading... sign the txn");
+      // console.log("addliq method loading... sign the txn");
     } else if (isLoadingAddLiqTxn) {
-      console.log("addliq txn loading...");
-      console.log("call hash", addLiquidityData?.hash);
+      // console.log("addliq txn loading...");
+      // console.log("call hash", addLiquidityData?.hash);
     }
   }, [isLoadingAddLiqCall, isLoadingAddLiqTxn]);
 
   useEffect(() => {
     if (isSuccessAddLiqTxn) {
-      console.log("addliq txn success!");
+      // console.log("addliq txn success!");
 
       // Tracking
       handleAddLiquidityEvent({
@@ -615,11 +615,11 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
         },
       });
       (async () => {
-        console.log(
-          "beforeuepos",
-          selectedFarm?.chain!,
-          selectedFarm?.protocol!
-        );
+        // console.log(
+        //   "beforeuepos",
+        //   selectedFarm?.chain!,
+        //   selectedFarm?.protocol!
+        // );
 
         const a = await updateEvmPositions({
           farm: {
@@ -637,7 +637,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
           tokenPricesMap,
           lpTokenPricesMap,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
@@ -650,8 +650,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
 
   useEffect(() => {
     if (!isToken0ApprovedLoading || !isToken1ApprovedLoading) {
-      console.log("isSuccess Approve0", approveToken0TxnSuccess);
-      console.log("isSuccess Approve1", approveToken1TxnSuccess);
+      // console.log("isSuccess Approve0", approveToken0TxnSuccess);
+      // console.log("isSuccess Approve1", approveToken1TxnSuccess);
     }
   }, [approveToken0TxnSuccess, approveToken1TxnSuccess]);
 
@@ -876,9 +876,9 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
                   onClick={async () => {
                     try {
                       const txn = await approveToken0?.();
-                      console.log("Approve0 Result", txn);
+                      // console.log("Approve0 Result", txn);
                     } catch (error) {
-                      console.log(
+                      console.error(
                         `Error while Approving ${farmAsset0?.symbol}`,
                         error
                       );
@@ -911,9 +911,9 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
                     onClick={async () => {
                       try {
                         const txn = await approveToken1?.();
-                        console.log("Approve1 Result", txn);
+                        // console.log("Approve1 Result", txn);
                       } catch (error) {
-                        console.log(
+                        console.error(
                           `Error while Approving ${farmAsset1?.symbol}`,
                           error
                         );
@@ -985,8 +985,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
       ]
     );
 
-    console.log("firstTokenAmount", firstTokenAmount);
-    console.log("secondTokenAmount", secondTokenAmount);
+    // console.log("firstTokenAmount", firstTokenAmount);
+    // console.log("secondTokenAmount", secondTokenAmount);
 
     return (
       <div className="flex flex-col gap-y-8 text-left">
@@ -1131,22 +1131,22 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
           isLoading={false}
           text="Confirm Supply"
           onClick={() => {
-            console.log("args:", {
-              aAddress: farmAsset0?.address,
-              bAddress: farmAsset1?.address,
-              aAmount: parseUnits(
-                `${parseFloat(firstTokenAmount)}`,
-                farmAsset0?.decimals
-              ),
-              bAmount: parseUnits(
-                `${parseFloat(secondTokenAmount)}`,
-                farmAsset0?.decimals
-              ),
-              aAmountMin: 1, // amountAMin
-              bAmountMin: 1, // amountBMin
-              to: address, // To
-              timestamp: "calculated in call", // deadline (uint256)
-            });
+            // console.log("args:", {
+            //   aAddress: farmAsset0?.address,
+            //   bAddress: farmAsset1?.address,
+            //   aAmount: parseUnits(
+            //     `${parseFloat(firstTokenAmount)}`,
+            //     farmAsset0?.decimals
+            //   ),
+            //   bAmount: parseUnits(
+            //     `${parseFloat(secondTokenAmount)}`,
+            //     farmAsset0?.decimals
+            //   ),
+            //   aAmountMin: 1, // amountAMin
+            //   bAmountMin: 1, // amountBMin
+            //   to: address, // To
+            //   timestamp: "calculated in call", // deadline (uint256)
+            // });
             handleAddLiquidity();
             setIsProcessStep(true);
           }}
diff --git a/src/components/Library/AddLiquidityModal/TokenButton.tsx b/src/components/Library/AddLiquidityModal/TokenButton.tsx
index 9aa7c7b..7b241d3 100644
--- a/src/components/Library/AddLiquidityModal/TokenButton.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenButton.tsx
@@ -46,7 +46,7 @@ const TokenButton: React.FC<Props> = ({
     enabled: !!address && !!token,
   });
 
-  console.log("balance in tokenbutton", balance, isSuccess);
+  // console.log("balance in tokenbutton", balance, isSuccess);
 
   // Check Approval Token
   const { isSuccess: isApprovedSuccess } = useIsApprovedToken(
@@ -110,9 +110,9 @@ const TokenButton: React.FC<Props> = ({
   const handleApproveToken = async () => {
     try {
       const txn = await approveToken?.();
-      console.log("Approve Result", txn);
+      // console.log("Approve Result", txn);
     } catch (error) {
-      console.log(`Error while Approving ${token.symbol}`, error);
+      // console.log(`Error while Approving ${token.symbol}`, error);
     }
   };
 
diff --git a/src/components/Library/AddLiquidityModal/TokenInput.tsx b/src/components/Library/AddLiquidityModal/TokenInput.tsx
index 96b2f05..2ff13b8 100644
--- a/src/components/Library/AddLiquidityModal/TokenInput.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenInput.tsx
@@ -60,13 +60,13 @@ const TokenInput: React.FC<TokenInputProps> = ({
 
   useEffect(() => {
     if (isSuccess && !balanceMap[token?.address]) {
-      console.log(
-        "pinguu",
-        token,
-        nativeBal,
-        token?.symbol == "ASTR",
-        balance?.formatted
-      );
+      // console.log(
+      //   "pinguu",
+      //   token,
+      //   nativeBal,
+      //   token?.symbol == "ASTR",
+      //   balance?.formatted
+      // );
       setBalanceMap((prev) => ({
         ...prev,
         [token?.address]:
diff --git a/src/components/Library/AddLiquidityModal/useStableAmounts.ts b/src/components/Library/AddLiquidityModal/useStableAmounts.ts
index a7d769d..92d424b 100644
--- a/src/components/Library/AddLiquidityModal/useStableAmounts.ts
+++ b/src/components/Library/AddLiquidityModal/useStableAmounts.ts
@@ -6,13 +6,13 @@ const useStableAmounts = (
   inputMapAmount: { [address: Address]: number },
   tokens: UnderlyingAssets[]
 ) => {
-  // console.log("inputMap", inputMapAmount);
-  // console.log("token", tokens);
+  // // console.log("inputMap", inputMapAmount);
+  // // console.log("token", tokens);
 
   const updatedTokens = useMemo(() => {
     const newtokens = tokens
       .map((token) => {
-        console.log("waota", token.symbol, inputMapAmount[token?.address]);
+        // console.log("waota", token.symbol, inputMapAmount[token?.address]);
         const inputAmount = !isNaN(inputMapAmount[token?.address])
           ? inputMapAmount[token?.address]
           : 0;
@@ -23,7 +23,7 @@ const useStableAmounts = (
       });
     return newtokens;
   }, [inputMapAmount]);
-  // console.log("updated tokens", updatedTokens);
+  // // console.log("updated tokens", updatedTokens);
   return updatedTokens;
 };
 
diff --git a/src/components/Library/ClaimRewardsModal/ClaimSectionDot.tsx b/src/components/Library/ClaimRewardsModal/ClaimSectionDot.tsx
index 2cf7728..0bad91d 100644
--- a/src/components/Library/ClaimRewardsModal/ClaimSectionDot.tsx
+++ b/src/components/Library/ClaimRewardsModal/ClaimSectionDot.tsx
@@ -45,7 +45,7 @@ const ClaimSectionDot = () => {
 
   const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
 
-  useEffect(() => console.log("selected position @claimrewards"), [position]);
+  // useEffect(() => console.log("selected position @claimrewards"), [position]);
 
   const [isProcessStep, setIsProcessStep] = useState(false);
   const isOpenModalCondition = false; // Conditions to be written
@@ -88,7 +88,7 @@ const ClaimSectionDot = () => {
     setIsInProcess(true);
     try {
       setIsSigning(true);
-      console.log("clpool", pool, position);
+      // console.log("clpool", pool, position);
       const signer = account?.wallet?.signer;
       const claimRewardsTxn = await mangataHelper.claimRewardsAll(position?.id);
       claimRewardsTxn
@@ -97,34 +97,34 @@ const ClaimSectionDot = () => {
           { signer: signer },
           async ({ status }: any) => {
             if (status.isInBlock) {
-              console.log("claimrew in block now!");
+              // console.log("claimrew in block now!");
               // unsub();
               // resolve();
             } else if (status.isFinalized) {
               (async () => {
                 const tranHash = status.asFinalized.toString();
                 setTxnHash(tranHash);
-                console.log(
+                console.info(
                   `Batch Tx finalized with hash ${tranHash}\n\nbefore delay\n`
                 );
                 await delay(20000);
-                console.log("after delay");
+                // console.log("after delay");
                 const block = await mangataHelper.api.rpc.chain.getBlock(
                   tranHash
                 );
-                console.log("block", block);
-                console.log("block", JSON.stringify(block));
+                // console.log("block", block);
+                // console.log("block", JSON.stringify(block));
                 const bhn = parseInt(block.block.header.number) + 1;
-                console.log("num", bhn);
+                // console.log("num", bhn);
                 const blockHash =
                   await mangataHelper.api.rpc.chain.getBlockHash(bhn);
-                console.log(`blockHash ${blockHash}`);
-                console.log("bhjs", JSON.stringify(blockHash) ?? "nothing");
+                // console.log(`blockHash ${blockHash}`);
+                // console.log("bhjs", JSON.stringify(blockHash) ?? "nothing");
                 // const blockEvents =
                 //   await mangataHelper.api.query.system.events.at(tranHash);
                 const at = await mangataHelper.api.at(blockHash);
                 const blockEvents = await at.query.system.events();
-                console.log("blockEvents", blockEvents);
+                // console.log("blockEvents", blockEvents);
                 let allSuccess = true;
                 blockEvents.forEach((d: any) => {
                   const {
@@ -137,9 +137,9 @@ const ClaimSectionDot = () => {
                     method === "BatchInterrupted" ||
                     method === "ExtrinsicFailed"
                   ) {
-                    console.log("failed is true");
+                    // console.log("failed is true");
                     // failed = true;
-                    console.log("Error in addliq Tx:");
+                    // console.log("Error in addliq Tx:");
                     allSuccess = false;
                     setIsSuccess(false);
                     setIsSigning(false);
@@ -157,14 +157,14 @@ const ClaimSectionDot = () => {
                   }
                 });
                 if (allSuccess) {
-                  console.log("allSuccess", allSuccess);
-                  setIsSuccess(true);
-                  setIsInProcess(false);
-                  setIsSigning(false);
-                  // setLpUpdated(lpUpdated + 1);
-                  console.log(
-                    `Rewards Successfully claimed from ${token0}-${token1} with hash ${status.asFinalized.toHex()}`
-                  );
+                  // console.log("allSuccess", allSuccess);
+                  // setIsSuccess(true);
+                  // setIsInProcess(false);
+                  // setIsSigning(false);
+                  // // setLpUpdated(lpUpdated + 1);
+                  // // console.log(
+                  //   `Rewards Successfully claimed from ${token0}-${token1} with hash ${status.asFinalized.toHex()}`
+                  // );
                   // toast({
                   //   position: "top",
                   //   duration: 3000,
@@ -188,12 +188,12 @@ const ClaimSectionDot = () => {
               })();
             } else {
               setIsSigning(false);
-              console.log(`Status: ${status.type}`);
+              // console.log(`Status: ${status.type}`);
             }
           }
         )
         .catch((e: any) => {
-          console.log("Error in burnLiquidityTx", e);
+          // console.log("Error in burnLiquidityTx", e);
           setIsInProcess(false);
           setIsSigning(false);
           setIsSuccess(false);
@@ -208,7 +208,7 @@ const ClaimSectionDot = () => {
           //   ),
           // });
         });
-      console.log("called claim rewards method");
+      // console.log("called claim rewards method");
     } catch (error) {
       let errorString = `${error}`;
       console.error("error while claiming rewards:", errorString);
@@ -224,7 +224,7 @@ const ClaimSectionDot = () => {
 
   useEffect(() => {
     if (isSuccess) {
-      console.log("claimrewards txn success!");
+      // console.log("claimrewards txn success!");
       // Tracking
       handleClaimRewardsEvent({
         userAddress: account?.address!,
@@ -247,7 +247,7 @@ const ClaimSectionDot = () => {
         })!,
       });
       (async () => {
-        console.log("beforeuepos", position?.chain!, position?.protocol!);
+        // console.log("beforeuepos", position?.chain!, position?.protocol!);
 
         const a = await updateSubstratePositions({
           farm: {
@@ -264,7 +264,7 @@ const ClaimSectionDot = () => {
           positions,
           account,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
diff --git a/src/components/Library/ClaimRewardsModal/ClaimSectionEvm.tsx b/src/components/Library/ClaimRewardsModal/ClaimSectionEvm.tsx
index f0f9bc3..806c583 100644
--- a/src/components/Library/ClaimRewardsModal/ClaimSectionEvm.tsx
+++ b/src/components/Library/ClaimRewardsModal/ClaimSectionEvm.tsx
@@ -50,7 +50,7 @@ const ClaimSectionEvm = () => {
   const [position] = useAtom(selectedPositionAtom);
   // const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
 
-  useEffect(() => console.log("selected position @claimrewards"), [position]);
+  // useEffect(() => console.log("selected position @claimrewards"), [position]);
 
   const [isProcessStep, setIsProcessStep] = useState(false);
   const isOpenModalCondition = false; // Conditions to be written
@@ -81,13 +81,13 @@ const ClaimSectionEvm = () => {
       tokenPricesMap[
         `${position?.chain!}-${position?.protocol!}-${tokenSymbol}-${tokenAddress}`
       ];
-    console.log(
-      "tokenkey",
-      `${position?.chain!}-${position?.protocol!}-${tokenSymbol}-${tokenAddress}`
-    );
-    console.log("token", tokenPrice);
+    // console.log(
+    //   "tokenkey",
+    //   `${position?.chain!}-${position?.protocol!}-${tokenSymbol}-${tokenAddress}`
+    // );
+    // console.log("token", tokenPrice);
     if (!!tokenPrice && typeof tokenPrice == "number") {
-      console.log("...setting tokenprice", tokenPrice);
+      // console.log("...setting tokenprice", tokenPrice);
       setNativePrice(tokenPrice);
     }
   }, [position, tokenPricesMap]);
@@ -140,7 +140,7 @@ const ClaimSectionEvm = () => {
 
   useEffect(() => {
     if (isSuccessClaimRewardsTxn) {
-      console.log("claimrewards txn success!");
+      // console.log("claimrewards txn success!");
       // Tracking
       handleClaimRewardsEvent({
         userAddress: address!,
@@ -163,7 +163,7 @@ const ClaimSectionEvm = () => {
         })!,
       });
       (async () => {
-        console.log("beforeuepos", position?.chain!, position?.protocol!);
+        // console.log("beforeuepos", position?.chain!, position?.protocol!);
 
         const a = await updateEvmPositions({
           farm: {
@@ -181,7 +181,7 @@ const ClaimSectionEvm = () => {
           tokenPricesMap,
           lpTokenPricesMap,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
@@ -201,13 +201,13 @@ const ClaimSectionEvm = () => {
         position?.lpAddress!
       );
 
-      console.log("CLAIMREWARDS contract @params", {
-        address: position?.chef,
-        abi: parseAbi(getChefAbi(position?.protocol!, position?.chef!)),
-        functionName: getClaimRewardsFunctionName(position?.protocol!),
-        chainId: chain?.id,
-        args: thisArgs,
-      });
+      // console.log("CLAIMREWARDS contract @params", {
+      //   address: position?.chef,
+      //   abi: parseAbi(getChefAbi(position?.protocol!, position?.chef!)),
+      //   functionName: getClaimRewardsFunctionName(position?.protocol!),
+      //   chainId: chain?.id,
+      //   args: thisArgs,
+      // });
 
       const txnRes = await claimRewards?.({
         args: [thisArgs],
@@ -215,7 +215,7 @@ const ClaimSectionEvm = () => {
       if (!!txnRes) {
         setTxnHash(txnRes.hash);
       }
-      console.log("called claim rewards method:", txnRes);
+      // console.log("called claim rewards method:", txnRes);
     } catch (error) {
       console.error("error while claiming rewards:", error);
     }
diff --git a/src/components/Library/ConnectWallet/ConnectBtnDot.tsx b/src/components/Library/ConnectWallet/ConnectBtnDot.tsx
index c83cb60..eb743bd 100644
--- a/src/components/Library/ConnectWallet/ConnectBtnDot.tsx
+++ b/src/components/Library/ConnectWallet/ConnectBtnDot.tsx
@@ -23,7 +23,7 @@ const ConnectBtnDot: FC = () => {
 
   useEffect(() => {
     // Clear timeout when component unmounts
-    console.log("Connected substrate Account", account);
+    // console.log("Connected substrate Account", account);
     return () => {
       clearTimeout(timerRef.current as ReturnType<typeof setTimeout>);
     };
@@ -101,7 +101,7 @@ const ConnectBtnDot: FC = () => {
                             )}
                             key={account.name}
                             onClick={() => {
-                              console.log("selected account", account);
+                              // console.log("selected account", account);
                               setAccount(account);
                             }}
                           >
diff --git a/src/components/Library/ConnectWallet/SelectAccountMenu.tsx b/src/components/Library/ConnectWallet/SelectAccountMenu.tsx
index 21b6b2e..22de0e9 100644
--- a/src/components/Library/ConnectWallet/SelectAccountMenu.tsx
+++ b/src/components/Library/ConnectWallet/SelectAccountMenu.tsx
@@ -126,11 +126,11 @@ const MenuItems: FC<MenuItemsProps> = ({ choice, setChoice }) => {
                   }
                 );
               } else {
-                console.log(`${wallet.extensionName} not installed!`);
+                // console.log(`${wallet.extensionName} not installed!`);
                 router.push(wallet.installUrl);
               }
             } catch (err) {
-              console.log("Error in subscribing accounts: ", err);
+              // console.log("Error in subscribing accounts: ", err);
             }
           }}
         >
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
index 3185cae..28571e4 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionMangata.tsx
@@ -89,7 +89,7 @@ const RemoveSectionMangata: FC = () => {
   useEffect(() => {
     (async () => {
       const mgxp = (await fetchTokenPricesMangata()).get("mgx")!;
-      console.log("mgxp", mgxp);
+      // console.log("mgxp", mgxp);
       setMgxPrice(mgxp);
     })();
   });
@@ -104,7 +104,7 @@ const RemoveSectionMangata: FC = () => {
 
   // const toast = useToast();
 
-  useEffect(() => console.log("farm @removeliq", farm), [farm]);
+  // useEffect(() => console.log("farm @removeliq", farm), [farm]);
 
   const [percentage, setPercentage] = useState("");
   const [lpTokens, setLpTokens] = useState("");
@@ -132,14 +132,14 @@ const RemoveSectionMangata: FC = () => {
     if (pools == null) return;
     const [token0, token1] = formatTokenSymbols(farm?.asset.symbol!);
     const poolName = `${token0}-${token1}`;
-    console.log("selected poolname", poolName);
+    // console.log("selected poolname", poolName);
 
     // Make a state for this
     const pool = _.find(pools, {
       firstTokenId: mangataHelper.getTokenIdBySymbol(token0),
       secondTokenId: mangataHelper.getTokenIdBySymbol(token1),
     });
-    console.log(`Found a pool of ${poolName}`, pool);
+    // console.log(`Found a pool of ${poolName}`, pool);
     setPool(pool);
 
     if (_.isUndefined(pool)) {
@@ -161,9 +161,9 @@ const RemoveSectionMangata: FC = () => {
     // Calculate rewards amount in pool
     const { liquidityTokenId } = pool;
 
-    console.log(
-      `Checking how much reward available in ${poolName} pool, tokenId: ${liquidityTokenId} ...`
-    );
+    // console.log(
+    //   `Checking how much reward available in ${poolName} pool, tokenId: ${liquidityTokenId} ...`
+    // );
 
     // Issue: current we couldn’t read this rewards value correct by always getting 0 on the claimable rewards.
     // The result is different from that in src/mangata.js
@@ -171,7 +171,7 @@ const RemoveSectionMangata: FC = () => {
       mangataAddress,
       liquidityTokenId
     );
-    console.log(`Claimable reward in ${poolName}: `, rewardAmount);
+    // console.log(`Claimable reward in ${poolName}: `, rewardAmount);
 
     const liquidityBalance = await mangataHelper.mangata?.getTokenBalance(
       liquidityTokenId,
@@ -180,20 +180,20 @@ const RemoveSectionMangata: FC = () => {
     const poolNameDecimalBN = getDecimalBN(
       mangataHelper.getDecimalsBySymbol(poolName)
     );
-    console.log(
-      "liquidity balance",
-      liquidityBalance?.reserved,
-      "poolName DecimalBN",
-      poolNameDecimalBN,
-      "decimal",
-      mangataHelper.getDecimalsBySymbol(poolName)
-    );
+    // console.log(
+    //   "liquidity balance",
+    //   liquidityBalance?.reserved,
+    //   "poolName DecimalBN",
+    //   poolNameDecimalBN,
+    //   "decimal",
+    //   mangataHelper.getDecimalsBySymbol(poolName)
+    // );
 
     const numReserved = new BN(liquidityBalance.reserved).div(
       poolNameDecimalBN
     );
 
-    console.log("num reserved", numReserved);
+    // console.log("num reserved", numReserved);
 
     // setting selected pool's LP token balance
     const lpBalanceh = await mangataHelper.mangata.getTokenBalance(
@@ -206,7 +206,7 @@ const RemoveSectionMangata: FC = () => {
     //   parseFloat(BigInt(lpBalanceh.free).toString(10)) / 10 ** decimal;
     const lpBalanceNum =
       parseFloat(BigInt(lpBalanceh.reserved).toString(10)) / 10 ** decimal;
-    console.log("LP Balance lpBalanceNum: ", lpBalanceNum, lpBalanceh);
+    // console.log("LP Balance lpBalanceNum: ", lpBalanceNum, lpBalanceh);
     setLpBalanceNum(lpBalanceNum);
     setLpBalance(lpBalanceh);
     // Required setup finished
@@ -229,10 +229,10 @@ const RemoveSectionMangata: FC = () => {
           account1?.address
         );
         const balFree = parseFloat(BigInt(bal.free).toString(10)) / 10 ** 18; // MGX decimals == 18
-        console.log("fetched mgxbalance", balFree);
+        // console.log("fetched mgxbalance", balFree);
         setMgxBalance(balFree);
       } catch (error) {
-        console.log("error fetching mgx balance", error);
+        // console.log("error fetching mgx balance", error);
       }
     })();
   }, [account1]);
@@ -276,42 +276,42 @@ const RemoveSectionMangata: FC = () => {
 
     let perc = percentage;
     if (percentage == "") {
-      console.log("per is empty so using 100%");
+      // console.log("per is empty so using 100%");
       perc = "100";
     }
 
     try {
       const signer = account?.wallet?.signer;
       setIsSigning(true);
-      console.log("hrllpBalance", lpBalance);
+      // console.log("hrllpBalance", lpBalance);
 
       const lpBalReserved =
         parseFloat(BigInt(lpBalance.reserved).toString(10)) / 10 ** 18;
       const lpBalFree =
         parseFloat(BigInt(lpBalance.free).toString(10)) / 10 ** 18;
 
-      console.log(
-        "amamamam",
-        lpTokens,
-        "lpBalance.reserved",
-        lpBalance.reserved,
-        lpBalReserved,
-        "percentage",
-        perc,
-        "heroo"
-      );
+      // console.log(
+      //   "amamamam",
+      //   lpTokens,
+      //   "lpBalance.reserved",
+      //   lpBalance.reserved,
+      //   lpBalReserved,
+      //   "percentage",
+      //   perc,
+      //   "heroo"
+      // );
 
       let txns = [];
-      console.log(
-        "res",
-        lpBalReserved,
-        "free",
-        lpBalFree,
-        "free+res",
-        lpBalReserved + lpBalFree
-      );
+      // console.log(
+      //   "res",
+      //   lpBalReserved,
+      //   "free",
+      //   lpBalFree,
+      //   "free+res",
+      //   lpBalReserved + lpBalFree
+      // );
       if (BigInt(lpBalance.reserved) == BigInt(0)) {
-        console.log("resbal is zero");
+        // console.log("resbal is zero");
       } else {
         let deactx;
 
@@ -331,17 +331,17 @@ const RemoveSectionMangata: FC = () => {
         txns.push(deactx);
       }
 
-      console.log("blstuff", lpBalance, "percentage", perc);
+      // console.log("blstuff", lpBalance, "percentage", perc);
       if (
         (BigInt(lpBalance.free) * BigInt(parseInt(perc, 10))) / BigInt(100) +
           (BigInt(lpBalance.reserved) * BigInt(parseInt(perc, 10))) /
             BigInt(100) ==
         BigInt(0)
       ) {
-        console.log("totalburnbal is zero");
+        // console.log("totalburnbal is zero");
       } else {
         let bltx;
-        console.log("mehod", methodId, perc, lpTokens, lpBalance);
+        // console.log("mehod", methodId, perc, lpTokens, lpBalance);
 
         if (methodId == 0) {
           bltx = await mangataHelper.burnLiquidityTx(
@@ -370,34 +370,34 @@ const RemoveSectionMangata: FC = () => {
           { signer: signer },
           async ({ status }: any) => {
             if (status.isInBlock) {
-              console.log("Burn Liquidity in block now!");
+              // console.log("Burn Liquidity in block now!");
               // unsub();
               // resolve();
             } else if (status.isFinalized) {
               (async () => {
                 const tranHash = status.asFinalized.toString();
-                console.log(
+                console.info(
                   `Batch Tx finalized with hash ${tranHash}\n\nbefore delay\n`
                 );
                 setTxnHash(tranHash);
                 await delay(20000);
-                console.log("after delay");
+                // console.log("after delay");
                 const block = await mangataHelper.api.rpc.chain.getBlock(
                   tranHash
                 );
-                console.log("block", block);
-                console.log("block", JSON.stringify(block));
+                // console.log("block", block);
+                // console.log("block", JSON.stringify(block));
                 const bhn = parseInt(block.block.header.number) + 1;
-                console.log("num", bhn);
+                // console.log("num", bhn);
                 const blockHash =
                   await mangataHelper.api.rpc.chain.getBlockHash(bhn);
-                console.log(`blockHash ${blockHash}`);
-                console.log("bhjs", JSON.stringify(blockHash) ?? "nothing");
+                // console.log(`blockHash ${blockHash}`);
+                // console.log("bhjs", JSON.stringify(blockHash) ?? "nothing");
                 // const blockEvents =
                 //   await mangataHelper.api.query.system.events.at(tranHash);
                 const at = await mangataHelper.api.at(blockHash);
                 const blockEvents = await at.query.system.events();
-                console.log("blockEvents", blockEvents);
+                // console.log("blockEvents", blockEvents);
                 let allSuccess = true;
                 blockEvents.forEach((d: any) => {
                   const {
@@ -410,9 +410,9 @@ const RemoveSectionMangata: FC = () => {
                     method === "BatchInterrupted" ||
                     method === "ExtrinsicFailed"
                   ) {
-                    console.log("failed is true");
+                    // console.log("failed is true");
                     // failed = true;
-                    console.log("Error in addliq Tx:");
+                    // console.log("Error in addliq Tx:");
                     allSuccess = false;
                     setIsSuccess(false);
                     setIsSigning(false);
@@ -430,12 +430,12 @@ const RemoveSectionMangata: FC = () => {
                   }
                 });
                 if (allSuccess) {
-                  console.log("allSuccess", allSuccess);
+                  // console.log("allSuccess", allSuccess);
                   setIsSuccess(true);
                   setIsInProcess(false);
                   setIsSigning(false);
                   // setLpUpdated(lpUpdated + 1);
-                  console.log(
+                  console.info(
                     `Liquidity Successfully removed from ${token0}-${token1} with hash ${status.asFinalized.toHex()}`
                   );
                   // toast({
@@ -479,12 +479,12 @@ const RemoveSectionMangata: FC = () => {
               })();
             } else {
               // setIsSigning(false);
-              console.log(`Status: ${status.type}`);
+              // console.log(`Status: ${status.type}`);
             }
           }
         )
         .catch((e: any) => {
-          console.log("Error in burnLiquidityTx", e);
+          // console.log("Error in burnLiquidityTx", e);
           setIsInProcess(false);
           setIsSigning(false);
           setIsSuccess(false);
@@ -501,7 +501,7 @@ const RemoveSectionMangata: FC = () => {
         });
     } catch (error) {
       let errorString = `${error}`;
-      console.log("error while handling remove liquidity:", errorString);
+      // console.log("error while handling remove liquidity:", errorString);
       // toast({
       //   position: "top",
       //   duration: 3000,
@@ -662,7 +662,7 @@ const RemoveSectionMangata: FC = () => {
 
   useEffect(() => {
     if (isSuccess) {
-      console.log("liquidity removed successfully");
+      // console.log("liquidity removed successfully");
       setLpUpdated(lpUpdated + 1);
 
       handleRemoveLiquidityEvent({
@@ -700,7 +700,7 @@ const RemoveSectionMangata: FC = () => {
         },
       });
       (async () => {
-        console.log("beforeuepos", farm?.chain!, farm?.protocol!);
+        // console.log("beforeuepos", farm?.chain!, farm?.protocol!);
 
         const a = await updateSubstratePositions({
           farm: {
@@ -717,7 +717,7 @@ const RemoveSectionMangata: FC = () => {
           positions,
           account,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index c9b4134..705d1df 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -82,7 +82,7 @@ const RemoveSectionStable: FC = () => {
   const [isSlippageStep, setIsSlippageStep] = useState(false);
   // const [, setIsEvmPosLoading] = useAtom(evmPosLoadingAtom);
 
-  useEffect(() => console.log("farm @removeliq", farm), [farm]);
+  // useEffect(() => console.log("farm @removeliq", farm), [farm]);
 
   // Balance of LP Token
   const { lpBalanceObj, lpBalance, lpBalanceLoading } = useLPBalance(
@@ -148,13 +148,13 @@ const RemoveSectionStable: FC = () => {
       tokenPricesMap[
         `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
       ];
-    console.log(
-      "tokenkey",
-      `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
-    );
-    console.log("token", tokenPrice);
+    // console.log(
+    //   "tokenkey",
+    //   `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
+    // );
+    // console.log("token", tokenPrice);
     if (!!tokenPrice && typeof tokenPrice == "number") {
-      console.log("...setting tokenprice", tokenPrice);
+      // console.log("...setting tokenprice", tokenPrice);
       setNativePrice(tokenPrice);
     }
   }, [farm, tokenPricesMap]);
@@ -173,7 +173,7 @@ const RemoveSectionStable: FC = () => {
 
   useEffect(() => {
     if (!isLoadingMinAmount) {
-      console.log("minamoutdata removeliq stable", minAmount);
+      // console.log("minamoutdata removeliq stable", minAmount);
     }
   }, [isLoadingMinAmount]);
 
@@ -183,20 +183,20 @@ const RemoveSectionStable: FC = () => {
     tokenIndex: number,
     timestamp: number
   ) => {
-    console.log(
-      "ingalpb",
-      minAmount,
-      lpBalance,
-      parseFloat(lpBalance!),
-      lpTokens,
-      parseFloat(lpTokens)
-    );
+    // console.log(
+    //   "ingalpb",
+    //   minAmount,
+    //   lpBalance,
+    //   parseFloat(lpBalance!),
+    //   lpTokens,
+    //   parseFloat(lpTokens)
+    // );
 
     let mm = BigNumber(lpBalance!, 10)
       .multipliedBy(parseFloat(percentage == "" ? "0" : percentage) / 100)
       .multipliedBy(BigNumber(10).pow(18))
       .decimalPlaces(0, 1);
-    console.log("MMis", mm.toString(), mm);
+    // console.log("MMis", mm.toString(), mm);
     const tokenAmount =
       methodId == Method.PERCENTAGE
         ? mm.toString()
@@ -282,15 +282,15 @@ const RemoveSectionStable: FC = () => {
 
   useEffect(() => {
     if (isLoadingRemoveLiqCall) {
-      console.log("removeliq method loading... sign the txn");
+      // console.log("removeliq method loading... sign the txn");
     } else if (isLoadingRemoveLiqTxn) {
-      console.log("removeliq txn loading...", isLoadingRemoveLiqTxn);
+      // console.log("removeliq txn loading...", isLoadingRemoveLiqTxn);
     }
   }, [isLoadingRemoveLiqCall, isLoadingRemoveLiqTxn]);
 
   useEffect(() => {
     if (isSuccessRemoveLiqTxn) {
-      console.log("liquidity removed successfully", removeLiqTxnData);
+      // console.log("liquidity removed successfully", removeLiqTxnData);
 
       handleRemoveLiquidityEvent({
         userAddress: address!,
@@ -344,7 +344,7 @@ const RemoveSectionStable: FC = () => {
         },
       });
       (async () => {
-        console.log("beforeuepos", farm?.chain!, farm?.protocol!);
+        // console.log("beforeuepos", farm?.chain!, farm?.protocol!);
 
         const a = await updateEvmPositions({
           farm: {
@@ -362,7 +362,7 @@ const RemoveSectionStable: FC = () => {
           tokenPricesMap,
           lpTokenPricesMap,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
@@ -379,9 +379,9 @@ const RemoveSectionStable: FC = () => {
       const block = await publicClient.getBlock();
       const blocktimestamp =
         Number(block.timestamp.toString() + "000") + 60000 * 30; // Adding 30 minutes
-      console.log("timestamp fetched //", blocktimestamp);
+      // console.log("timestamp fetched //", blocktimestamp);
 
-      console.log("calling removeliquidity method...");
+      // console.log("calling removeliquidity method...");
 
       const args_to_pass = getArgs(
         removeMethodId,
@@ -389,7 +389,7 @@ const RemoveSectionStable: FC = () => {
         indiTokenId,
         blocktimestamp
       );
-      console.log("removal_args_to_pass", args_to_pass);
+      // console.log("removal_args_to_pass", args_to_pass);
 
       const txnRes = await removeLiquidity?.({
         args: args_to_pass,
@@ -397,7 +397,7 @@ const RemoveSectionStable: FC = () => {
       if (!!txnRes) {
         setTxnHash(txnRes.hash);
       }
-      console.log("called removeliquidity method.", txnRes);
+      // console.log("called removeliquidity method.", txnRes);
     } catch (error) {
       console.error(error);
     }
@@ -575,7 +575,7 @@ const RemoveSectionStable: FC = () => {
               }
               onClick={async () => {
                 const txn = await approveLpToken?.();
-                console.log("Approve0 Result", txn);
+                // console.log("Approve0 Result", txn);
               }}
             />
           )}
@@ -602,15 +602,15 @@ const RemoveSectionStable: FC = () => {
   };
 
   const ConfirmStep = () => {
-    console.log(
-      "removeMethodIdconfirm",
-      removeMethodId,
-      indiTokenId,
-      getRemoveLiqStableFunctionName(
-        removeMethodId,
-        farm?.protocol as string
-      ) as any
-    );
+    // console.log(
+    //   "removeMethodIdconfirm",
+    //   removeMethodId,
+    //   indiTokenId,
+    //   getRemoveLiqStableFunctionName(
+    //     removeMethodId,
+    //     farm?.protocol as string
+    //   ) as any
+    // );
     // Gas estimate
     const { gasEstimate, isError } = useGasEstimation(
       farm!.router,
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index 107f024..bb823cc 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -74,7 +74,7 @@ const RemoveSectionStandard = () => {
   const [lpTokenPricesMap, setLpTokenPricesMap] = useAtom(lpTokenPricesAtom);
   const [tokenPricesMap] = useAtom(tokenPricesAtom);
 
-  useEffect(() => console.log("farm @removeliq", farm), [farm]);
+  // useEffect(() => console.log("farm @removeliq", farm), [farm]);
 
   // Balance of LP Token
   const { lpBalanceObj, lpBalance, lpBalanceLoading } = useLPBalance(
@@ -149,13 +149,13 @@ const RemoveSectionStandard = () => {
       tokenPricesMap[
         `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
       ];
-    console.log(
-      "tokenkey",
-      `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
-    );
-    console.log("token", tokenPrice);
+    // console.log(
+    //   "tokenkey",
+    //   `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
+    // );
+    // console.log("token", tokenPrice);
     if (!!tokenPrice && typeof tokenPrice == "number") {
-      console.log("...setting tokenprice", tokenPrice);
+      // console.log("...setting tokenprice", tokenPrice);
       setNativePrice(tokenPrice);
     }
   }, [farm, tokenPricesMap]);
@@ -224,21 +224,21 @@ const RemoveSectionStandard = () => {
 
   // useEffect(() => {
   //   if (!isLpApprovedLoading) {
-  //     console.log("isTokenLpApproved", !!Number(isLpApprovedData));
+  //     // console.log("isTokenLpApproved", !!Number(isLpApprovedData));
   //   }
   // }, [isLpApprovedLoading]);
 
   useEffect(() => {
     if (isLoadingRemoveLiqTxn) {
-      console.log("removeliq method loading... sign the txn");
+      // console.log("removeliq method loading... sign the txn");
     } else if (isLoadingRemoveLiqTxn) {
-      console.log("removeliq txn loading...", isLoadingRemoveLiqTxn);
+      // console.log("removeliq txn loading...", isLoadingRemoveLiqTxn);
     }
   }, [isLoadingRemoveLiqTxn, isLoadingRemoveLiqTxn]);
 
   useEffect(() => {
     if (isSuccessRemoveLiqTxn) {
-      console.log("liquidity removed successfully", removeLiqTxnData);
+      // console.log("liquidity removed successfully", removeLiqTxnData);
 
       handleRemoveLiquidityEvent({
         userAddress: address!,
@@ -277,7 +277,7 @@ const RemoveSectionStandard = () => {
         },
       });
       (async () => {
-        console.log("beforeuepos", farm?.chain!, farm?.protocol!);
+        // console.log("beforeuepos", farm?.chain!, farm?.protocol!);
 
         const a = await updateEvmPositions({
           farm: {
@@ -295,7 +295,7 @@ const RemoveSectionStandard = () => {
           tokenPricesMap,
           lpTokenPricesMap,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
@@ -312,32 +312,32 @@ const RemoveSectionStandard = () => {
       const block = await publicClient.getBlock();
       const blocktimestamp =
         Number(block.timestamp.toString() + "000") + 60000 * 30; // Adding 30 minutes
-      console.log("timestamp fetched //", blocktimestamp);
-
-      console.log(
-        "calling removeliquidity method...",
-        lpTokens,
-        lpBalance,
-        methodId == Method.PERCENTAGE
-          ? parseUnits(
-              `${
-                ((parseFloat(lpBalance!) *
-                  parseFloat(percentage == "" ? "0" : percentage)) /
-                  100) *
-                10 ** 18
-              }`,
-              18
-            )
-          : parseUnits(`${parseFloat(lpTokens) * 10 ** 18}`, 18),
-        parseUnits(
-          `${minUnderlyingAssets[0].toString() as any}`,
-          farmAsset0?.decimals
-        ), // amountAMin
-        parseUnits(
-          `${minUnderlyingAssets[1].toString() as any}`,
-          farmAsset1?.decimals
-        ) // amountBMin
-      );
+      // console.log("timestamp fetched //", blocktimestamp);
+
+      // console.log(
+      //   "calling removeliquidity method...",
+      //   lpTokens,
+      //   lpBalance,
+      //   methodId == Method.PERCENTAGE
+      //     ? parseUnits(
+      //         `${
+      //           ((parseFloat(lpBalance!) *
+      //             parseFloat(percentage == "" ? "0" : percentage)) /
+      //             100) *
+      //           10 ** 18
+      //         }`,
+      //         18
+      //       )
+      //     : parseUnits(`${parseFloat(lpTokens) * 10 ** 18}`, 18),
+      //   parseUnits(
+      //     `${minUnderlyingAssets[0].toString() as any}`,
+      //     farmAsset0?.decimals
+      //   ), // amountAMin
+      //   parseUnits(
+      //     `${minUnderlyingAssets[1].toString() as any}`,
+      //     farmAsset1?.decimals
+      //   ) // amountBMin
+      // );
 
       const removeArgs = [
         farmAsset0?.address, // tokenA Address
@@ -404,7 +404,7 @@ const RemoveSectionStandard = () => {
         blocktimestamp, // deadline (uint256)
       ];
 
-      console.log("Remove Liquidity setting args:", removeArgs);
+      // console.log("Remove Liquidity setting args:", removeArgs);
 
       const txnRes = await removeLiquidity?.({
         args: removeArgs,
@@ -412,7 +412,7 @@ const RemoveSectionStandard = () => {
       if (!!txnRes) {
         setTxnHash(txnRes?.hash);
       }
-      console.log("called removeliquidity method.", txnRes);
+      // console.log("called removeliquidity method.", txnRes);
     } catch (error) {
       console.error("Error in Removing liquidity", error);
     }
@@ -539,9 +539,9 @@ const RemoveSectionStandard = () => {
                 onClick={async () => {
                   try {
                     const txn = await approveLpToken?.();
-                    console.log("Approve0 Result", txn);
+                    // console.log("Approve0 Result", txn);
                   } catch (error) {
-                    console.log(
+                    console.error(
                       `error while approving ${farm?.asset.symbol}`,
                       error
                     );
diff --git a/src/components/Library/RemoveLiquidityModal/useMinUnderlyingTokens.ts b/src/components/Library/RemoveLiquidityModal/useMinUnderlyingTokens.ts
index 0d72bd7..1c43962 100644
--- a/src/components/Library/RemoveLiquidityModal/useMinUnderlyingTokens.ts
+++ b/src/components/Library/RemoveLiquidityModal/useMinUnderlyingTokens.ts
@@ -41,13 +41,13 @@ export default function useMinimumUnderlyingTokens(
     const lpAmountAdjusted = !!lpAmount
       ? (lpAmount * (100 - slippage)) / 100
       : 0;
-    console.log(
-      "lpAmountAdjusted",
-      lpAmountAdjusted,
-      parseFloat(ethers.formatUnits(reserve0, d0)),
-      parseFloat(ethers.formatUnits(reserve1, d1)),
-      Number(totalSupply)
-    );
+    // console.log(
+    //   "lpAmountAdjusted",
+    //   lpAmountAdjusted,
+    //   parseFloat(ethers.formatUnits(reserve0, d0)),
+    //   parseFloat(ethers.formatUnits(reserve1, d1)),
+    //   Number(totalSupply)
+    // );
     const amount0 =
       ((lpAmountAdjusted * parseFloat(ethers.formatUnits(reserve0, d0))) /
         Number(totalSupply)) *
@@ -57,7 +57,7 @@ export default function useMinimumUnderlyingTokens(
         Number(totalSupply)) *
       10 ** 18;
 
-    console.log("minunderlyingtokens:\namount0", amount0, "\namount1", amount1);
+    // console.log("minunderlyingtokens:\namount0", amount0, "\namount1", amount1);
     return [amount0, amount1];
   }, [lpAmount]);
 
diff --git a/src/components/Library/SelectChain.tsx b/src/components/Library/SelectChain.tsx
index 4250e24..a5004d4 100644
--- a/src/components/Library/SelectChain.tsx
+++ b/src/components/Library/SelectChain.tsx
@@ -18,7 +18,7 @@ const SelectChain: FC<Props> = ({ availableChains }) => {
   const [selectedChain, setSelectedChain] = useState(chains[filteredChainId]);
 
   useEffect(() => {
-    console.log({
+    // console.log({
       filteredChainId: filteredChainId,
       selectedChain: selectedChain,
     });
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index 099cab2..606b53b 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -85,7 +85,7 @@ const StakingModal = () => {
   const tokenNames = formatTokenSymbols(farm?.asset.symbol ?? "");
 
   useEffect(() => {
-    console.log("selectedFarm", farm);
+    // console.log("selectedFarm", farm);
   }, [farm]);
 
   // When InputType.Percentage
@@ -133,7 +133,7 @@ const StakingModal = () => {
       .multipliedBy(BigNumber(10).pow(18))
       .decimalPlaces(0, 1)
       .toString();
-    console.log("stakinggaargs", lpBalanceNum, pamt);
+    // console.log("stakinggaargs", lpBalanceNum, pamt);
 
     const amt =
       methodId == 0
@@ -149,14 +149,14 @@ const StakingModal = () => {
             .multipliedBy(BigNumber(10).pow(18))
             .decimalPlaces(0, 1)
             .toString();
-    console.log(
-      "samt",
-      amt,
-      lpBalanceNum,
-      lpTokens,
-      lpBalance,
-      lpBalance?.formatted
-    );
+    // console.log(
+    //   "samt",
+    //   amt,
+    //   lpBalanceNum,
+    //   lpTokens,
+    //   lpBalance,
+    //   lpBalance?.formatted
+    // );
     // : parseUnits(`${parseFloat(lpTokens == "" ? "0" : lpTokens)}`, 18); // amount
     if (farm?.protocol.toLowerCase() == "curve") {
       return [amt];
@@ -183,13 +183,13 @@ const StakingModal = () => {
       tokenPricesMap[
         `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
       ];
-    console.log(
-      "tokenkey",
-      `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
-    );
-    console.log("token", tokenPrice);
+    // console.log(
+    //   "tokenkey",
+    //   `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
+    // );
+    // console.log("token", tokenPrice);
     if (!!tokenPrice && typeof tokenPrice == "number") {
-      console.log("...setting tokenprice", tokenPrice);
+      // console.log("...setting tokenprice", tokenPrice);
       setNativePrice(tokenPrice);
     }
   }, [farm, tokenPricesMap]);
@@ -268,12 +268,12 @@ const StakingModal = () => {
   const handleStaking = async () => {
     try {
       const args = getArgs();
-      console.log("stake args", args);
+      // console.log("stake args", args);
       const txnRes = await staking?.({
         args: args,
       });
       if (!!txnRes) {
-        console.log("txnResult", txnRes);
+        // console.log("txnResult", txnRes);
         setTxnHash(txnRes.hash);
       }
     } catch (error) {
@@ -283,7 +283,7 @@ const StakingModal = () => {
 
   useEffect(() => {
     if (isSuccessStakingTxn) {
-      console.log("staking txn success!");
+      // console.log("staking txn success!");
       // Tracking
       handleStakeEvent({
         userAddress: address!,
@@ -310,7 +310,7 @@ const StakingModal = () => {
         },
       });
       (async () => {
-        console.log("beforeuepos", farm?.chain!, farm?.protocol!);
+        // console.log("beforeuepos", farm?.chain!, farm?.protocol!);
 
         const a = await updateEvmPositions({
           farm: {
@@ -328,7 +328,7 @@ const StakingModal = () => {
           tokenPricesMap,
           lpTokenPricesMap,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
@@ -428,7 +428,7 @@ const StakingModal = () => {
               }
               onClick={async () => {
                 const txn = await approveLpToken?.();
-                console.log("Approve0 Result", txn);
+                // console.log("Approve0 Result", txn);
               }}
             />
           )}
diff --git a/src/components/Library/UnstakingModal/index.tsx b/src/components/Library/UnstakingModal/index.tsx
index 2a534d7..4d20c7a 100644
--- a/src/components/Library/UnstakingModal/index.tsx
+++ b/src/components/Library/UnstakingModal/index.tsx
@@ -126,7 +126,7 @@ const UnstakingModal = () => {
       // .multipliedBy(BigNumber(10).pow(18))
       .decimalPlaces(0, 1)
       .toString();
-    // console.log(
+    // // console.log(
     //   "gaars",
     //   staked,
     //   (staked * parseFloat(percentage == "" ? "0" : percentage)) / 100
@@ -145,7 +145,7 @@ const UnstakingModal = () => {
             .multipliedBy(BigNumber(10).pow(18))
             .decimalPlaces(0, 1)
             .toString();
-    console.log("usargs", amt);
+    // console.log("usargs", amt);
     // : parseUnits(`${parseFloat(lpTokens == "" ? "0" : lpTokens)}`, 18); // amount
     if (farm?.protocol.toLowerCase() == "curve") {
       return [amt];
@@ -172,13 +172,13 @@ const UnstakingModal = () => {
       tokenPricesMap[
         `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
       ];
-    console.log(
-      "tokenkey",
-      `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
-    );
-    console.log("token", tokenPrice);
+    // console.log(
+    //   "tokenkey",
+    //   `${farm?.chain!}-${farm?.protocol!}-${tokenSymbol}-${tokenAddress}`
+    // );
+    // console.log("token", tokenPrice);
     if (!!tokenPrice && typeof tokenPrice == "number") {
-      console.log("...setting tokenprice", tokenPrice);
+      // console.log("...setting tokenprice", tokenPrice);
       setNativePrice(tokenPrice);
     }
   }, [farm, tokenPricesMap]);
@@ -204,20 +204,20 @@ const UnstakingModal = () => {
   });
 
   useEffect(() => {
-    console.log("userInfo", userInfo, "\nargs", {
-      address: farm?.chef as Address,
-      abi: parseAbi(chefAbi),
-      functionName:
-        farm?.protocol == "curve" || farm?.protocol.toLowerCase() == "sirius"
-          ? "balanceOf"
-          : "userInfo",
-      args: farm?.protocol == "curve" ? [address] : [farm?.id, address],
-      enabled: !!farm && !!address,
-    });
+    // console.log("userInfo", userInfo, "\nargs", {
+    // address: farm?.chef as Address,
+    // abi: parseAbi(chefAbi),
+    // functionName:
+    //   farm?.protocol == "curve" || farm?.protocol.toLowerCase() == "sirius"
+    //     ? "balanceOf"
+    //     : "userInfo",
+    // args: farm?.protocol == "curve" ? [address] : [farm?.id, address],
+    // enabled: !!farm && !!address,
+    // });
   }, [userInfo]);
 
   const staked: string = useMemo(() => {
-    console.log("stakeduserInfo", userInfo);
+    // console.log("stakeduserInfo", userInfo);
     if (!userInfo) return "0";
     // if (farm?.protocol == "curve") return Number(userInfo) / 10 ** 18;
     if (farm?.protocol == "curve") return userInfo.toString();
@@ -253,7 +253,7 @@ const UnstakingModal = () => {
   const handleUnstaking = async () => {
     try {
       const args = getArgs();
-      console.log("unstake args", args);
+      // console.log("unstake args", args);
       const txnRes = await unstaking?.({
         args: args,
       });
@@ -267,7 +267,7 @@ const UnstakingModal = () => {
 
   useEffect(() => {
     if (isSuccessUnstakingTxn) {
-      console.log("unstaking txn success!");
+      // console.log("unstaking txn success!");
       // Tracking
       handleUnstakeEvent({
         userAddress: address!,
@@ -294,7 +294,7 @@ const UnstakingModal = () => {
         },
       });
       (async () => {
-        console.log("beforeuepos", farm?.chain!, farm?.protocol!);
+        // console.log("beforeuepos", farm?.chain!, farm?.protocol!);
 
         const a = await updateEvmPositions({
           farm: {
@@ -312,7 +312,7 @@ const UnstakingModal = () => {
           tokenPricesMap,
           lpTokenPricesMap,
         });
-        console.log("npos", a?.name, a?.position);
+        // console.log("npos", a?.name, a?.position);
         const tempPositions = { ...positions };
         tempPositions[a?.name!] = a?.position;
         setPositions((prevState: any) => ({
diff --git a/src/components/Portfolio/index.tsx b/src/components/Portfolio/index.tsx
index 5955757..76259bc 100644
--- a/src/components/Portfolio/index.tsx
+++ b/src/components/Portfolio/index.tsx
@@ -83,7 +83,7 @@ const PortfolioPage = () => {
           !isNaN(position.staked.amountUSD)
         );
       });
-      // console.log("user positions", temp);
+      // // console.log("user positions", temp);
       setUserPositions(temp);
     }
   }, [positions]);
@@ -104,7 +104,7 @@ const PortfolioPage = () => {
 
   useEffect(() => {
     if (!!userPositions) {
-      console.log("upsss", userPositions);
+      // console.log("upsss", userPositions);
       setNetWorth(calcNetWorth(userPositions));
       setTotalUnclaimedRewards(calcTotalUnclaimedRewards(userPositions));
       setTotalUnclaimedRewardsUSD(calcTotalUnclaimedRewardsUSD(userPositions));
diff --git a/src/hooks/useApprovalHooks.ts b/src/hooks/useApprovalHooks.ts
index 2c75c8e..c4cd117 100644
--- a/src/hooks/useApprovalHooks.ts
+++ b/src/hooks/useApprovalHooks.ts
@@ -40,23 +40,23 @@ const useIsApprovedToken = (
   const allowance = BigNumber(allow?.toString() ?? "0", 10)
     // .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
     .decimalPlaces(0, 1);
-  // console.log("allowance bigint", allow);
-  console.log("allowance", allowance.toString());
+  // // console.log("allowance bigint", allow);
+  // console.log("allowance", allowance.toString());
 
-  console.log("rawinput", input);
-  console.log("tokenbalance", tokenBalance);
+  // console.log("rawinput", input);
+  // console.log("tokenbalance", tokenBalance);
 
   const inputAmount = BigNumber(input.toString(), 10)
     .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
     .decimalPlaces(0, 1);
-  console.log("inputAmount", inputAmount.toString());
+  // console.log("inputAmount", inputAmount.toString());
 
   const compare = inputAmount.isLessThanOrEqualTo(allowance);
-  console.log("compare", compare);
+  // console.log("compare", compare);
 
   // const isSuccess = useMemo(() => {
   //   const numdata = Number(data) / 10 ** 12;
-  //   // console.log(
+  //   // // console.log(
   //   //   "token_address",
   //   //   tokenAddress,
   //   //   "\ndata",
@@ -91,7 +91,7 @@ const useApproveToken = (
   tokenBalance: any | undefined
 ) => {
   const { chain } = useNetwork();
-  console.log("token", tokenSymbol, "\ntokenBalance", tokenBalance);
+  // console.log("token", tokenSymbol, "\ntokenBalance", tokenBalance);
   const {
     data,
     isLoading: isLoadingApproveCall,
@@ -111,7 +111,7 @@ const useApproveToken = (
         .toString(),
     ],
     onError: (error) => {
-      console.log(`Error while Approving:`, error);
+      // console.log(`Error while Approving:`, error);
     },
   });
 
diff --git a/src/hooks/useEthersGas.ts b/src/hooks/useEthersGas.ts
index 1cedd66..a60ad46 100644
--- a/src/hooks/useEthersGas.ts
+++ b/src/hooks/useEthersGas.ts
@@ -27,14 +27,14 @@
 //   const provider = new ethers.JsonRpcProvider(
 //     process.env.NEXT_PUBLIC_MOONBEAM_URL!
 //   );
-//   console.log("ethers prov", provider);
+//   // console.log("ethers prov", provider);
 //   const currentBlock = await provider.getBlockNumber();
-//   console.log("cbb", currentBlock);
+//   // console.log("cbb", currentBlock);
 //   const timestamp = (await provider.getBlock(currentBlock))!.timestamp;
-//   console.log("currentblocktimestamp", timestamp, timestamp * 1000);
+//   // console.log("currentblocktimestamp", timestamp, timestamp * 1000);
 //   // Query the blockchain (replace example parameters)
 //   const gp = (await provider.getFeeData()).gasPrice;
-//   console.log("gpis", gp);
+//   // console.log("gpis", gp);
 
 //   const estGas = await provider.estimateGas({
 //     from: account,
@@ -44,6 +44,6 @@
 //   });
 
 //   // Print the output to console
-//   console.log("estGas", estGas);
+//   // console.log("estGas", estGas);
 //   return 0;
 // }
diff --git a/src/hooks/useGasEstimation.ts b/src/hooks/useGasEstimation.ts
index 8278cae..0198990 100644
--- a/src/hooks/useGasEstimation.ts
+++ b/src/hooks/useGasEstimation.ts
@@ -28,12 +28,12 @@ const estimateGas = async (
   args: Array<any>
 ) => {
   const abi = determineAbi(contractType, farmition);
-  console.log("Estimating gas with parameters:");
-  console.log("Address:", address);
-  console.log("ABI:", abi);
-  console.log("Function Name:", functionName);
-  console.log("Arguments:", args);
-  console.log("Account:", account);
+  // console.log("Estimating gas with parameters:");
+  // console.log("Address:", address);
+  // console.log("ABI:", abi);
+  // console.log("Function Name:", functionName);
+  // console.log("Arguments:", args);
+  // console.log("Account:", account);
 
   try {
     return await publicClient.estimateContractGas({
@@ -116,7 +116,7 @@ const useGasEstimation = (
 
     // Todo: Handle BigInt properly
     const estimate = (gasEstimateAmount * gasPrice) / 10 ** 18;
-    console.log("estimate", estimate);
+    // console.log("estimate", estimate);
 
     return {
       gasEstimate: (gasEstimateAmount * gasPrice) / 10 ** 18,
diff --git a/src/hooks/useMinLPTokens.ts b/src/hooks/useMinLPTokens.ts
index 5cbdbb5..f88a8d8 100644
--- a/src/hooks/useMinLPTokens.ts
+++ b/src/hooks/useMinLPTokens.ts
@@ -31,28 +31,28 @@ const useMinimumLPTokens = (
     if (!totalSupply) return BigInt(0);
     const r0 = ethers.formatUnits(reserve0, d0);
     const r1 = ethers.formatUnits(reserve1, d1);
-    console.log("d0", ethers.parseUnits(r0, d0));
-    console.log("d1", ethers.parseUnits(r1, d1));
-    console.log(
-      "totalsupply lp:",
-      Number(totalSupply),
-      "\namount0:",
-      amount0,
-      "\namount1:",
-      amount1,
-      "\nreserve0:",
-      reserve0,
-      r0,
-      "\nreserve1:",
-      reserve1,
-      r1,
-      "\ndecimals:",
-      d0,
-      d1,
-      "\nbigtt",
-      (amount0 * Number(totalSupply)) / parseFloat(r0),
-      (amount1 * Number(totalSupply)) / parseFloat(r1)
-    );
+    // console.log("d0", ethers.parseUnits(r0, d0));
+    // console.log("d1", ethers.parseUnits(r1, d1));
+    // console.log(
+    //   "totalsupply lp:",
+    //   Number(totalSupply),
+    //   "\namount0:",
+    //   amount0,
+    //   "\namount1:",
+    //   amount1,
+    //   "\nreserve0:",
+    //   reserve0,
+    //   r0,
+    //   "\nreserve1:",
+    //   reserve1,
+    //   r1,
+    //   "\ndecimals:",
+    //   d0,
+    //   d1,
+    //   "\nbigtt",
+    //   (amount0 * Number(totalSupply)) / parseFloat(r0),
+    //   (amount1 * Number(totalSupply)) / parseFloat(r1)
+    // );
 
     const _totalSupply = BigInt(Number(totalSupply));
 
@@ -62,7 +62,7 @@ const useMinimumLPTokens = (
     const value1 = (amount1 * Number(totalSupply)) / parseFloat(r1);
 
     const minLP = value0 < value1 ? value0 : value1;
-    console.log("minLPhere", minLP, value0, value1);
+    // console.log("minLPhere", minLP, value0, value1);
 
     // `slippage` should be a number between 0 & 100.
     return (minLP * (100 - slippage)) / 100;
diff --git a/src/hooks/useMinLPTokensStable.ts b/src/hooks/useMinLPTokensStable.ts
index 8678a46..9f2b3a5 100644
--- a/src/hooks/useMinLPTokensStable.ts
+++ b/src/hooks/useMinLPTokensStable.ts
@@ -16,7 +16,7 @@ const useMinLPTokensStable = (
     args: [amounts, 1],
   });
 
-  // console.log("lpAmount", Number(lpAmount) / 10 ** 18, {
+  // // console.log("lpAmount", Number(lpAmount) / 10 ** 18, {
   //   address: router,
   //   abi: parseAbi(getRouterAbi(protocol, true)),
   //   functionName:
diff --git a/src/hooks/useTokensOrder.ts b/src/hooks/useTokensOrder.ts
index 0e902b7..e5959e2 100644
--- a/src/hooks/useTokensOrder.ts
+++ b/src/hooks/useTokensOrder.ts
@@ -14,7 +14,7 @@ export default function useTokensOrder(farm: FarmType) {
       chainId: chain?.id,
       enabled: !!chain && !!farm,
     });
-    console.log("arthswaptokensSeqArr", tokensSeqArr);
+    // console.log("arthswaptokensSeqArr", tokensSeqArr);
     const tokensSeq: UnderlyingAssets[] = [
       tokensSeqArr,
       tokensSeqArr,
diff --git a/src/hooks/useTotalSupply.ts b/src/hooks/useTotalSupply.ts
index 7c050ad..be0c36e 100644
--- a/src/hooks/useTotalSupply.ts
+++ b/src/hooks/useTotalSupply.ts
@@ -9,7 +9,7 @@ const useTotalSupply = (pair: Address, protocol: string) => {
     functionName: "totalSupply",
     enabled: !!pair && !!protocol,
   });
-  // console.log("totalsupply @hook", Number(totalSupply) / 10 ** 18);
+  // // console.log("totalsupply @hook", Number(totalSupply) / 10 ** 18);
   return Number(totalSupply) / 10 ** 18;
 };
 
diff --git a/src/utils/abis/contract-helper-methods.ts b/src/utils/abis/contract-helper-methods.ts
index ad33dd0..9786626 100644
--- a/src/utils/abis/contract-helper-methods.ts
+++ b/src/utils/abis/contract-helper-methods.ts
@@ -19,7 +19,7 @@ import {
 import { Address } from "viem";
 
 export function getChefAbi(protocol: string, chef: string): string[] {
-  // console.log("this -- protocol", protocol, "\nchef", chef);
+  // // console.log("this -- protocol", protocol, "\nchef", chef);
   if (!protocol) return solarbeamChefAbi;
   switch (protocol.toLowerCase()) {
     case "solarbeam":
@@ -141,7 +141,7 @@ export function getClaimRewardsArgs(
   signer: Address,
   lpAddress: Address
 ) {
-  // console.log("this -- farmid", [farmId], typeof farmId);
+  // // console.log("this -- farmid", [farmId], typeof farmId);
   switch (protocol.toLowerCase()) {
     case "curve":
       return [];
diff --git a/src/utils/farmPageMethods.ts b/src/utils/farmPageMethods.ts
index 9beeaf2..19d5218 100644
--- a/src/utils/farmPageMethods.ts
+++ b/src/utils/farmPageMethods.ts
@@ -21,7 +21,7 @@ export function calcUnclaimedReward(unclaimedRewards: UnclaimedRewardType[]) {
     (acc, current) => acc + current.amount,
     0
   );
-  console.log("ucretr", totalRewards);
+  // console.log("ucretr", totalRewards);
   return totalRewards.toString(); //.toFixed(2);
 }
 
@@ -32,7 +32,7 @@ export function calcUnclaimedRewardUSD(
     (acc, current) => acc + current.amountUSD,
     0
   );
-  console.log("ucretrusd", totalRewards, totalRewards.toFixed(2));
+  // console.log("ucretrusd", totalRewards, totalRewards.toFixed(2));
   return totalRewards.toFixed(2);
 }
 
diff --git a/src/utils/portfolioMethods.ts b/src/utils/portfolioMethods.ts
index 17ace25..e3a1808 100644
--- a/src/utils/portfolioMethods.ts
+++ b/src/utils/portfolioMethods.ts
@@ -4,7 +4,7 @@ export function calcTotalUnclaimedRewards(
   userPositions: PortfolioPositionType[]
 ) {
   return userPositions.reduce((accumulator: number, position) => {
-    console.log("upreduce", accumulator, position.unclaimedRewards);
+    // console.log("upreduce", accumulator, position.unclaimedRewards);
     return (
       accumulator +
       position.unclaimedRewards.reduce((sum: number, reward) => {
@@ -21,7 +21,7 @@ export function calcTotalUnclaimedRewardsUSD(
   userPositions: PortfolioPositionType[]
 ) {
   return userPositions.reduce((accumulator: number, position) => {
-    console.log("upreduce", accumulator, position.unclaimedRewards);
+    // console.log("upreduce", accumulator, position.unclaimedRewards);
     return (
       accumulator +
       position.unclaimedRewards.reduce((sum: number, reward) => {
diff --git a/src/utils/position-utils/evmPositions.ts b/src/utils/position-utils/evmPositions.ts
index 51f8d10..1a4a4b3 100644
--- a/src/utils/position-utils/evmPositions.ts
+++ b/src/utils/position-utils/evmPositions.ts
@@ -43,7 +43,7 @@ export const updateEvmPositions = async ({
   tokenPricesMap,
   lpTokenPricesMap,
 }: any) => {
-  console.log("u-evm-pos farm", farm);
+  // console.log("u-evm-pos farm", farm);
   const chain = farm.chain.toLowerCase();
   const protocol = farm.protocol.toLowerCase();
   let rpcUrl = "";
@@ -64,9 +64,9 @@ export const updateEvmPositions = async ({
     }
     const poolInfo = await chef.poolInfo(ff.id);
     const userInfo = await chef.userInfo(ff.id, address); // EVM address
-    console.log("poolInfo0", Object.keys(poolInfo), Object.values(poolInfo)[0]);
-    console.log("poolInfo", poolInfo);
-    console.log("userInfo stella", userInfo);
+    // console.log("poolInfo0", Object.keys(poolInfo), Object.values(poolInfo)[0]);
+    // console.log("poolInfo", poolInfo);
+    // console.log("userInfo stella", userInfo);
     const stakedLpAmount =
       Number(Object.values(userInfo)[0] as number) / 10 ** 18;
     const rewardDebt = Object.values(userInfo)[1];
@@ -78,12 +78,12 @@ export const updateEvmPositions = async ({
       provider
     );
     const unstakedLpAmount = Number(await lp.balanceOf(address)) / 10 ** 18;
-    console.log(
-      "stakedLpAmount",
-      stakedLpAmount,
-      "unstakedLpAmount",
-      unstakedLpAmount
-    );
+    // console.log(
+    //   "stakedLpAmount",
+    //   stakedLpAmount,
+    //   "unstakedLpAmount",
+    //   unstakedLpAmount
+    // );
 
     const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
 
@@ -106,27 +106,27 @@ export const updateEvmPositions = async ({
       ucrewAmounts = Object.values(pending)[3];
     }
 
-    console.log(
-      "ucrewAddrs",
-      ucrewAddrs,
-      "ucrewSymbols",
-      ucrewSymbols,
-      "ucrewDecimals",
-      ucrewDecimals,
-      "ucrewAmounts",
-      ucrewAmounts
-    );
+    // console.log(
+    //   "ucrewAddrs",
+    //   ucrewAddrs,
+    //   "ucrewSymbols",
+    //   ucrewSymbols,
+    //   "ucrewDecimals",
+    //   ucrewDecimals,
+    //   "ucrewAmounts",
+    //   ucrewAmounts
+    // );
 
     let ucrews: any = [];
     for (let i = 0; i < ucrewAmounts.length; i++) {
-      console.log(
-        "stellaucre",
-        ucrewSymbols[i],
-        ucrewAmounts[i],
-        tokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-        ]
-      );
+      // console.log(
+      //   "stellaucre",
+      //   ucrewSymbols[i],
+      //   ucrewAmounts[i],
+      //   tokenPricesMap[
+      //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+      //   ]
+      // );
       ucrews.push({
         token: ucrewSymbols[i],
         amount: Number(ucrewAmounts[i]) / 10 ** Number(ucrewDecimals[i]),
@@ -138,21 +138,21 @@ export const updateEvmPositions = async ({
       });
     }
 
-    console.log("ucrewsstellaswap", ucrews);
+    // console.log("ucrewsstellaswap", ucrews);
 
     // if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
-    console.log("before creating temp positions obejct:\n", {
-      unstakedAmount: unstakedLpAmount,
-      stakedLpAmount: stakedLpAmount,
-      lpTokenPricesMap: lpTokenPricesMap,
-      lpTokenPrice:
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-      lpSymbol: ff.asset.symbol,
-      chain: chain,
-      protocol: protocol,
-    });
+    // console.log("before creating temp positions obejct:\n", {
+    //   unstakedAmount: unstakedLpAmount,
+    //   stakedLpAmount: stakedLpAmount,
+    //   lpTokenPricesMap: lpTokenPricesMap,
+    //   lpTokenPrice:
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    //   lpSymbol: ff.asset.symbol,
+    //   chain: chain,
+    //   protocol: protocol,
+    // });
 
     const tempPositions = { ...positions };
     const newPosition = {
@@ -185,34 +185,34 @@ export const updateEvmPositions = async ({
     //   ...tempPositions,
     // }));
     // }
-    console.log(
-      "afterstellaswappositions",
-      positions,
-      "key",
-      `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-    );
+    // console.log(
+    //   "afterstellaswappositions",
+    //   positions,
+    //   "key",
+    //   `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    // );
   } else if (protocol == "solarbeam") {
     const ff = farm;
     const chef = new ethers.Contract(ff.chef, solarbeamChefAbi, provider);
-    console.log(
-      "solarbeamff",
-      ff.chain,
-      ff.protocol,
-      ff.chef,
-      ff.id,
-      ff.asset.symbol
-    );
+    // console.log(
+    //   "solarbeamff",
+    //   ff.chain,
+    //   ff.protocol,
+    //   ff.chef,
+    //   ff.id,
+    //   ff.asset.symbol
+    // );
 
     // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
     const poolInfo = await chef.poolInfo(ff.id);
     const userInfo = await chef.userInfo(ff.id, address);
-    console.log(
-      "solarbeampoolInfo0",
-      Object.keys(poolInfo),
-      Object.values(poolInfo)[0]
-    );
-    console.log("solarbeampoolInfo", poolInfo);
-    console.log("solarbeamuserInfo", userInfo);
+    // console.log(
+    //   "solarbeampoolInfo0",
+    //   Object.keys(poolInfo),
+    //   Object.values(poolInfo)[0]
+    // );
+    // console.log("solarbeampoolInfo", poolInfo);
+    // console.log("solarbeamuserInfo", userInfo);
     const stakedLpAmount =
       Number(Object.values(userInfo)[0] as number) / 10 ** 18;
     const rewardDebt = Object.values(userInfo)[1];
@@ -224,12 +224,12 @@ export const updateEvmPositions = async ({
       provider
     );
     const unstakedLpAmount = Number(await lp.balanceOf(address)) / 10 ** 18;
-    console.log(
-      "solarbeamstakedLpAmount",
-      stakedLpAmount,
-      "solarbeamunstakedLpAmount",
-      unstakedLpAmount
-    );
+    // console.log(
+    //   "solarbeamstakedLpAmount",
+    //   stakedLpAmount,
+    //   "solarbeamunstakedLpAmount",
+    //   unstakedLpAmount
+    // );
     const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
     const pendingTokens = await chef.pendingTokens(ff.id, address);
     const ucrewAddrs: any = Object.values(pendingTokens)[0];
@@ -237,27 +237,27 @@ export const updateEvmPositions = async ({
     const ucrewDecimals: any = Object.values(pendingTokens)[2];
     const ucrewAmounts: any = Object.values(pendingTokens)[3];
 
-    console.log(
-      "ucrewAddrs",
-      ucrewAddrs,
-      "ucrewSymbols",
-      ucrewSymbols,
-      "ucrewDecimals",
-      ucrewDecimals,
-      "ucrewAmounts",
-      ucrewAmounts
-    );
+    // console.log(
+    //   "ucrewAddrs",
+    //   ucrewAddrs,
+    //   "ucrewSymbols",
+    //   ucrewSymbols,
+    //   "ucrewDecimals",
+    //   ucrewDecimals,
+    //   "ucrewAmounts",
+    //   ucrewAmounts
+    // );
 
     let ucrews: any = [];
     for (let i = 0; i < ucrewAmounts.length; i++) {
-      console.log(
-        "tokenSymbol",
-        ucrewSymbols[i],
-        "\ntokenPrice",
-        tokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-        ]
-      );
+      // console.log(
+      //   "tokenSymbol",
+      //   ucrewSymbols[i],
+      //   "\ntokenPrice",
+      //   tokenPricesMap[
+      //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+      //   ]
+      // );
       ucrews.push({
         token: ucrewSymbols[i],
         amount: Number(ucrewAmounts[i]) / 10 ** Number(ucrewDecimals[i]),
@@ -269,21 +269,21 @@ export const updateEvmPositions = async ({
       });
     }
 
-    console.log("ucrewssolarbeam", ucrews);
+    // console.log("ucrewssolarbeam", ucrews);
 
     // if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
     const tempPositions = { ...positions };
 
-    console.log("before creating temp positions obejct:\n", {
-      unstakedAmount: unstakedLpAmount,
-      stakedLpAmount: stakedLpAmount,
-      lpTokenPricesMap: lpTokenPricesMap,
-      lpTokenPrice:
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-      lpSymbol: ff.asset.symbol,
-    });
+    // console.log("before creating temp positions obejct:\n", {
+    //   unstakedAmount: unstakedLpAmount,
+    //   stakedLpAmount: stakedLpAmount,
+    //   lpTokenPricesMap: lpTokenPricesMap,
+    //   lpTokenPrice:
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    //   lpSymbol: ff.asset.symbol,
+    // });
 
     const newPosition = {
       unstaked: {
@@ -315,18 +315,18 @@ export const updateEvmPositions = async ({
     //   ...tempPositions,
     // }));
     // }
-    console.log("after solarbeam positions", positions);
+    // console.log("after solarbeam positions", positions);
   } else if (protocol == "zenlink") {
     const ff = farm;
     const chef = new ethers.Contract(ff.chef, zenlinkChefAbi, provider);
-    console.log("ff", ff.chain, ff.protocol, ff.chef, ff.id, ff.asset.symbol);
+    // console.log("ff", ff.chain, ff.protocol, ff.chef, ff.id, ff.asset.symbol);
 
     // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
     const poolInfo = await chef.getPoolInfo(ff.id);
     const userInfo = await chef.getUserInfo(ff.id, address);
-    console.log("poolInfo0", Object.keys(poolInfo), Object.values(poolInfo)[0]);
-    console.log("zlkpoolInfo", poolInfo);
-    console.log(ff.asset.symbol, "zlkuserInfo", userInfo);
+    // console.log("poolInfo0", Object.keys(poolInfo), Object.values(poolInfo)[0]);
+    // console.log("zlkpoolInfo", poolInfo);
+    // console.log(ff.asset.symbol, "zlkuserInfo", userInfo);
     const stakedLpAmount =
       Number(Object.values(userInfo)[0] as number) / 10 ** 18;
     const rewardDebt = Object.values(userInfo)[1];
@@ -338,15 +338,15 @@ export const updateEvmPositions = async ({
       provider
     );
     const unstakedLpAmount = Number(await lp.balanceOf(address)) / 10 ** 18;
-    console.log(
-      "stakedLpAmount",
-      stakedLpAmount,
-      "zlkunstakedLpAmount",
-      unstakedLpAmount
-    );
+    // console.log(
+    //   "stakedLpAmount",
+    //   stakedLpAmount,
+    //   "zlkunstakedLpAmount",
+    //   unstakedLpAmount
+    // );
     const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
     const rewardTokens: any = Object.values(poolInfo)[2];
-    console.log("rewardTokens", rewardTokens);
+    // console.log("rewardTokens", rewardTokens);
     const pendingRewards = await chef.pendingRewards(ff.id, address);
     const rewards: any = Object.values(pendingRewards)[0];
 
@@ -355,14 +355,14 @@ export const updateEvmPositions = async ({
       const tok = new ethers.Contract(rewardTokens[i], lpAbi, provider);
       const sym = await tok.symbol();
       const dec = await tok.decimals();
-      console.log(
-        "sym:",
-        sym,
-        "\ndec:",
-        dec,
-        "\ntoken price:",
-        tokenPricesMap[`${ff.chain}-${ff.protocol}-${sym}-${rewardTokens[i]}`]
-      );
+      // console.log(
+      //   "sym:",
+      //   sym,
+      //   "\ndec:",
+      //   dec,
+      //   "\ntoken price:",
+      //   tokenPricesMap[`${ff.chain}-${ff.protocol}-${sym}-${rewardTokens[i]}`]
+      // );
       ucrews.push({
         token: sym,
         amount: Number(rewards[i]) / 10 ** Number(dec),
@@ -374,7 +374,7 @@ export const updateEvmPositions = async ({
       });
     }
 
-    console.log("ucrewszenlink", ucrews);
+    // console.log("ucrewszenlink", ucrews);
 
     let price =
       lpTokenPricesMap[
@@ -390,28 +390,28 @@ export const updateEvmPositions = async ({
           ? t
           : ""
       );
-      console.log("ttts", ts);
+      // console.log("ttts", ts);
       const as = ts.filter((a) => a != "");
-      console.log("aaas", as);
+      // console.log("aaas", as);
       if (as.length != 0) {
         // tokenPricesMap[`${ff.chain}-${ff.protocol}-ZLK-${}`]
         price = tokenPricesMap[as[0]];
-        console.log("priceee", price);
+        // console.log("priceee", price);
       }
     }
 
     // if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
-    console.log("unstaked and staked amount > 0 -- updating positions...");
-    console.log("before creating temp positions obejct:\n", {
-      unstakedAmount: unstakedLpAmount,
-      stakedLpAmount: stakedLpAmount,
-      lpTokenPricesMap: lpTokenPricesMap,
-      lpTokenPrice:
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-      lpSymbol: ff.asset.symbol,
-    });
+    // console.log("unstaked and staked amount > 0 -- updating positions...");
+    // console.log("before creating temp positions obejct:\n", {
+    //   unstakedAmount: unstakedLpAmount,
+    //   stakedLpAmount: stakedLpAmount,
+    //   lpTokenPricesMap: lpTokenPricesMap,
+    //   lpTokenPrice:
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    //   lpSymbol: ff.asset.symbol,
+    // });
 
     const tempPositions = { ...positions };
     const newPosition = {
@@ -431,32 +431,32 @@ export const updateEvmPositions = async ({
     };
     tempPositions[name] = newPosition;
     return { name: name, position: newPosition };
-    console.log("added position", tempPositions[name]);
+    // console.log("added position", tempPositions[name]);
     // setPositions((prevState: any) => ({
     //   ...prevState,
     //   ...tempPositions,
     // }));
     // }
-    console.log("after zenlink positions", positions);
+    // console.log("after zenlink positions", positions);
   } else if (protocol == "curve") {
     const ff = farm;
     const chef = new ethers.Contract(ff.chef, curveChefAbi, provider);
-    console.log("ff", ff.chain, ff.protocol, ff.chef, ff.id, ff.asset.symbol);
+    // console.log("ff", ff.chain, ff.protocol, ff.chef, ff.id, ff.asset.symbol);
 
     const reward_token = await chef.reward_tokens(0);
-    console.log("reward_token0", reward_token);
+    // console.log("reward_token0", reward_token);
     const claimable_reward = await chef.claimable_reward(address, reward_token);
     const stakedLpAmount = Number(await chef.balanceOf(address)) / 10 ** 18;
     const lp_token = await chef.lp_token();
-    console.log("lp_token", lp_token);
+    // console.log("lp_token", lp_token);
     const lp = new ethers.Contract(lp_token, lpAbi, provider);
     const unstakedLpAmount = Number(await lp.balanceOf(address)) / 10 ** 18;
-    console.log(
-      "stakedLpAmount",
-      stakedLpAmount,
-      "unstakedLpAmount",
-      unstakedLpAmount
-    );
+    // console.log(
+    //   "stakedLpAmount",
+    //   stakedLpAmount,
+    //   "unstakedLpAmount",
+    //   unstakedLpAmount
+    // );
     const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
     const rewardCount: any = await chef.reward_count();
     let ucrews: any = [];
@@ -466,28 +466,28 @@ export const updateEvmPositions = async ({
         address,
         reward_token
       );
-      console.log(
-        `curvereward_token[${i}]: ${reward_token}, claimable_reward: ${claimable_reward}`
-      );
+      // console.log(
+      //   `curvereward_token[${i}]: ${reward_token}, claimable_reward: ${claimable_reward}`
+      // );
       const tok = new ethers.Contract(reward_token, lpAbi, provider);
       const sym = await tok.symbol();
       const dec = await tok.decimals();
-      console.log(
-        "sym",
-        sym,
-        "\ndec",
-        dec,
-        "\ntokenPrice",
-        tokenPricesMap[`${ff.chain}${ff.protocol}-${sym}-${reward_token}`],
-        "\nlpTokenPrice",
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ], // todo: should be reward token symbol
-        "\nsymbol",
-        ff.asset.symbol,
-        "\nreward token",
-        reward_token
-      );
+      // console.log(
+      //   "sym",
+      //   sym,
+      //   "\ndec",
+      //   dec,
+      //   "\ntokenPrice",
+      //   tokenPricesMap[`${ff.chain}${ff.protocol}-${sym}-${reward_token}`],
+      //   "\nlpTokenPrice",
+      //   lpTokenPricesMap[
+      //     `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+      //   ], // todo: should be reward token symbol
+      //   "\nsymbol",
+      //   ff.asset.symbol,
+      //   "\nreward token",
+      //   reward_token
+      // );
 
       // ucrewscurve positions
       ucrews.push({
@@ -499,21 +499,21 @@ export const updateEvmPositions = async ({
       });
     }
 
-    // console.log("ucrewscurve", ucrews);
+    // // console.log("ucrewscurve", ucrews);
 
     // if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
     const tempPositions = { ...positions };
 
-    console.log("before creating temp positions object:\n", {
-      unstakedAmount: unstakedLpAmount,
-      stakedLpAmount: stakedLpAmount,
-      lpTokenPricesMap: lpTokenPricesMap,
-      lpTokenPrice:
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-      lpSymbol: ff.asset.symbol,
-    });
+    // console.log("before creating temp positions object:\n", {
+    //   unstakedAmount: unstakedLpAmount,
+    //   stakedLpAmount: stakedLpAmount,
+    //   lpTokenPricesMap: lpTokenPricesMap,
+    //   lpTokenPrice:
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    //   lpSymbol: ff.asset.symbol,
+    // });
 
     const newPosition = {
       unstaked: {
@@ -549,29 +549,29 @@ export const updateEvmPositions = async ({
     //   ...tempPositions,
     // }));
     // }
-    console.log("after curve positions", positions);
+    // console.log("after curve positions", positions);
   } else if (protocol == "beamswap") {
     const ff = farm;
     const chef = new ethers.Contract(ff.chef, beamswapChefAbi, provider);
-    console.log(
-      "beamswapff",
-      ff.chain,
-      ff.protocol,
-      ff.chef,
-      ff.id,
-      ff.asset.symbol
-    );
+    // console.log(
+    //   "beamswapff",
+    //   ff.chain,
+    //   ff.protocol,
+    //   ff.chef,
+    //   ff.id,
+    //   ff.asset.symbol
+    // );
 
     // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
     const poolInfo = await chef.poolInfo(ff.id);
     const userInfo = await chef.userInfo(ff.id, address);
-    console.log(
-      "beamswapInfo0",
-      Object.keys(poolInfo),
-      Object.values(poolInfo)[0]
-    );
-    console.log("beamswappoolInfo", poolInfo);
-    console.log("beamswapuserInfo", userInfo);
+    // console.log(
+    //   "beamswapInfo0",
+    //   Object.keys(poolInfo),
+    //   Object.values(poolInfo)[0]
+    // );
+    // console.log("beamswappoolInfo", poolInfo);
+    // console.log("beamswapuserInfo", userInfo);
     const stakedLpAmount =
       Number(Object.values(userInfo)[0] as number) / 10 ** 18;
     const rewardDebt = Object.values(userInfo)[1];
@@ -583,12 +583,12 @@ export const updateEvmPositions = async ({
       provider
     );
     const unstakedLpAmount = Number(await lp.balanceOf(address)) / 10 ** 18;
-    console.log(
-      "beamswapstakedLpAmount",
-      stakedLpAmount,
-      "beamswapunstakedLpAmount",
-      unstakedLpAmount
-    );
+    // console.log(
+    //   "beamswapstakedLpAmount",
+    //   stakedLpAmount,
+    //   "beamswapunstakedLpAmount",
+    //   unstakedLpAmount
+    // );
     const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
     const pendingTokens = await chef.pendingTokens(ff.id, address);
     const ucrewAddrs: any = Object.values(pendingTokens)[0];
@@ -596,27 +596,27 @@ export const updateEvmPositions = async ({
     const ucrewDecimals: any = Object.values(pendingTokens)[2];
     const ucrewAmounts: any = Object.values(pendingTokens)[3];
 
-    console.log(
-      "ucrewAddrs",
-      ucrewAddrs,
-      "ucrewSymbols",
-      ucrewSymbols,
-      "ucrewDecimals",
-      ucrewDecimals,
-      "ucrewAmounts",
-      ucrewAmounts
-    );
+    // console.log(
+    //   "ucrewAddrs",
+    //   ucrewAddrs,
+    //   "ucrewSymbols",
+    //   ucrewSymbols,
+    //   "ucrewDecimals",
+    //   ucrewDecimals,
+    //   "ucrewAmounts",
+    //   ucrewAmounts
+    // );
 
     let ucrews: any = [];
     for (let i = 0; i < ucrewAmounts.length; i++) {
-      console.log(
-        "tokenSymbol",
-        ucrewSymbols[i],
-        "\ntokenPrice",
-        tokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-        ]
-      );
+      // console.log(
+      //   "tokenSymbol",
+      //   ucrewSymbols[i],
+      //   "\ntokenPrice",
+      //   tokenPricesMap[
+      //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+      //   ]
+      // );
       ucrews.push({
         token: ucrewSymbols[i],
         amount: Number(ucrewAmounts[i]) / 10 ** Number(ucrewDecimals[i]),
@@ -628,21 +628,21 @@ export const updateEvmPositions = async ({
       });
     }
 
-    console.log("ucrewsbeamswap", ucrews);
+    // console.log("ucrewsbeamswap", ucrews);
 
     // if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
     const tempPositions = { ...positions };
 
-    console.log("before creating temp positions obejct:\n", {
-      unstakedAmount: unstakedLpAmount,
-      stakedLpAmount: stakedLpAmount,
-      lpTokenPricesMap: lpTokenPricesMap,
-      lpTokenPrice:
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-      lpSymbol: ff.asset.symbol,
-    });
+    // console.log("before creating temp positions obejct:\n", {
+    //   unstakedAmount: unstakedLpAmount,
+    //   stakedLpAmount: stakedLpAmount,
+    //   lpTokenPricesMap: lpTokenPricesMap,
+    //   lpTokenPrice:
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    //   lpSymbol: ff.asset.symbol,
+    // });
 
     const newPosition = {
       unstaked: {
@@ -674,29 +674,29 @@ export const updateEvmPositions = async ({
     //   ...tempPositions,
     // }));
     // }
-    console.log("after beamswap positions", positions);
+    // console.log("after beamswap positions", positions);
   } else if (protocol == "solarflare") {
     const ff = farm;
     const chef = new ethers.Contract(ff.chef, solarflareChefAbi, provider);
-    console.log(
-      "solarflareff",
-      ff.chain,
-      ff.protocol,
-      ff.chef,
-      ff.id,
-      ff.asset.symbol
-    );
+    // console.log(
+    //   "solarflareff",
+    //   ff.chain,
+    //   ff.protocol,
+    //   ff.chef,
+    //   ff.id,
+    //   ff.asset.symbol
+    // );
 
     // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
     const poolInfo = await chef.poolInfo(ff.id);
     const userInfo = await chef.userInfo(ff.id, address);
-    console.log(
-      "solarflareInfo0",
-      Object.keys(poolInfo),
-      Object.values(poolInfo)[0]
-    );
-    console.log("solarflarepoolInfo", poolInfo);
-    console.log("solarflareuserInfo", userInfo);
+    // console.log(
+    //   "solarflareInfo0",
+    //   Object.keys(poolInfo),
+    //   Object.values(poolInfo)[0]
+    // );
+    // console.log("solarflarepoolInfo", poolInfo);
+    // console.log("solarflareuserInfo", userInfo);
     const stakedLpAmount =
       Number(Object.values(userInfo)[0] as number) / 10 ** 18;
     const rewardDebt = Object.values(userInfo)[1];
@@ -708,12 +708,12 @@ export const updateEvmPositions = async ({
       provider
     );
     const unstakedLpAmount = Number(await lp.balanceOf(address)) / 10 ** 18;
-    console.log(
-      "solarflarestakedLpAmount",
-      stakedLpAmount,
-      "solarflareunstakedLpAmount",
-      unstakedLpAmount
-    );
+    // console.log(
+    //   "solarflarestakedLpAmount",
+    //   stakedLpAmount,
+    //   "solarflareunstakedLpAmount",
+    //   unstakedLpAmount
+    // );
     const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
     const pendingTokens = await chef.pendingTokens(ff.id, address);
     const ucrewAddrs: any = Object.values(pendingTokens)[0];
@@ -721,27 +721,27 @@ export const updateEvmPositions = async ({
     const ucrewDecimals: any = Object.values(pendingTokens)[2];
     const ucrewAmounts: any = Object.values(pendingTokens)[3];
 
-    console.log(
-      "ucrewAddrs",
-      ucrewAddrs,
-      "ucrewSymbols",
-      ucrewSymbols,
-      "ucrewDecimals",
-      ucrewDecimals,
-      "ucrewAmounts",
-      ucrewAmounts
-    );
+    // console.log(
+    //   "ucrewAddrs",
+    //   ucrewAddrs,
+    //   "ucrewSymbols",
+    //   ucrewSymbols,
+    //   "ucrewDecimals",
+    //   ucrewDecimals,
+    //   "ucrewAmounts",
+    //   ucrewAmounts
+    // );
 
     let ucrews: any = [];
     for (let i = 0; i < ucrewAmounts.length; i++) {
-      console.log(
-        "tokenSymbol",
-        ucrewSymbols[i],
-        "\ntokenPrice",
-        tokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-        ]
-      );
+      // console.log(
+      //   "tokenSymbol",
+      //   ucrewSymbols[i],
+      //   "\ntokenPrice",
+      //   tokenPricesMap[
+      //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+      //   ]
+      // );
       ucrews.push({
         token: ucrewSymbols[i],
         amount: Number(ucrewAmounts[i]) / 10 ** Number(ucrewDecimals[i]),
@@ -753,21 +753,21 @@ export const updateEvmPositions = async ({
       });
     }
 
-    console.log("ucrewssolarflare", ucrews);
+    // console.log("ucrewssolarflare", ucrews);
 
     // if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
     const tempPositions = { ...positions };
 
-    console.log("before creating temp positions obejct:\n", {
-      unstakedAmount: unstakedLpAmount,
-      stakedLpAmount: stakedLpAmount,
-      lpTokenPricesMap: lpTokenPricesMap,
-      lpTokenPrice:
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-      lpSymbol: ff.asset.symbol,
-    });
+    // console.log("before creating temp positions obejct:\n", {
+    //   unstakedAmount: unstakedLpAmount,
+    //   stakedLpAmount: stakedLpAmount,
+    //   lpTokenPricesMap: lpTokenPricesMap,
+    //   lpTokenPrice:
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    //   lpSymbol: ff.asset.symbol,
+    // });
 
     const newPosition = {
       unstaked: {
@@ -799,26 +799,26 @@ export const updateEvmPositions = async ({
     //   ...tempPositions,
     // }));
     // }
-    console.log("after solarflare positions", positions);
+    // console.log("after solarflare positions", positions);
   } else if (protocol == "sushiswap") {
     const ff = farm;
     const chef = new ethers.Contract(ff.chef, sushiChefAbi, provider);
-    console.log(
-      "sushiswapff",
-      ff.chain,
-      ff.protocol,
-      ff.chef,
-      ff.id,
-      ff.asset.symbol
-    );
+    // console.log(
+    //   "sushiswapff",
+    //   ff.chain,
+    //   ff.protocol,
+    //   ff.chef,
+    //   ff.id,
+    //   ff.asset.symbol
+    // );
 
     // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
     const lpToken = await chef.lpToken(ff.id);
     const poolInfo = await chef.poolInfo(ff.id);
     const userInfo = await chef.userInfo(ff.id, address);
-    console.log("sushiswapInfo0", Object.keys(poolInfo), lpToken);
-    console.log("sushiswappoolInfo", poolInfo);
-    console.log("sushiswapuserInfo", userInfo);
+    // console.log("sushiswapInfo0", Object.keys(poolInfo), lpToken);
+    // console.log("sushiswappoolInfo", poolInfo);
+    // console.log("sushiswapuserInfo", userInfo);
     const stakedLpAmount =
       Number(Object.values(userInfo)[0] as number) / 10 ** 18;
     const rewardDebt = Object.values(userInfo)[1];
@@ -826,12 +826,12 @@ export const updateEvmPositions = async ({
     // const nextHarvestUntilTimestamp = Object.values(userInfo)[3];
     const lp = new ethers.Contract(lpToken as string, lpAbi, provider);
     const unstakedLpAmount = Number(await lp.balanceOf(address)) / 10 ** 18;
-    console.log(
-      "sushiswapstakedLpAmount",
-      stakedLpAmount,
-      "sushiswapunstakedLpAmount",
-      unstakedLpAmount
-    );
+    // console.log(
+    //   "sushiswapstakedLpAmount",
+    //   stakedLpAmount,
+    //   "sushiswapunstakedLpAmount",
+    //   unstakedLpAmount
+    // );
 
     const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
 
@@ -846,27 +846,27 @@ export const updateEvmPositions = async ({
     ucrewDecimals = [18];
     ucrewAmounts = [pending];
 
-    console.log(
-      "ucrewAddrs",
-      ucrewAddrs,
-      "ucrewSymbols",
-      ucrewSymbols,
-      "ucrewDecimals",
-      ucrewDecimals,
-      "ucrewAmounts",
-      ucrewAmounts
-    );
+    // console.log(
+    //   "ucrewAddrs",
+    //   ucrewAddrs,
+    //   "ucrewSymbols",
+    //   ucrewSymbols,
+    //   "ucrewDecimals",
+    //   ucrewDecimals,
+    //   "ucrewAmounts",
+    //   ucrewAmounts
+    // );
 
     let ucrews: any = [];
     for (let i = 0; i < ucrewAmounts.length; i++) {
-      console.log(
-        "tokenSymbol",
-        ucrewSymbols[i],
-        "\ntokenPrice",
-        tokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-        ]
-      );
+      // console.log(
+      //   "tokenSymbol",
+      //   ucrewSymbols[i],
+      //   "\ntokenPrice",
+      //   tokenPricesMap[
+      //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+      //   ]
+      // );
       ucrews.push({
         token: ucrewSymbols[i],
         amount: Number(ucrewAmounts[i]) / 10 ** Number(ucrewDecimals[i]),
@@ -878,21 +878,21 @@ export const updateEvmPositions = async ({
       });
     }
 
-    console.log("ucrewssushiswap", ucrews);
+    // console.log("ucrewssushiswap", ucrews);
 
     // if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
     const tempPositions = { ...positions };
 
-    console.log("before creating temp positions obejct:\n", {
-      unstakedAmount: unstakedLpAmount,
-      stakedLpAmount: stakedLpAmount,
-      lpTokenPricesMap: lpTokenPricesMap,
-      lpTokenPrice:
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-      lpSymbol: ff.asset.symbol,
-    });
+    // console.log("before creating temp positions obejct:\n", {
+    //   unstakedAmount: unstakedLpAmount,
+    //   stakedLpAmount: stakedLpAmount,
+    //   lpTokenPricesMap: lpTokenPricesMap,
+    //   lpTokenPrice:
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    //   lpSymbol: ff.asset.symbol,
+    // });
 
     const newPosition = {
       unstaked: {
@@ -924,32 +924,32 @@ export const updateEvmPositions = async ({
     //   ...tempPositions,
     // }));
     // }
-    console.log("after sushiswap positions", positions);
+    // console.log("after sushiswap positions", positions);
   } else if (protocol == "arthswap") {
     const ff = farm;
     const chef = new ethers.Contract(ff.chef, arthswapChefAbi, provider);
-    console.log(
-      "arthswapff",
-      ff.chain,
-      ff.protocol,
-      ff.chef,
-      ff.id,
-      ff.asset.symbol
-    );
+    // console.log(
+    //   "arthswapff",
+    //   ff.chain,
+    //   ff.protocol,
+    //   ff.chef,
+    //   ff.id,
+    //   ff.asset.symbol
+    // );
 
     // const lpa = new ethers.Contract(
     //   ff.asset.address,
     //   lpAbi,
     //   provider
     // );
-    // console.log("artlpa", await lpa.balanceOf(address));
+    // // console.log("artlpa", await lpa.balanceOf(address));
     // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
     // const lpToken = await chef.lpTokens(ff.id);
     const poolInfo = await chef.poolInfos(ff.id);
     const userInfo = await chef.userInfos(ff.id, address);
-    // console.log("arthswapInfo0", Object.keys(poolInfo));
-    console.log("arthswappoolInfo", poolInfo);
-    console.log("arthswapuserInfo", userInfo);
+    // // console.log("arthswapInfo0", Object.keys(poolInfo));
+    // console.log("arthswappoolInfo", poolInfo);
+    // console.log("arthswapuserInfo", userInfo);
     const stakedLpAmount =
       Number(Object.values(userInfo)[0] as number) / 10 ** 18;
     const rewardDebt = Object.values(userInfo)[1];
@@ -957,12 +957,12 @@ export const updateEvmPositions = async ({
     // const nextHarvestUntilTimestamp = Object.values(userInfo)[3];
     const lp = new ethers.Contract(ff.asset.address, lpAbi, provider);
     const unstakedLpAmount = Number(await lp.balanceOf(address)) / 10 ** 18;
-    console.log(
-      "arthswapstakedLpAmount",
-      stakedLpAmount,
-      "arthswapunstakedLpAmount",
-      unstakedLpAmount
-    );
+    // console.log(
+    //   "arthswapstakedLpAmount",
+    //   stakedLpAmount,
+    //   "arthswapunstakedLpAmount",
+    //   unstakedLpAmount
+    // );
 
     const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
 
@@ -977,27 +977,27 @@ export const updateEvmPositions = async ({
     ucrewDecimals = [18];
     ucrewAmounts = [pending];
 
-    console.log(
-      "ucrewAddrs",
-      ucrewAddrs,
-      "ucrewSymbols",
-      ucrewSymbols,
-      "ucrewDecimals",
-      ucrewDecimals,
-      "ucrewAmounts",
-      ucrewAmounts
-    );
+    // console.log(
+    //   "ucrewAddrs",
+    //   ucrewAddrs,
+    //   "ucrewSymbols",
+    //   ucrewSymbols,
+    //   "ucrewDecimals",
+    //   ucrewDecimals,
+    //   "ucrewAmounts",
+    //   ucrewAmounts
+    // );
 
     let ucrews: any = [];
     for (let i = 0; i < ucrewAmounts.length; i++) {
-      console.log(
-        "tokenSymbol",
-        ucrewSymbols[i],
-        "\ntokenPrice",
-        tokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-        ]
-      );
+      // console.log(
+      //   "tokenSymbol",
+      //   ucrewSymbols[i],
+      //   "\ntokenPrice",
+      //   tokenPricesMap[
+      //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+      //   ]
+      // );
       ucrews.push({
         token: ucrewSymbols[i],
         amount: Number(ucrewAmounts[i]) / 10 ** Number(ucrewDecimals[i]),
@@ -1009,26 +1009,26 @@ export const updateEvmPositions = async ({
       });
     }
 
-    console.log("ucrewsarthswap", ucrews);
+    // console.log("ucrewsarthswap", ucrews);
 
     // if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
     const tempPositions = { ...positions };
 
-    console.log("arthbefore creating temp positions obejct:\n", {
-      unstakedAmount: unstakedLpAmount,
-      stakedLpAmount: stakedLpAmount,
-      lpTokenPricesMap: lpTokenPricesMap,
-      lpTokenPrice:
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-      lpSymbol: ff.asset.symbol,
-      hmm:
-        unstakedLpAmount *
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-    });
+    // console.log("arthbefore creating temp positions obejct:\n", {
+    //   unstakedAmount: unstakedLpAmount,
+    //   stakedLpAmount: stakedLpAmount,
+    //   lpTokenPricesMap: lpTokenPricesMap,
+    //   lpTokenPrice:
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    //   lpSymbol: ff.asset.symbol,
+    //   hmm:
+    //     unstakedLpAmount *
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    // });
 
     const newPosition = {
       unstaked: {
@@ -1060,33 +1060,33 @@ export const updateEvmPositions = async ({
     //   ...tempPositions,
     // }));
     // }
-    console.log("after arthswap positions", positions);
+    // console.log("after arthswap positions", positions);
   } else if (protocol == "sirius") {
     const ff = farm;
     let chef = new ethers.Contract(ff.chef, siriusChefAbi, provider);
-    console.log(
-      "ffsirius",
-      ff.chain,
-      ff.protocol,
-      ff.chef,
-      ff.id,
-      ff.asset.symbol
-    );
+    // console.log(
+    //   "ffsirius",
+    //   ff.chain,
+    //   ff.protocol,
+    //   ff.chef,
+    //   ff.id,
+    //   ff.asset.symbol
+    // );
 
     const reward_token = await chef.rewardTokens(0);
-    console.log("reward_token0", reward_token);
+    // console.log("reward_token0", reward_token);
     const claimable_reward = await chef.claimableReward(address, reward_token);
     const stakedLpAmount = Number(await chef.balanceOf(address)) / 10 ** 18;
     const lp_token = await chef.lpToken();
-    console.log("siriuslp_token", lp_token);
+    // console.log("siriuslp_token", lp_token);
     const lp = new ethers.Contract(lp_token, lpAbi, provider);
     const unstakedLpAmount = Number(await lp.balanceOf(address)) / 10 ** 18;
-    console.log(
-      "stakedLpAmount",
-      stakedLpAmount,
-      "unstakedLpAmount",
-      unstakedLpAmount
-    );
+    // console.log(
+    //   "stakedLpAmount",
+    //   stakedLpAmount,
+    //   "unstakedLpAmount",
+    //   unstakedLpAmount
+    // );
     const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
     const rewardCount: any = await chef.rewardCount();
     let ucrews: any = [];
@@ -1096,28 +1096,28 @@ export const updateEvmPositions = async ({
         address,
         reward_token
       );
-      console.log(
-        `sirreward_token[${i}]: ${reward_token}, claimable_reward: ${claimable_reward}`
-      );
+      // console.log(
+      //   `sirreward_token[${i}]: ${reward_token}, claimable_reward: ${claimable_reward}`
+      // );
       const tok = new ethers.Contract(reward_token, lpAbi, provider);
       const sym = await tok.symbol();
       const dec = await tok.decimals();
-      console.log(
-        "sym",
-        sym,
-        "\ndec",
-        dec,
-        "\nsirtokenPrice",
-        tokenPricesMap[`${ff.chain}-${ff.protocol}-${sym}-${reward_token}`],
-        "\nlpTokenPrice",
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ], // todo: should be reward token symbol
-        "\nsymbol",
-        ff.asset.symbol,
-        "\nreward token",
-        reward_token
-      );
+      // console.log(
+      //   "sym",
+      //   sym,
+      //   "\ndec",
+      //   dec,
+      //   "\nsirtokenPrice",
+      //   tokenPricesMap[`${ff.chain}-${ff.protocol}-${sym}-${reward_token}`],
+      //   "\nlpTokenPrice",
+      //   lpTokenPricesMap[
+      //     `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+      //   ], // todo: should be reward token symbol
+      //   "\nsymbol",
+      //   ff.asset.symbol,
+      //   "\nreward token",
+      //   reward_token
+      // );
 
       // ucrewscurve positions
       ucrews.push({
@@ -1129,21 +1129,21 @@ export const updateEvmPositions = async ({
       });
     }
 
-    // console.log("ucrewscurve", ucrews);
+    // // console.log("ucrewscurve", ucrews);
 
     // if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
     const tempPositions = { ...positions };
 
-    console.log("before creating temp positions object:\n", {
-      unstakedAmount: unstakedLpAmount,
-      stakedLpAmount: stakedLpAmount,
-      lpTokenPricesMap: lpTokenPricesMap,
-      lpTokenPrice:
-        lpTokenPricesMap[
-          `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-        ],
-      lpSymbol: ff.asset.symbol,
-    });
+    // console.log("before creating temp positions object:\n", {
+    //   unstakedAmount: unstakedLpAmount,
+    //   stakedLpAmount: stakedLpAmount,
+    //   lpTokenPricesMap: lpTokenPricesMap,
+    //   lpTokenPrice:
+    //     lpTokenPricesMap[
+    //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+    //     ],
+    //   lpSymbol: ff.asset.symbol,
+    // });
 
     const newPosition = {
       unstaked: {
@@ -1178,7 +1178,7 @@ export const updateEvmPositions = async ({
     //   ...tempPositions,
     // }));
     // }
-    console.log("after curve positions", positions);
+    // console.log("after curve positions", positions);
   }
 };
 
@@ -1242,16 +1242,16 @@ export const fetchEvmPositions = async ({
           f.chef == protocol.chef
         );
       });
-      console.log(
-        "protocol:",
-        protocol.name,
-        "\nchain:",
-        chain.name,
-        "\nchef:",
-        protocol.chef
-      );
-
-      console.log("process start...");
+      // console.log(
+      //   "protocol:",
+      //   protocol.name,
+      //   "\nchain:",
+      //   chain.name,
+      //   "\nchef:",
+      //   protocol.chef
+      // );
+
+      // console.log("process start...");
       if (protocol.name == "stellaswap") {
         let chef = new ethers.Contract(
           protocol.chef,
@@ -1278,13 +1278,13 @@ export const fetchEvmPositions = async ({
           }) => {
             const poolInfo = await chef.poolInfo(ff.id);
             const userInfo = await chef.userInfo(ff.id, address); // EVM address
-            console.log(
-              "poolInfo0",
-              Object.keys(poolInfo),
-              Object.values(poolInfo)[0]
-            );
-            console.log("poolInfo", poolInfo);
-            console.log("userInfo stella", userInfo);
+            // console.log(
+            //   "poolInfo0",
+            //   Object.keys(poolInfo),
+            //   Object.values(poolInfo)[0]
+            // );
+            // console.log("poolInfo", poolInfo);
+            // console.log("userInfo stella", userInfo);
             const stakedLpAmount =
               Number(Object.values(userInfo)[0] as number) / 10 ** 18;
             const rewardDebt = Object.values(userInfo)[1];
@@ -1297,12 +1297,12 @@ export const fetchEvmPositions = async ({
             );
             const unstakedLpAmount =
               Number(await lp.balanceOf(address)) / 10 ** 18;
-            console.log(
-              "stakedLpAmount",
-              stakedLpAmount,
-              "unstakedLpAmount",
-              unstakedLpAmount
-            );
+            // console.log(
+            //   "stakedLpAmount",
+            //   stakedLpAmount,
+            //   "unstakedLpAmount",
+            //   unstakedLpAmount
+            // );
 
             const name = `${ff.chain}-${ff.protocol}-${protocol.chef}-${ff.id}-${ff.asset.symbol}`;
 
@@ -1325,27 +1325,27 @@ export const fetchEvmPositions = async ({
               ucrewAmounts = Object.values(pending)[3];
             }
 
-            console.log(
-              "ucrewAddrs",
-              ucrewAddrs,
-              "ucrewSymbols",
-              ucrewSymbols,
-              "ucrewDecimals",
-              ucrewDecimals,
-              "ucrewAmounts",
-              ucrewAmounts
-            );
+            // console.log(
+            //   "ucrewAddrs",
+            //   ucrewAddrs,
+            //   "ucrewSymbols",
+            //   ucrewSymbols,
+            //   "ucrewDecimals",
+            //   ucrewDecimals,
+            //   "ucrewAmounts",
+            //   ucrewAmounts
+            // );
 
             let ucrews: any = [];
             for (let i = 0; i < ucrewAmounts.length; i++) {
-              console.log(
-                "stellaucre",
-                ucrewSymbols[i],
-                ucrewAmounts[i],
-                tokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-                ]
-              );
+              // console.log(
+              //   "stellaucre",
+              //   ucrewSymbols[i],
+              //   ucrewAmounts[i],
+              //   tokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+              //   ]
+              // );
               ucrews.push({
                 token: ucrewSymbols[i],
                 amount:
@@ -1358,21 +1358,21 @@ export const fetchEvmPositions = async ({
               });
             }
 
-            console.log("ucrewsstellaswap", ucrews);
+            // console.log("ucrewsstellaswap", ucrews);
 
             if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
-              console.log("before creating temp positions obejct:\n", {
-                unstakedAmount: unstakedLpAmount,
-                stakedLpAmount: stakedLpAmount,
-                lpTokenPricesMap: lpTokenPricesMap,
-                lpTokenPrice:
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-                lpSymbol: ff.asset.symbol,
-                chain: chain.name,
-                protocol: protocol.name,
-              });
+              // console.log("before creating temp positions obejct:\n", {
+              //   unstakedAmount: unstakedLpAmount,
+              //   stakedLpAmount: stakedLpAmount,
+              //   lpTokenPricesMap: lpTokenPricesMap,
+              //   lpTokenPrice:
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              //   lpSymbol: ff.asset.symbol,
+              //   chain: chain.name,
+              //   protocol: protocol.name,
+              // });
 
               const tempPositions = { ...positions };
               tempPositions[name] = {
@@ -1403,12 +1403,12 @@ export const fetchEvmPositions = async ({
                 ...tempPositions,
               }));
             }
-            console.log(
-              "afterstellaswappositions",
-              positions,
-              "key",
-              `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-            );
+            // console.log(
+            //   "afterstellaswappositions",
+            //   positions,
+            //   "key",
+            //   `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+            // );
           }
         );
         allPromises.push(...stella);
@@ -1430,25 +1430,25 @@ export const fetchEvmPositions = async ({
             tvl: number;
             farmType: string;
           }) => {
-            console.log(
-              "solarbeamff",
-              ff.chain,
-              ff.protocol,
-              ff.chef,
-              ff.id,
-              ff.asset.symbol
-            );
+            // console.log(
+            //   "solarbeamff",
+            //   ff.chain,
+            //   ff.protocol,
+            //   ff.chef,
+            //   ff.id,
+            //   ff.asset.symbol
+            // );
 
             // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
             const poolInfo = await chef.poolInfo(ff.id);
             const userInfo = await chef.userInfo(ff.id, address);
-            console.log(
-              "solarbeampoolInfo0",
-              Object.keys(poolInfo),
-              Object.values(poolInfo)[0]
-            );
-            console.log("solarbeampoolInfo", poolInfo);
-            console.log("solarbeamuserInfo", userInfo);
+            // console.log(
+            //   "solarbeampoolInfo0",
+            //   Object.keys(poolInfo),
+            //   Object.values(poolInfo)[0]
+            // );
+            // console.log("solarbeampoolInfo", poolInfo);
+            // console.log("solarbeamuserInfo", userInfo);
             const stakedLpAmount =
               Number(Object.values(userInfo)[0] as number) / 10 ** 18;
             const rewardDebt = Object.values(userInfo)[1];
@@ -1461,12 +1461,12 @@ export const fetchEvmPositions = async ({
             );
             const unstakedLpAmount =
               Number(await lp.balanceOf(address)) / 10 ** 18;
-            console.log(
-              "solarbeamstakedLpAmount",
-              stakedLpAmount,
-              "solarbeamunstakedLpAmount",
-              unstakedLpAmount
-            );
+            // console.log(
+            //   "solarbeamstakedLpAmount",
+            //   stakedLpAmount,
+            //   "solarbeamunstakedLpAmount",
+            //   unstakedLpAmount
+            // );
             const name = `${ff.chain}-${ff.protocol}-${protocol.chef}-${ff.id}-${ff.asset.symbol}`;
             const pendingTokens = await chef.pendingTokens(ff.id, address);
             const ucrewAddrs: any = Object.values(pendingTokens)[0];
@@ -1474,27 +1474,27 @@ export const fetchEvmPositions = async ({
             const ucrewDecimals: any = Object.values(pendingTokens)[2];
             const ucrewAmounts: any = Object.values(pendingTokens)[3];
 
-            console.log(
-              "ucrewAddrs",
-              ucrewAddrs,
-              "ucrewSymbols",
-              ucrewSymbols,
-              "ucrewDecimals",
-              ucrewDecimals,
-              "ucrewAmounts",
-              ucrewAmounts
-            );
+            // console.log(
+            //   "ucrewAddrs",
+            //   ucrewAddrs,
+            //   "ucrewSymbols",
+            //   ucrewSymbols,
+            //   "ucrewDecimals",
+            //   ucrewDecimals,
+            //   "ucrewAmounts",
+            //   ucrewAmounts
+            // );
 
             let ucrews: any = [];
             for (let i = 0; i < ucrewAmounts.length; i++) {
-              console.log(
-                "tokenSymbol",
-                ucrewSymbols[i],
-                "\ntokenPrice",
-                tokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-                ]
-              );
+              // console.log(
+              //   "tokenSymbol",
+              //   ucrewSymbols[i],
+              //   "\ntokenPrice",
+              //   tokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+              //   ]
+              // );
               ucrews.push({
                 token: ucrewSymbols[i],
                 amount:
@@ -1507,21 +1507,21 @@ export const fetchEvmPositions = async ({
               });
             }
 
-            console.log("ucrewssolarbeam", ucrews);
+            // console.log("ucrewssolarbeam", ucrews);
 
             if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
               const tempPositions = { ...positions };
 
-              console.log("before creating temp positions obejct:\n", {
-                unstakedAmount: unstakedLpAmount,
-                stakedLpAmount: stakedLpAmount,
-                lpTokenPricesMap: lpTokenPricesMap,
-                lpTokenPrice:
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-                lpSymbol: ff.asset.symbol,
-              });
+              // console.log("before creating temp positions obejct:\n", {
+              //   unstakedAmount: unstakedLpAmount,
+              //   stakedLpAmount: stakedLpAmount,
+              //   lpTokenPricesMap: lpTokenPricesMap,
+              //   lpTokenPrice:
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              //   lpSymbol: ff.asset.symbol,
+              // });
 
               tempPositions[name] = {
                 unstaked: {
@@ -1551,7 +1551,7 @@ export const fetchEvmPositions = async ({
                 ...tempPositions,
               }));
             }
-            console.log("after solarbeam positions", positions);
+            // console.log("after solarbeam positions", positions);
           }
         );
         allPromises.push(...solar);
@@ -1573,25 +1573,25 @@ export const fetchEvmPositions = async ({
             tvl: number;
             farmType: string;
           }) => {
-            console.log(
-              "ff",
-              ff.chain,
-              ff.protocol,
-              ff.chef,
-              ff.id,
-              ff.asset.symbol
-            );
+            // console.log(
+            //   "ff",
+            //   ff.chain,
+            //   ff.protocol,
+            //   ff.chef,
+            //   ff.id,
+            //   ff.asset.symbol
+            // );
 
             // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
             const poolInfo = await chef.getPoolInfo(ff.id);
             const userInfo = await chef.getUserInfo(ff.id, address);
-            console.log(
-              "poolInfo0",
-              Object.keys(poolInfo),
-              Object.values(poolInfo)[0]
-            );
-            console.log("zlkpoolInfo", poolInfo);
-            console.log(ff.asset.symbol, "zlkuserInfo", userInfo);
+            // console.log(
+            //   "poolInfo0",
+            //   Object.keys(poolInfo),
+            //   Object.values(poolInfo)[0]
+            // );
+            // console.log("zlkpoolInfo", poolInfo);
+            // console.log(ff.asset.symbol, "zlkuserInfo", userInfo);
             const stakedLpAmount =
               Number(Object.values(userInfo)[0] as number) / 10 ** 18;
             const rewardDebt = Object.values(userInfo)[1];
@@ -1604,15 +1604,15 @@ export const fetchEvmPositions = async ({
             );
             const unstakedLpAmount =
               Number(await lp.balanceOf(address)) / 10 ** 18;
-            console.log(
-              "stakedLpAmount",
-              stakedLpAmount,
-              "zlkunstakedLpAmount",
-              unstakedLpAmount
-            );
+            // console.log(
+            //   "stakedLpAmount",
+            //   stakedLpAmount,
+            //   "zlkunstakedLpAmount",
+            //   unstakedLpAmount
+            // );
             const name = `${ff.chain}-${ff.protocol}-${protocol.chef}-${ff.id}-${ff.asset.symbol}`;
             const rewardTokens: any = Object.values(poolInfo)[2];
-            console.log("rewardTokens", rewardTokens);
+            // console.log("rewardTokens", rewardTokens);
             const pendingRewards = await chef.pendingRewards(ff.id, address);
             const rewards: any = Object.values(pendingRewards)[0];
 
@@ -1621,16 +1621,16 @@ export const fetchEvmPositions = async ({
               const tok = new ethers.Contract(rewardTokens[i], lpAbi, provider);
               const sym = await tok.symbol();
               const dec = await tok.decimals();
-              console.log(
-                "sym:",
-                sym,
-                "\ndec:",
-                dec,
-                "\ntoken price:",
-                tokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${sym}-${rewardTokens[i]}`
-                ]
-              );
+              // console.log(
+              //   "sym:",
+              //   sym,
+              //   "\ndec:",
+              //   dec,
+              //   "\ntoken price:",
+              //   tokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${sym}-${rewardTokens[i]}`
+              //   ]
+              // );
               ucrews.push({
                 token: sym,
                 amount: Number(rewards[i]) / 10 ** Number(dec),
@@ -1642,7 +1642,7 @@ export const fetchEvmPositions = async ({
               });
             }
 
-            console.log("ucrewszenlink", ucrews);
+            // console.log("ucrewszenlink", ucrews);
 
             let price =
               lpTokenPricesMap[
@@ -1658,30 +1658,30 @@ export const fetchEvmPositions = async ({
                   ? t
                   : ""
               );
-              console.log("ttts", ts);
+              // console.log("ttts", ts);
               const as = ts.filter((a) => a != "");
-              console.log("aaas", as);
+              // console.log("aaas", as);
               if (as.length != 0) {
                 // tokenPricesMap[`${ff.chain}-${ff.protocol}-ZLK-${}`]
                 price = tokenPricesMap[as[0]];
-                console.log("priceee", price);
+                // console.log("priceee", price);
               }
             }
 
             if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
-              console.log(
-                "unstaked and staked amount > 0 -- updating positions..."
-              );
-              console.log("before creating temp positions obejct:\n", {
-                unstakedAmount: unstakedLpAmount,
-                stakedLpAmount: stakedLpAmount,
-                lpTokenPricesMap: lpTokenPricesMap,
-                lpTokenPrice:
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-                lpSymbol: ff.asset.symbol,
-              });
+              // console.log(
+              //   "unstaked and staked amount > 0 -- updating positions..."
+              // );
+              // console.log("before creating temp positions obejct:\n", {
+              //   unstakedAmount: unstakedLpAmount,
+              //   stakedLpAmount: stakedLpAmount,
+              //   lpTokenPricesMap: lpTokenPricesMap,
+              //   lpTokenPrice:
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              //   lpSymbol: ff.asset.symbol,
+              // });
 
               const tempPositions = { ...positions };
               tempPositions[name] = {
@@ -1699,13 +1699,13 @@ export const fetchEvmPositions = async ({
                 lpAddress: ff.asset.address,
                 tvl: ff.tvl,
               };
-              console.log("added position", tempPositions[name]);
+              // console.log("added position", tempPositions[name]);
               setPositions((prevState: any) => ({
                 ...prevState,
                 ...tempPositions,
               }));
             }
-            console.log("after zenlink positions", positions);
+            // console.log("after zenlink positions", positions);
           }
         );
         allPromises.push(...zen);
@@ -1723,17 +1723,17 @@ export const fetchEvmPositions = async ({
             tvl: number;
             farmType: string;
           }) => {
-            console.log(
-              "ff",
-              ff.chain,
-              ff.protocol,
-              ff.chef,
-              ff.id,
-              ff.asset.symbol
-            );
+            // console.log(
+            //   "ff",
+            //   ff.chain,
+            //   ff.protocol,
+            //   ff.chef,
+            //   ff.id,
+            //   ff.asset.symbol
+            // );
 
             const reward_token = await chef.reward_tokens(0);
-            console.log("reward_token0", reward_token);
+            // console.log("reward_token0", reward_token);
             const claimable_reward = await chef.claimable_reward(
               address,
               reward_token
@@ -1741,16 +1741,16 @@ export const fetchEvmPositions = async ({
             const stakedLpAmount =
               Number(await chef.balanceOf(address)) / 10 ** 18;
             const lp_token = await chef.lp_token();
-            console.log("lp_token", lp_token);
+            // console.log("lp_token", lp_token);
             const lp = new ethers.Contract(lp_token, lpAbi, provider);
             const unstakedLpAmount =
               Number(await lp.balanceOf(address)) / 10 ** 18;
-            console.log(
-              "stakedLpAmount",
-              stakedLpAmount,
-              "unstakedLpAmount",
-              unstakedLpAmount
-            );
+            // console.log(
+            //   "stakedLpAmount",
+            //   stakedLpAmount,
+            //   "unstakedLpAmount",
+            //   unstakedLpAmount
+            // );
             const name = `${ff.chain}-${ff.protocol}-${protocol.chef}-${ff.id}-${ff.asset.symbol}`;
             const rewardCount: any = await chef.reward_count();
             let ucrews: any = [];
@@ -1760,30 +1760,30 @@ export const fetchEvmPositions = async ({
                 address,
                 reward_token
               );
-              console.log(
-                `curvereward_token[${i}]: ${reward_token}, claimable_reward: ${claimable_reward}`
-              );
+              // console.log(
+              //   `curvereward_token[${i}]: ${reward_token}, claimable_reward: ${claimable_reward}`
+              // );
               const tok = new ethers.Contract(reward_token, lpAbi, provider);
               const sym = await tok.symbol();
               const dec = await tok.decimals();
-              console.log(
-                "sym",
-                sym,
-                "\ndec",
-                dec,
-                "\ntokenPrice",
-                tokenPricesMap[
-                  `${ff.chain}${ff.protocol}-${sym}-${reward_token}`
-                ],
-                "\nlpTokenPrice",
-                lpTokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                ], // todo: should be reward token symbol
-                "\nsymbol",
-                ff.asset.symbol,
-                "\nreward token",
-                reward_token
-              );
+              // console.log(
+              //   "sym",
+              //   sym,
+              //   "\ndec",
+              //   dec,
+              //   "\ntokenPrice",
+              //   tokenPricesMap[
+              //     `${ff.chain}${ff.protocol}-${sym}-${reward_token}`
+              //   ],
+              //   "\nlpTokenPrice",
+              //   lpTokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //   ], // todo: should be reward token symbol
+              //   "\nsymbol",
+              //   ff.asset.symbol,
+              //   "\nreward token",
+              //   reward_token
+              // );
 
               // ucrewscurve positions
               ucrews.push({
@@ -1797,21 +1797,21 @@ export const fetchEvmPositions = async ({
               });
             }
 
-            // console.log("ucrewscurve", ucrews);
+            // // console.log("ucrewscurve", ucrews);
 
             if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
               const tempPositions = { ...positions };
 
-              console.log("before creating temp positions object:\n", {
-                unstakedAmount: unstakedLpAmount,
-                stakedLpAmount: stakedLpAmount,
-                lpTokenPricesMap: lpTokenPricesMap,
-                lpTokenPrice:
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-                lpSymbol: ff.asset.symbol,
-              });
+              // console.log("before creating temp positions object:\n", {
+              //   unstakedAmount: unstakedLpAmount,
+              //   stakedLpAmount: stakedLpAmount,
+              //   lpTokenPricesMap: lpTokenPricesMap,
+              //   lpTokenPrice:
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              //   lpSymbol: ff.asset.symbol,
+              // });
 
               tempPositions[name] = {
                 unstaked: {
@@ -1844,7 +1844,7 @@ export const fetchEvmPositions = async ({
                 ...tempPositions,
               }));
             }
-            console.log("after curve positions", positions);
+            // console.log("after curve positions", positions);
           }
         );
         allPromises.push(...cur);
@@ -1866,25 +1866,25 @@ export const fetchEvmPositions = async ({
             tvl: number;
             farmType: string;
           }) => {
-            console.log(
-              "beamswapff",
-              ff.chain,
-              ff.protocol,
-              ff.chef,
-              ff.id,
-              ff.asset.symbol
-            );
+            // console.log(
+            //   "beamswapff",
+            //   ff.chain,
+            //   ff.protocol,
+            //   ff.chef,
+            //   ff.id,
+            //   ff.asset.symbol
+            // );
 
             // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
             const poolInfo = await chef.poolInfo(ff.id);
             const userInfo = await chef.userInfo(ff.id, address);
-            console.log(
-              "beamswapInfo0",
-              Object.keys(poolInfo),
-              Object.values(poolInfo)[0]
-            );
-            console.log("beamswappoolInfo", poolInfo);
-            console.log("beamswapuserInfo", userInfo);
+            // console.log(
+            //   "beamswapInfo0",
+            //   Object.keys(poolInfo),
+            //   Object.values(poolInfo)[0]
+            // );
+            // console.log("beamswappoolInfo", poolInfo);
+            // console.log("beamswapuserInfo", userInfo);
             const stakedLpAmount =
               Number(Object.values(userInfo)[0] as number) / 10 ** 18;
             const rewardDebt = Object.values(userInfo)[1];
@@ -1897,12 +1897,12 @@ export const fetchEvmPositions = async ({
             );
             const unstakedLpAmount =
               Number(await lp.balanceOf(address)) / 10 ** 18;
-            console.log(
-              "beamswapstakedLpAmount",
-              stakedLpAmount,
-              "beamswapunstakedLpAmount",
-              unstakedLpAmount
-            );
+            // console.log(
+            //   "beamswapstakedLpAmount",
+            //   stakedLpAmount,
+            //   "beamswapunstakedLpAmount",
+            //   unstakedLpAmount
+            // );
             const name = `${ff.chain}-${ff.protocol}-${protocol.chef}-${ff.id}-${ff.asset.symbol}`;
             const pendingTokens = await chef.pendingTokens(ff.id, address);
             const ucrewAddrs: any = Object.values(pendingTokens)[0];
@@ -1910,27 +1910,27 @@ export const fetchEvmPositions = async ({
             const ucrewDecimals: any = Object.values(pendingTokens)[2];
             const ucrewAmounts: any = Object.values(pendingTokens)[3];
 
-            console.log(
-              "ucrewAddrs",
-              ucrewAddrs,
-              "ucrewSymbols",
-              ucrewSymbols,
-              "ucrewDecimals",
-              ucrewDecimals,
-              "ucrewAmounts",
-              ucrewAmounts
-            );
+            // console.log(
+            //   "ucrewAddrs",
+            //   ucrewAddrs,
+            //   "ucrewSymbols",
+            //   ucrewSymbols,
+            //   "ucrewDecimals",
+            //   ucrewDecimals,
+            //   "ucrewAmounts",
+            //   ucrewAmounts
+            // );
 
             let ucrews: any = [];
             for (let i = 0; i < ucrewAmounts.length; i++) {
-              console.log(
-                "tokenSymbol",
-                ucrewSymbols[i],
-                "\ntokenPrice",
-                tokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-                ]
-              );
+              // console.log(
+              //   "tokenSymbol",
+              //   ucrewSymbols[i],
+              //   "\ntokenPrice",
+              //   tokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+              //   ]
+              // );
               ucrews.push({
                 token: ucrewSymbols[i],
                 amount:
@@ -1943,21 +1943,21 @@ export const fetchEvmPositions = async ({
               });
             }
 
-            console.log("ucrewsbeamswap", ucrews);
+            // console.log("ucrewsbeamswap", ucrews);
 
             if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
               const tempPositions = { ...positions };
 
-              console.log("before creating temp positions obejct:\n", {
-                unstakedAmount: unstakedLpAmount,
-                stakedLpAmount: stakedLpAmount,
-                lpTokenPricesMap: lpTokenPricesMap,
-                lpTokenPrice:
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-                lpSymbol: ff.asset.symbol,
-              });
+              // console.log("before creating temp positions obejct:\n", {
+              //   unstakedAmount: unstakedLpAmount,
+              //   stakedLpAmount: stakedLpAmount,
+              //   lpTokenPricesMap: lpTokenPricesMap,
+              //   lpTokenPrice:
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              //   lpSymbol: ff.asset.symbol,
+              // });
 
               tempPositions[name] = {
                 unstaked: {
@@ -1987,7 +1987,7 @@ export const fetchEvmPositions = async ({
                 ...tempPositions,
               }));
             }
-            console.log("after beamswap positions", positions);
+            // console.log("after beamswap positions", positions);
           }
         );
         allPromises.push(...beam);
@@ -2009,25 +2009,25 @@ export const fetchEvmPositions = async ({
             tvl: number;
             farmType: string;
           }) => {
-            console.log(
-              "solarflareff",
-              ff.chain,
-              ff.protocol,
-              ff.chef,
-              ff.id,
-              ff.asset.symbol
-            );
+            // console.log(
+            //   "solarflareff",
+            //   ff.chain,
+            //   ff.protocol,
+            //   ff.chef,
+            //   ff.id,
+            //   ff.asset.symbol
+            // );
 
             // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
             const poolInfo = await chef.poolInfo(ff.id);
             const userInfo = await chef.userInfo(ff.id, address);
-            console.log(
-              "solarflareInfo0",
-              Object.keys(poolInfo),
-              Object.values(poolInfo)[0]
-            );
-            console.log("solarflarepoolInfo", poolInfo);
-            console.log("solarflareuserInfo", userInfo);
+            // console.log(
+            //   "solarflareInfo0",
+            //   Object.keys(poolInfo),
+            //   Object.values(poolInfo)[0]
+            // );
+            // console.log("solarflarepoolInfo", poolInfo);
+            // console.log("solarflareuserInfo", userInfo);
             const stakedLpAmount =
               Number(Object.values(userInfo)[0] as number) / 10 ** 18;
             const rewardDebt = Object.values(userInfo)[1];
@@ -2040,12 +2040,12 @@ export const fetchEvmPositions = async ({
             );
             const unstakedLpAmount =
               Number(await lp.balanceOf(address)) / 10 ** 18;
-            console.log(
-              "solarflarestakedLpAmount",
-              stakedLpAmount,
-              "solarflareunstakedLpAmount",
-              unstakedLpAmount
-            );
+            // console.log(
+            //   "solarflarestakedLpAmount",
+            //   stakedLpAmount,
+            //   "solarflareunstakedLpAmount",
+            //   unstakedLpAmount
+            // );
             const name = `${ff.chain}-${ff.protocol}-${protocol.chef}-${ff.id}-${ff.asset.symbol}`;
             const pendingTokens = await chef.pendingTokens(ff.id, address);
             const ucrewAddrs: any = Object.values(pendingTokens)[0];
@@ -2053,27 +2053,27 @@ export const fetchEvmPositions = async ({
             const ucrewDecimals: any = Object.values(pendingTokens)[2];
             const ucrewAmounts: any = Object.values(pendingTokens)[3];
 
-            console.log(
-              "ucrewAddrs",
-              ucrewAddrs,
-              "ucrewSymbols",
-              ucrewSymbols,
-              "ucrewDecimals",
-              ucrewDecimals,
-              "ucrewAmounts",
-              ucrewAmounts
-            );
+            // console.log(
+            //   "ucrewAddrs",
+            //   ucrewAddrs,
+            //   "ucrewSymbols",
+            //   ucrewSymbols,
+            //   "ucrewDecimals",
+            //   ucrewDecimals,
+            //   "ucrewAmounts",
+            //   ucrewAmounts
+            // );
 
             let ucrews: any = [];
             for (let i = 0; i < ucrewAmounts.length; i++) {
-              console.log(
-                "tokenSymbol",
-                ucrewSymbols[i],
-                "\ntokenPrice",
-                tokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-                ]
-              );
+              // console.log(
+              //   "tokenSymbol",
+              //   ucrewSymbols[i],
+              //   "\ntokenPrice",
+              //   tokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+              //   ]
+              // );
               ucrews.push({
                 token: ucrewSymbols[i],
                 amount:
@@ -2086,21 +2086,21 @@ export const fetchEvmPositions = async ({
               });
             }
 
-            console.log("ucrewssolarflare", ucrews);
+            // console.log("ucrewssolarflare", ucrews);
 
             if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
               const tempPositions = { ...positions };
 
-              console.log("before creating temp positions obejct:\n", {
-                unstakedAmount: unstakedLpAmount,
-                stakedLpAmount: stakedLpAmount,
-                lpTokenPricesMap: lpTokenPricesMap,
-                lpTokenPrice:
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-                lpSymbol: ff.asset.symbol,
-              });
+              // console.log("before creating temp positions obejct:\n", {
+              //   unstakedAmount: unstakedLpAmount,
+              //   stakedLpAmount: stakedLpAmount,
+              //   lpTokenPricesMap: lpTokenPricesMap,
+              //   lpTokenPrice:
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              //   lpSymbol: ff.asset.symbol,
+              // });
 
               tempPositions[name] = {
                 unstaked: {
@@ -2130,7 +2130,7 @@ export const fetchEvmPositions = async ({
                 ...tempPositions,
               }));
             }
-            console.log("after solarflare positions", positions);
+            // console.log("after solarflare positions", positions);
           }
         );
         allPromises.push(...solarf);
@@ -2148,22 +2148,22 @@ export const fetchEvmPositions = async ({
             tvl: number;
             farmType: string;
           }) => {
-            console.log(
-              "sushiswapff",
-              ff.chain,
-              ff.protocol,
-              ff.chef,
-              ff.id,
-              ff.asset.symbol
-            );
+            // console.log(
+            //   "sushiswapff",
+            //   ff.chain,
+            //   ff.protocol,
+            //   ff.chef,
+            //   ff.id,
+            //   ff.asset.symbol
+            // );
 
             // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
             const lpToken = await chef.lpToken(ff.id);
             const poolInfo = await chef.poolInfo(ff.id);
             const userInfo = await chef.userInfo(ff.id, address);
-            console.log("sushiswapInfo0", Object.keys(poolInfo), lpToken);
-            console.log("sushiswappoolInfo", poolInfo);
-            console.log("sushiswapuserInfo", userInfo);
+            // console.log("sushiswapInfo0", Object.keys(poolInfo), lpToken);
+            // console.log("sushiswappoolInfo", poolInfo);
+            // console.log("sushiswapuserInfo", userInfo);
             const stakedLpAmount =
               Number(Object.values(userInfo)[0] as number) / 10 ** 18;
             const rewardDebt = Object.values(userInfo)[1];
@@ -2172,12 +2172,12 @@ export const fetchEvmPositions = async ({
             const lp = new ethers.Contract(lpToken as string, lpAbi, provider);
             const unstakedLpAmount =
               Number(await lp.balanceOf(address)) / 10 ** 18;
-            console.log(
-              "sushiswapstakedLpAmount",
-              stakedLpAmount,
-              "sushiswapunstakedLpAmount",
-              unstakedLpAmount
-            );
+            // console.log(
+            //   "sushiswapstakedLpAmount",
+            //   stakedLpAmount,
+            //   "sushiswapunstakedLpAmount",
+            //   unstakedLpAmount
+            // );
 
             const name = `${ff.chain}-${ff.protocol}-${protocol.chef}-${ff.id}-${ff.asset.symbol}`;
 
@@ -2192,27 +2192,27 @@ export const fetchEvmPositions = async ({
             ucrewDecimals = [18];
             ucrewAmounts = [pending];
 
-            console.log(
-              "ucrewAddrs",
-              ucrewAddrs,
-              "ucrewSymbols",
-              ucrewSymbols,
-              "ucrewDecimals",
-              ucrewDecimals,
-              "ucrewAmounts",
-              ucrewAmounts
-            );
+            // console.log(
+            //   "ucrewAddrs",
+            //   ucrewAddrs,
+            //   "ucrewSymbols",
+            //   ucrewSymbols,
+            //   "ucrewDecimals",
+            //   ucrewDecimals,
+            //   "ucrewAmounts",
+            //   ucrewAmounts
+            // );
 
             let ucrews: any = [];
             for (let i = 0; i < ucrewAmounts.length; i++) {
-              console.log(
-                "tokenSymbol",
-                ucrewSymbols[i],
-                "\ntokenPrice",
-                tokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-                ]
-              );
+              // console.log(
+              //   "tokenSymbol",
+              //   ucrewSymbols[i],
+              //   "\ntokenPrice",
+              //   tokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+              //   ]
+              // );
               ucrews.push({
                 token: ucrewSymbols[i],
                 amount:
@@ -2225,21 +2225,21 @@ export const fetchEvmPositions = async ({
               });
             }
 
-            console.log("ucrewssushiswap", ucrews);
+            // console.log("ucrewssushiswap", ucrews);
 
             if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
               const tempPositions = { ...positions };
 
-              console.log("before creating temp positions obejct:\n", {
-                unstakedAmount: unstakedLpAmount,
-                stakedLpAmount: stakedLpAmount,
-                lpTokenPricesMap: lpTokenPricesMap,
-                lpTokenPrice:
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-                lpSymbol: ff.asset.symbol,
-              });
+              // console.log("before creating temp positions obejct:\n", {
+              //   unstakedAmount: unstakedLpAmount,
+              //   stakedLpAmount: stakedLpAmount,
+              //   lpTokenPricesMap: lpTokenPricesMap,
+              //   lpTokenPrice:
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              //   lpSymbol: ff.asset.symbol,
+              // });
 
               tempPositions[name] = {
                 unstaked: {
@@ -2269,7 +2269,7 @@ export const fetchEvmPositions = async ({
                 ...tempPositions,
               }));
             }
-            console.log("after sushiswap positions", positions);
+            // console.log("after sushiswap positions", positions);
           }
         );
         allPromises.push(...sushi);
@@ -2291,28 +2291,28 @@ export const fetchEvmPositions = async ({
             tvl: number;
             farmType: string;
           }) => {
-            console.log(
-              "arthswapff",
-              ff.chain,
-              ff.protocol,
-              ff.chef,
-              ff.id,
-              ff.asset.symbol
-            );
+            // console.log(
+            //   "arthswapff",
+            //   ff.chain,
+            //   ff.protocol,
+            //   ff.chef,
+            //   ff.id,
+            //   ff.asset.symbol
+            // );
 
             // const lpa = new ethers.Contract(
             //   ff.asset.address,
             //   lpAbi,
             //   provider
             // );
-            // console.log("artlpa", await lpa.balanceOf(address));
+            // // console.log("artlpa", await lpa.balanceOf(address));
             // const [lpToken, , , , , ,] = await chef.poolInfo(ff.id)
             // const lpToken = await chef.lpTokens(ff.id);
             const poolInfo = await chef.poolInfos(ff.id);
             const userInfo = await chef.userInfos(ff.id, address);
-            // console.log("arthswapInfo0", Object.keys(poolInfo));
-            console.log("arthswappoolInfo", poolInfo);
-            console.log("arthswapuserInfo", userInfo);
+            // // console.log("arthswapInfo0", Object.keys(poolInfo));
+            // console.log("arthswappoolInfo", poolInfo);
+            // console.log("arthswapuserInfo", userInfo);
             const stakedLpAmount =
               Number(Object.values(userInfo)[0] as number) / 10 ** 18;
             const rewardDebt = Object.values(userInfo)[1];
@@ -2321,12 +2321,12 @@ export const fetchEvmPositions = async ({
             const lp = new ethers.Contract(ff.asset.address, lpAbi, provider);
             const unstakedLpAmount =
               Number(await lp.balanceOf(address)) / 10 ** 18;
-            console.log(
-              "arthswapstakedLpAmount",
-              stakedLpAmount,
-              "arthswapunstakedLpAmount",
-              unstakedLpAmount
-            );
+            // console.log(
+            //   "arthswapstakedLpAmount",
+            //   stakedLpAmount,
+            //   "arthswapunstakedLpAmount",
+            //   unstakedLpAmount
+            // );
 
             const name = `${ff.chain}-${ff.protocol}-${protocol.chef}-${ff.id}-${ff.asset.symbol}`;
 
@@ -2341,27 +2341,27 @@ export const fetchEvmPositions = async ({
             ucrewDecimals = [18];
             ucrewAmounts = [pending];
 
-            console.log(
-              "ucrewAddrs",
-              ucrewAddrs,
-              "ucrewSymbols",
-              ucrewSymbols,
-              "ucrewDecimals",
-              ucrewDecimals,
-              "ucrewAmounts",
-              ucrewAmounts
-            );
+            // console.log(
+            //   "ucrewAddrs",
+            //   ucrewAddrs,
+            //   "ucrewSymbols",
+            //   ucrewSymbols,
+            //   "ucrewDecimals",
+            //   ucrewDecimals,
+            //   "ucrewAmounts",
+            //   ucrewAmounts
+            // );
 
             let ucrews: any = [];
             for (let i = 0; i < ucrewAmounts.length; i++) {
-              console.log(
-                "tokenSymbol",
-                ucrewSymbols[i],
-                "\ntokenPrice",
-                tokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
-                ]
-              );
+              // console.log(
+              //   "tokenSymbol",
+              //   ucrewSymbols[i],
+              //   "\ntokenPrice",
+              //   tokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${ucrewSymbols[i]}-${ucrewAddrs[i]}`
+              //   ]
+              // );
               ucrews.push({
                 token: ucrewSymbols[i],
                 amount:
@@ -2374,26 +2374,26 @@ export const fetchEvmPositions = async ({
               });
             }
 
-            console.log("ucrewsarthswap", ucrews);
+            // console.log("ucrewsarthswap", ucrews);
 
             if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
               const tempPositions = { ...positions };
 
-              console.log("arthbefore creating temp positions obejct:\n", {
-                unstakedAmount: unstakedLpAmount,
-                stakedLpAmount: stakedLpAmount,
-                lpTokenPricesMap: lpTokenPricesMap,
-                lpTokenPrice:
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-                lpSymbol: ff.asset.symbol,
-                hmm:
-                  unstakedLpAmount *
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-              });
+              // console.log("arthbefore creating temp positions obejct:\n", {
+              //   unstakedAmount: unstakedLpAmount,
+              //   stakedLpAmount: stakedLpAmount,
+              //   lpTokenPricesMap: lpTokenPricesMap,
+              //   lpTokenPrice:
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              //   lpSymbol: ff.asset.symbol,
+              //   hmm:
+              //     unstakedLpAmount *
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              // });
 
               tempPositions[name] = {
                 unstaked: {
@@ -2423,13 +2423,13 @@ export const fetchEvmPositions = async ({
                 ...tempPositions,
               }));
             }
-            console.log("after arthswap positions", positions);
+            // console.log("after arthswap positions", positions);
           }
         );
         allPromises.push(...arth);
         // });
       } else if (protocol.name.toLowerCase() == "sirius") {
-        console.log("insidesir");
+        // console.log("insidesir");
 
         let chef = new ethers.Contract(protocol.chef, siriusChefAbi, provider);
 
@@ -2443,17 +2443,17 @@ export const fetchEvmPositions = async ({
             tvl: number;
             farmType: string;
           }) => {
-            console.log(
-              "ffsirius",
-              ff.chain,
-              ff.protocol,
-              ff.chef,
-              ff.id,
-              ff.asset.symbol
-            );
+            // console.log(
+            //   "ffsirius",
+            //   ff.chain,
+            //   ff.protocol,
+            //   ff.chef,
+            //   ff.id,
+            //   ff.asset.symbol
+            // );
 
             const reward_token = await chef.rewardTokens(0);
-            console.log("reward_token0", reward_token);
+            // console.log("reward_token0", reward_token);
             const claimable_reward = await chef.claimableReward(
               address,
               reward_token
@@ -2461,16 +2461,16 @@ export const fetchEvmPositions = async ({
             const stakedLpAmount =
               Number(await chef.balanceOf(address)) / 10 ** 18;
             const lp_token = await chef.lpToken();
-            console.log("siriuslp_token", lp_token);
+            // console.log("siriuslp_token", lp_token);
             const lp = new ethers.Contract(lp_token, lpAbi, provider);
             const unstakedLpAmount =
               Number(await lp.balanceOf(address)) / 10 ** 18;
-            console.log(
-              "stakedLpAmount",
-              stakedLpAmount,
-              "unstakedLpAmount",
-              unstakedLpAmount
-            );
+            // console.log(
+            //   "stakedLpAmount",
+            //   stakedLpAmount,
+            //   "unstakedLpAmount",
+            //   unstakedLpAmount
+            // );
             const name = `${ff.chain}-${ff.protocol}-${protocol.chef}-${ff.id}-${ff.asset.symbol}`;
             const rewardCount: any = await chef.rewardCount();
             let ucrews: any = [];
@@ -2480,30 +2480,30 @@ export const fetchEvmPositions = async ({
                 address,
                 reward_token
               );
-              console.log(
-                `sirreward_token[${i}]: ${reward_token}, claimable_reward: ${claimable_reward}`
-              );
+              // console.log(
+              //   `sirreward_token[${i}]: ${reward_token}, claimable_reward: ${claimable_reward}`
+              // );
               const tok = new ethers.Contract(reward_token, lpAbi, provider);
               const sym = await tok.symbol();
               const dec = await tok.decimals();
-              console.log(
-                "sym",
-                sym,
-                "\ndec",
-                dec,
-                "\nsirtokenPrice",
-                tokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${sym}-${reward_token}`
-                ],
-                "\nlpTokenPrice",
-                lpTokenPricesMap[
-                  `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                ], // todo: should be reward token symbol
-                "\nsymbol",
-                ff.asset.symbol,
-                "\nreward token",
-                reward_token
-              );
+              // console.log(
+              //   "sym",
+              //   sym,
+              //   "\ndec",
+              //   dec,
+              //   "\nsirtokenPrice",
+              //   tokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${sym}-${reward_token}`
+              //   ],
+              //   "\nlpTokenPrice",
+              //   lpTokenPricesMap[
+              //     `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //   ], // todo: should be reward token symbol
+              //   "\nsymbol",
+              //   ff.asset.symbol,
+              //   "\nreward token",
+              //   reward_token
+              // );
 
               // ucrewscurve positions
               ucrews.push({
@@ -2517,21 +2517,21 @@ export const fetchEvmPositions = async ({
               });
             }
 
-            // console.log("ucrewscurve", ucrews);
+            // // console.log("ucrewscurve", ucrews);
 
             if (unstakedLpAmount > 0 || stakedLpAmount > 0) {
               const tempPositions = { ...positions };
 
-              console.log("before creating temp positions object:\n", {
-                unstakedAmount: unstakedLpAmount,
-                stakedLpAmount: stakedLpAmount,
-                lpTokenPricesMap: lpTokenPricesMap,
-                lpTokenPrice:
-                  lpTokenPricesMap[
-                    `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
-                  ],
-                lpSymbol: ff.asset.symbol,
-              });
+              // console.log("before creating temp positions object:\n", {
+              //   unstakedAmount: unstakedLpAmount,
+              //   stakedLpAmount: stakedLpAmount,
+              //   lpTokenPricesMap: lpTokenPricesMap,
+              //   lpTokenPrice:
+              //     lpTokenPricesMap[
+              //       `${ff.chain}-${ff.protocol}-${ff.asset.symbol}-${ff.asset.address}`
+              //     ],
+              //   lpSymbol: ff.asset.symbol,
+              // });
 
               tempPositions[name] = {
                 unstaked: {
@@ -2564,7 +2564,7 @@ export const fetchEvmPositions = async ({
                 ...tempPositions,
               }));
             }
-            console.log("after curve positions", positions);
+            // console.log("after curve positions", positions);
           }
         );
         allPromises.push(...sir);
@@ -2574,5 +2574,5 @@ export const fetchEvmPositions = async ({
 
   await Promise.allSettled(allPromises);
   setIsEvmPosLoading(false);
-  console.log("positionsnow", positions);
+  // console.log("positionsnow", positions);
 };
diff --git a/src/utils/position-utils/substratePositions.ts b/src/utils/position-utils/substratePositions.ts
index 8dcd9de..d1a366f 100644
--- a/src/utils/position-utils/substratePositions.ts
+++ b/src/utils/position-utils/substratePositions.ts
@@ -54,7 +54,7 @@ export const updateSubstratePositions = async ({
   //   positions,
   //   setPositions,
   // });
-  console.log("substrate setup initialised");
+  // console.log("substrate setup initialised");
   // setIsSubPosLoading(true);
   // Filter Mangata X Farms
   // const filteredFarms = farms.filter((f: any) => {
@@ -72,23 +72,23 @@ export const updateSubstratePositions = async ({
 
   // const unsubscribe = await mangataApi.rpc.chain.subscribeNewHeads(
   // async (header: any) => {
-  // console.log(`Chain is at block: #${header.number}`);
+  // // console.log(`Chain is at block: #${header.number}`);
 
   let assetsInfo = await mangata.getAssetsInfo();
-  console.log("assetsInfo", assetsInfo);
+  // console.log("assetsInfo", assetsInfo);
   let mangataAsset: any = {};
   const balances = await mangata.getBalances();
-  console.log("mangatabalances", balances);
+  // console.log("mangatabalances", balances);
   for (const key in balances) {
     if (Object.hasOwnProperty.call(balances, key)) {
       const element = balances[key];
-      console.log("element", element, key);
+      // console.log("element", element, key);
       if (assetsInfo[key] !== undefined) {
         const e = // todo: try parseBigInt here instead of parseFloat
           parseFloat(BigInt(element.toString()).toString(10)) /
           10 ** assetsInfo[key]["decimals"];
         mangataAsset[key] = e;
-        console.log("mgeee", element, key, e);
+        // console.log("mgeee", element, key, e);
       }
     }
   }
@@ -125,21 +125,21 @@ export const updateSubstratePositions = async ({
     ff.id
   );
   const tokenPrices = await fetchTokenPricesMangata();
-  console.log("mangatatokenprices", tokenPrices);
+  // console.log("mangatatokenprices", tokenPrices);
 
-  console.log(
-    "Reward Amount ---",
-    Number(rewardsAmount.toString()) / 10 ** 18,
-    (tokenPrices.get("mgx")! * Number(rewardsAmount.toString())) / 10 ** 18,
-    "freeBalis",
-    freeBal,
-    "reservedBalis",
-    reservedBal,
-    "mangataAsset[ff.id]",
-    mangataAsset[ff.id],
-    "ff.tvl",
-    ff.tvl
-  );
+  // console.log(
+  //   "Reward Amount ---",
+  //   Number(rewardsAmount.toString()) / 10 ** 18,
+  //   (tokenPrices.get("mgx")! * Number(rewardsAmount.toString())) / 10 ** 18,
+  //   "freeBalis",
+  //   freeBal,
+  //   "reservedBalis",
+  //   reservedBal,
+  //   "mangataAsset[ff.id]",
+  //   mangataAsset[ff.id],
+  //   "ff.tvl",
+  //   ff.tvl
+  // );
 
   // Position key
   const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
@@ -171,7 +171,7 @@ export const updateSubstratePositions = async ({
   };
   tempPositions[name] = newPosition;
   return { name: name, position: newPosition };
-  console.log(`positions now ---\n`, tempPositions);
+  // console.log(`positions now ---\n`, tempPositions);
   // setPositions((prevState: any) => ({
   //   ...prevState,
   //   ...tempPositions,
@@ -197,7 +197,7 @@ export const fetchSubstratePositions = async ({
     positions,
     setPositions,
   });
-  console.log("substrate setup initialised");
+  // console.log("substrate setup initialised");
   setIsSubPosLoading(true);
   // Filter Mangata X Farms
   const filteredFarms = farms.filter((f: any) => {
@@ -215,10 +215,10 @@ export const fetchSubstratePositions = async ({
 
   // const unsubscribe = await mangataApi.rpc.chain.subscribeNewHeads(
   // async (header: any) => {
-  // console.log(`Chain is at block: #${header.number}`);
+  // // console.log(`Chain is at block: #${header.number}`);
 
   let assetsInfo = await mangata.getAssetsInfo();
-  console.log("assetsInfo", assetsInfo);
+  // console.log("assetsInfo", assetsInfo);
   let mangataAsset: any = {};
   const balances = await mangata.getBalances();
   for (const key in balances) {
@@ -229,7 +229,7 @@ export const fetchSubstratePositions = async ({
           parseFloat(BigInt(element.toString()).toString(10)) /
           10 ** assetsInfo[key]["decimals"];
         mangataAsset[key] = e;
-        // console.log("mgeee", e);
+        // // console.log("mgeee", e);
       }
     }
   }
@@ -264,13 +264,13 @@ export const fetchSubstratePositions = async ({
         ff.id
       );
       const tokenPrices = await fetchTokenPricesMangata();
-      // console.log("MGX price", tokenPrices.get("mgx"));
+      // // console.log("MGX price", tokenPrices.get("mgx"));
 
-      console.log(
-        "Reward Amount ---",
-        Number(rewardsAmount.toString()) / 10 ** 18,
-        (tokenPrices.get("mgx")! * Number(rewardsAmount.toString())) / 10 ** 18
-      );
+      // console.log(
+      //   "Reward Amount ---",
+      //   Number(rewardsAmount.toString()) / 10 ** 18,
+      //   (tokenPrices.get("mgx")! * Number(rewardsAmount.toString())) / 10 ** 18
+      // );
 
       // Position key
       const name = `${ff.chain}-${ff.protocol}-${ff.chef}-${ff.id}-${ff.asset.symbol}`;
@@ -300,7 +300,7 @@ export const fetchSubstratePositions = async ({
           lpAddress: ff.asset.address,
           tvl: ff.tvl,
         };
-        console.log(`positions now ---\n`, tempPositions);
+        // console.log(`positions now ---\n`, tempPositions);
         setPositions((prevState: any) => ({
           ...prevState,
           ...tempPositions,
diff --git a/src/utils/toUnits.ts b/src/utils/toUnits.ts
index 5ff2dcf..62251aa 100644
--- a/src/utils/toUnits.ts
+++ b/src/utils/toUnits.ts
@@ -13,6 +13,6 @@ export default function toUnits(num: number, decimals: number): string {
   } else if (num >= 1000 && num < 1000000) {
     return Number((num / 1000).toFixed(decimals)).toLocaleString("en-US") + "K";
   }
-  // console.log("num", num, typeof num);
+  // // console.log("num", num, typeof num);
   return Number(num.toFixed(decimals)).toLocaleString("en-US");
 }
diff --git a/src/utils/tracking.ts b/src/utils/tracking.ts
index 356e1a3..6af4264 100644
--- a/src/utils/tracking.ts
+++ b/src/utils/tracking.ts
@@ -33,9 +33,9 @@ export async function handleWalletConnectEvent({
       connector,
       getTimestamp()
     );
-    console.log(`connectWalletEvent: ${walletType}`, walletConnectEvent);
+    // console.log(`connectWalletEvent: ${walletType}`, walletConnectEvent);
   } catch (error) {
-    console.log(`Error: CreateWalletEvent ${walletType}`, error);
+    // console.log(`Error: CreateWalletEvent ${walletType}`, error);
   }
 }
 
@@ -58,9 +58,9 @@ export async function handleAddLiquidityEvent({
       underlyingAmounts,
       lpAmount
     );
-    console.log("addLiquidityEvent:", addLiquidityEvent);
+    // console.log("addLiquidityEvent:", addLiquidityEvent);
   } catch (error) {
-    console.log("Error: CreateAddLiquidityEvent ${walletType}", error);
+    // console.log("Error: CreateAddLiquidityEvent ${walletType}", error);
   }
 }
 
@@ -83,9 +83,9 @@ export async function handleRemoveLiquidityEvent({
       underlyingAmounts,
       lpAmount
     );
-    console.log("removeLiquidityEvent:", removeLiquidityEvent);
+    // console.log("removeLiquidityEvent:", removeLiquidityEvent);
   } catch (error) {
-    console.log(`Error: createRemoveLiquidityEvent ${walletType}`, error);
+    // console.log(`Error: createRemoveLiquidityEvent ${walletType}`, error);
   }
 }
 
@@ -106,9 +106,9 @@ export async function handleStakeEvent({
       farm,
       lpAmount
     );
-    console.log("stakeEvent:", stakeEvent);
+    // console.log("stakeEvent:", stakeEvent);
   } catch (error) {
-    console.log(`Error: createStakeEvent ${walletType}`, error);
+    // console.log(`Error: createStakeEvent ${walletType}`, error);
   }
 }
 
@@ -129,9 +129,9 @@ export async function handleUnstakeEvent({
       farm,
       lpAmount
     );
-    console.log("unstakeEvent:", unstakeEvent);
+    // console.log("unstakeEvent:", unstakeEvent);
   } catch (error) {
-    console.log(`Error: createUnstakeEvent ${walletType}`, error);
+    // console.log(`Error: createUnstakeEvent ${walletType}`, error);
   }
 }
 
@@ -152,8 +152,8 @@ export async function handleClaimRewardsEvent({
       farm,
       rewards
     );
-    console.log("claimRewardsEvent:", claimRewardsEvent);
+    // console.log("claimRewardsEvent:", claimRewardsEvent);
   } catch (error) {
-    console.log(`Error: createClaimRewardsEvent ${walletType}`, error);
+    // console.log(`Error: createClaimRewardsEvent ${walletType}`, error);
   }
 }
diff --git a/src/utils/useCalcMinAmount.ts b/src/utils/useCalcMinAmount.ts
index 21f4f8b..a3953e9 100644
--- a/src/utils/useCalcMinAmount.ts
+++ b/src/utils/useCalcMinAmount.ts
@@ -21,7 +21,7 @@ const useCalcMinAmount = (
     enabled: !!farm,
   });
 
-  console.log("ridddd", removalId);
+  // console.log("ridddd", removalId);
 
   const functionNames = useMemo(() => {
     if (farm?.protocol.toLowerCase() == "curve") {
@@ -60,7 +60,7 @@ const useCalcMinAmount = (
       enabled: !!farm && !!lpToken && !!amount,
     });
 
-  console.log("rssminamtdata", minAmountData, amount, tokens);
+  // console.log("rssminamtdata", minAmountData, amount, tokens);
 
   const minAmountBigInt = minAmountData as bigint[];
 
@@ -74,7 +74,7 @@ const useCalcMinAmount = (
         );
       } else {
         return minAmountBigInt.map((amt, index) => {
-          // console.log(
+          // // console.log(
           //   `${tokens[index].symbol} decimals:`,
           //   tokens[index].decimals,
           //   "\nminAmount:",
diff --git a/src/utils/xcm/common/account.js b/src/utils/xcm/common/account.js
index fe6b837..e6e1c11 100644
--- a/src/utils/xcm/common/account.js
+++ b/src/utils/xcm/common/account.js
@@ -110,7 +110,7 @@ class Account {
       });
     }
 
-    console.log(util.inspect(result, { depth: 4, colors: true }));
+    // console.log(util.inspect(result, { depth: 4, colors: true }));
   }
 
   getChainByName(chain) {
diff --git a/src/utils/xcm/common/mangataHelper.js b/src/utils/xcm/common/mangataHelper.js
index b8b06ae..84af7ee 100644
--- a/src/utils/xcm/common/mangataHelper.js
+++ b/src/utils/xcm/common/mangataHelper.js
@@ -37,7 +37,7 @@ class MangataHelper {
     this.assets = _.values(
       _.filter(assetsResp, (asset) => !_.isEmpty(asset.symbol))
     );
-    console.log("Assets on Mangata chain: ", this.assets);
+    // console.log("Assets on Mangata chain: ", this.assets);
   };
 
   getBalances = async () => {
@@ -51,9 +51,9 @@ class MangataHelper {
   };
 
   getTokenIdBySymbol(symbol) {
-    // console.log('getTokenIdBySymbol.symbol', symbol, this.assets);
+    // // console.log('getTokenIdBySymbol.symbol', symbol, this.assets);
     const token = _.find(this.assets, { symbol });
-    // console.log('getTokenIdBySymbol.token', token);
+    // // console.log('getTokenIdBySymbol.token', token);
     return token.id;
   }
 
@@ -99,7 +99,7 @@ class MangataHelper {
         },
       },
     };
-    console.log("currencyId", currencyId, "amount", amount);
+    // console.log("currencyId", currencyId, "amount", amount);
 
     const amt = 4000000000;
     const extrinsic = this.api.tx.xTokens.transfer(
@@ -191,7 +191,7 @@ class MangataHelper {
     const token = _.find(this.assets, { id: tokenId });
     const decimalBN = getDecimalBN(token.decimals);
     const amountBN = new BN(amount, 10).mul(decimalBN);
-    // console.log("albn", amountBN, amountBN.toNumber() ?? -1);
+    // // console.log("albn", amountBN, amountBN.toNumber() ?? -1);
 
     return this.api.tx.xyk.activateLiquidityV2(
       tokenId,
@@ -204,7 +204,7 @@ class MangataHelper {
     const token = _.find(this.assets, { id: tokenId });
     const decimalBN = getDecimalBN(token.decimals);
     const amountBN = new BN(amount, 10).mul(decimalBN);
-    // console.log("albn", amountBN, amountBN.toNumber() ?? -1);
+    // // console.log("albn", amountBN, amountBN.toNumber() ?? -1);
 
     return this.api.tx.proofOfStake.deactivateLiquidity(
       tokenId,
@@ -229,24 +229,24 @@ class MangataHelper {
     const secondToken = _.find(this.assets, { id: secondTokenId });
     const secondDecimalBN = getDecimalBN(secondToken.decimals);
 
-    console.log(
-      "gmlf",
-      firstToken,
-      firstDecimalBN,
-      secondToken,
-      secondDecimalBN,
-      firstTokenAmount,
-      expectedSecondTokenAmount,
-      "pa",
-      pair,
-      firstTokenId,
-      secondTokenId
-    );
+    // console.log(
+    //   "gmlf",
+    //   firstToken,
+    //   firstDecimalBN,
+    //   secondToken,
+    //   secondDecimalBN,
+    //   firstTokenAmount,
+    //   expectedSecondTokenAmount,
+    //   "pa",
+    //   pair,
+    //   firstTokenId,
+    //   secondTokenId
+    // );
 
     // const firstAmount = new BN(firstTokenAmount, 10) * firstDecimalBN;
     // const expectedSecondAmount =
     //   new BN(expectedSecondTokenAmount, 10) * secondDecimalBN;
-    // console.log(
+    // // console.log(
     //   "gmfa",
     //   firstAmount,
     //   expectedSecondAmount,
@@ -255,21 +255,21 @@ class MangataHelper {
     //   firstTokenId,
     //   secondTokenId
     // );
-    console.log(
-      "rounds",
-      new BN(
-        BigInt(
-          Math.round(firstTokenAmount * 10 ** firstToken.decimals)
-        ).toString(10),
-        10
-      ),
-      new BN(
-        BigInt(
-          Math.round(expectedSecondTokenAmount * 10 ** secondToken.decimals)
-        ).toString(10),
-        10
-      )
-    );
+    // console.log(
+    //   "rounds",
+    //   new BN(
+    //     BigInt(
+    //       Math.round(firstTokenAmount * 10 ** firstToken.decimals)
+    //     ).toString(10),
+    //     10
+    //   ),
+    //   new BN(
+    //     BigInt(
+    //       Math.round(expectedSecondTokenAmount * 10 ** secondToken.decimals)
+    //     ).toString(10),
+    //     10
+    //   )
+    // );
 
     const fees = await this.mangata.mintLiquidityFee(
       pair,
@@ -298,7 +298,7 @@ class MangataHelper {
     liquidityAssetAmount,
     percentage
   ) => {
-    console.log("burnliquidityAssetAmount", liquidityAssetAmount);
+    // console.log("burnliquidityAssetAmount", liquidityAssetAmount);
     // const firstToken = _.find(this.assets, { id: firstTokenId });
     // const firstDecimalBN = getDecimalBN(firstToken.decimals);
 
@@ -339,27 +339,27 @@ class MangataHelper {
     //   secondDecimalBN
     // );
 
-    console.log(
-      "lastmile",
-      new BN(
-        BigInt(
-          Math.round(firstTokenAmount * 10 ** firstToken.decimals)
-        ).toString(10),
-        10
-      ),
-      new BN(
-        BigInt(
-          Math.round(expectedSecondTokenAmount * 10 ** secondToken.decimals)
-        ).toString(10),
-        10
-      ),
-      firstTokenId,
-      secondTokenId,
-      // amountBN,
-      // expectedSecondAmountBN,
-      Math.round(firstTokenAmount * 10 ** firstToken.decimals),
-      Math.round(expectedSecondTokenAmount * 10 ** secondToken.decimals)
-    );
+    // console.log(
+    //   "lastmile",
+    //   new BN(
+    //     BigInt(
+    //       Math.round(firstTokenAmount * 10 ** firstToken.decimals)
+    //     ).toString(10),
+    //     10
+    //   ),
+    //   new BN(
+    //     BigInt(
+    //       Math.round(expectedSecondTokenAmount * 10 ** secondToken.decimals)
+    //     ).toString(10),
+    //     10
+    //   ),
+    //   firstTokenId,
+    //   secondTokenId,
+    //   // amountBN,
+    //   // expectedSecondAmountBN,
+    //   Math.round(firstTokenAmount * 10 ** firstToken.decimals),
+    //   Math.round(expectedSecondTokenAmount * 10 ** secondToken.decimals)
+    // );
 
     return this.api.tx.xyk.mintLiquidity(
       firstTokenId,
@@ -484,8 +484,8 @@ class MangataHelper {
     const sellTokenId = this.getTokenIdBySymbol(sellSymbol);
     const buyTokenId = this.getTokenIdBySymbol(buySymbol);
 
-    console.log("selltokenId", sellTokenId);
-    console.log("buytokenId", buyTokenId);
+    // console.log("selltokenId", sellTokenId);
+    // console.log("buytokenId", buyTokenId);
 
     // The last param is the max amount; setting it a very large number for now
     await this.mangata.buyAsset(
@@ -505,7 +505,7 @@ class MangataHelper {
   ) => {
     const soldAssetId = this.getTokenIdBySymbol(sellSymbol);
     const boughtAssetId = this.getTokenIdBySymbol(buySymbol);
-    console.log("soldAssetId", soldAssetId, "boughtAssetId", boughtAssetId);
+    // console.log("soldAssetId", soldAssetId, "boughtAssetId", boughtAssetId);
     return this.api.tx.xyk.buyAsset(
       soldAssetId,
       boughtAssetId,
@@ -590,7 +590,7 @@ class MangataHelper {
   // };
 
   calculateRewardsAmount = async (address, tokenId) => {
-    // console.log('calculateRewardsAmount: address', address, 'liquidityTokenId', _.toString(tokenId));
+    // // console.log('calculateRewardsAmount: address', address, 'liquidityTokenId', _.toString(tokenId));
     const amountBN = await this.mangata.calculateRewardsAmount(
       address,
       _.toString(tokenId)
@@ -623,25 +623,25 @@ class MangataHelper {
   }) => {
     const decimalBN = getDecimalBN(decimals);
     const amountBN = new BN(amount, 10);
-    // console.log('decimalBN.mul.amountBN', decimalBN.mul(amountBN).toString());
-    console.log(
-      `Sending ${amount} #${tokenId} token from ${sender} to ${dest} ...`
-    );
+    // // console.log('decimalBN.mul.amountBN', decimalBN.mul(amountBN).toString());
+    // console.log(
+    //   `Sending ${amount} #${tokenId} token from ${sender} to ${dest} ...`
+    // );
 
     return this.mangata
       .transferToken(keyPair, tokenId, dest, decimalBN.mul(amountBN), {
         // statusCallback: (result) => {
         //     // result is of the form ISubmittableResult
-        //     console.log('statusCallback.result', result);
-        //     console.log('statusCallback.result.status', result.status);
+        //     // console.log('statusCallback.result', result);
+        //     // console.log('statusCallback.result.status', result.status);
         // },
         // extrinsicStatus: (result) => {
         //     // result is of the form MangataGenericEvent[]
         //     for (let index = 0; index < result.length; index += 1) {
-        //         console.log('Phase', result[index].phase.toString());
-        //         console.log('Section', result[index].section);
-        //         console.log('Method', result[index].method);
-        //         console.log('Documentation', result[index].metaDocumentation);
+        //         // console.log('Phase', result[index].phase.toString());
+        //         // console.log('Section', result[index].section);
+        //         // console.log('Method', result[index].method);
+        //         // console.log('Documentation', result[index].metaDocumentation);
         //     }
         // },
       })
diff --git a/src/utils/xcm/common/turingHelper.js b/src/utils/xcm/common/turingHelper.js
index 595cf6c..52dd3b9 100644
--- a/src/utils/xcm/common/turingHelper.js
+++ b/src/utils/xcm/common/turingHelper.js
@@ -85,20 +85,20 @@ class TuringHelper {
             { signer: signer, nonce: -1 },
             async ({ status }) => {
               if (status.isInBlock) {
-                console.log("Transaction is in Block now!");
-                console.log(`Successful with hash ${status.asInBlock.toHex()}`);
-                console.log("kpaddr", keyPair, "task", taskId);
+                // console.log("Transaction is in Block now!");
+                // console.log(`Successful with hash ${status.asInBlock.toHex()}`);
+                // console.log("kpaddr", keyPair, "task", taskId);
                 // Get Task
                 const task = await this.api.query.automationTime.accountTasks(
                   keyPair,
                   taskId
                 );
-                console.log("Task:", task);
+                // console.log("Task:", task);
                 // unsub();
                 // resolve();
               } else if (status.isFinalized) {
-                console.log("Transaction is Finalized!");
-                console.log(
+                // console.log("Transaction is Finalized!");
+                // console.log(
                   `Finalized block hash ${status.asFinalized.toHex()}`
                 );
                 setIsInProcess(false);
@@ -106,12 +106,12 @@ class TuringHelper {
                 setIsSuccess(true);
               } else {
                 setIsSigning(false); // Reaching here means the trxn is signed
-                console.log(`Status: ${status.type}`);
+                // console.log(`Status: ${status.type}`);
               }
             }
           )
           .catch((error) => {
-            console.log("sendXcmExtrinsic Err --\n", error);
+            // console.log("sendXcmExtrinsic Err --\n", error);
             let errorString = `${error}`;
             setIsInProcess(false);
             setIsSigning(false);
diff --git a/src/utils/xcm/common/utils.js b/src/utils/xcm/common/utils.js
index 6592b1b..ad092f4 100644
--- a/src/utils/xcm/common/utils.js
+++ b/src/utils/xcm/common/utils.js
@@ -17,7 +17,7 @@ export const sendExtrinsic = async (
   new Promise((resolve) => {
     const newExtrinsic = isSudo ? api.tx.sudo.sudo(extrinsic) : extrinsic;
     newExtrinsic.signAndSend(keyPair, { nonce: -1 }, ({ status, events }) => {
-      console.log("status.type", status.type);
+      // console.log("status.type", status.type);
 
       if (status.isInBlock || status.isFinalized) {
         events
@@ -35,10 +35,10 @@ export const sendExtrinsic = async (
                 // for module errors, we have the section indexed, lookup
                 const decoded = api.registry.findMetaError(error.asModule);
                 const { docs, method, section } = decoded;
-                console.log(`${section}.${method}: ${docs.join(" ")}`);
+                // console.log(`${section}.${method}: ${docs.join(" ")}`);
               } else {
                 // Other, CannotLookup, BadOrigin, no extra info
-                console.log(error.toString());
+                // console.log(error.toString());
               }
             }
           );
@@ -79,11 +79,11 @@ export const waitForEvent = async (api, method, blocks = 3) =>
     const unsub = api.rpc.chain.getFinalizedHead(async (head) => {
       await api.query.system.events((events) => {
         counter += 1;
-        console.log(
-          `await event check for '${method}', attempt ${counter}, head ${head}`
-        );
+        // console.log(
+        //   `await event check for '${method}', attempt ${counter}, head ${head}`
+        // );
         events.forEach(({ phase, event: { data, section } }) => {
-          console.log(phase, data, method, section);
+          // console.log(phase, data, method, section);
         });
         const foundEvent = _.find(
           events,
@@ -204,16 +204,16 @@ export const listenEvents = async (api, section, method, timeout = undefined) =>
             typeDef: types,
           } = event;
 
-          // console.log('section.method: ', `${section}.${method}`);
+          // // console.log('section.method: ', `${section}.${method}`);
           if (eventSection === section && eventMethod === method) {
             foundEvent = true;
             // Show what we are busy with
-            console.log(`\t${section}:${method}:: (phase=${phase.toString()})`);
-            // console.log(`\t\t${event.meta.documentation.toString()}`);
+            // console.log(`\t${section}:${method}:: (phase=${phase.toString()})`);
+            // // console.log(`\t\t${event.meta.documentation.toString()}`);
 
             // Loop through each of the parameters, displaying the type and data
             event.data.forEach((data, index) => {
-              console.log(`\t\t\t${types[index].type}: ${data.toString()}`);
+              // console.log(`\t\t\t${types[index].type}: ${data.toString()}`);
             });
           }
         });
diff --git a/src/utils/xcm/mangata/common.js b/src/utils/xcm/mangata/common.js
index 35fcb0d..3b18d07 100644
--- a/src/utils/xcm/mangata/common.js
+++ b/src/utils/xcm/mangata/common.js
@@ -30,7 +30,7 @@ class AutoCompound {
   run = async () => {
     await cryptoWaitReady();
 
-    console.log("Initializing APIs of both chains ...");
+    // console.log("Initializing APIs of both chains ...");
 
     const turingHelper = new TuringHelper(this.turingConfig);
     await turingHelper.initialize();
@@ -43,18 +43,18 @@ class AutoCompound {
     const turingNativeToken = _.first(turingHelper.config.assets);
     const mangataNativeToken = _.first(mangataHelper.config.assets);
 
-    console.log(
+    // console.log(
       `\nTuring chain name: ${turingChainName}, native token: ${JSON.stringify(
         turingNativeToken
       )}`
     );
-    console.log(
+    // console.log(
       `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
         mangataNativeToken
       )}\n`
     );
 
-    console.log("1. Reading token and balance of account ...");
+    // console.log("1. Reading token and balance of account ...");
 
     const json = await readMnemonicFromFile();
     const keyPair = keyring.addFromJson(json);
@@ -77,7 +77,7 @@ class AutoCompound {
     );
     const poolName = `${mgxToken.symbol}-${turToken.symbol}`;
 
-    console.log(
+    // console.log(
       "\n2. Add a proxy on Mangata for paraId 2114, or skip this step if that exists ..."
     );
 
@@ -96,15 +96,15 @@ class AutoCompound {
     const proxyMatch = _.find(proxies, matchCondition);
 
     if (proxyMatch) {
-      console.log(
+      // console.log(
         `Found proxy of ${account.address} on Mangata, and will skip the addition ... `,
         proxyMatch
       );
     } else {
       if (_.isEmpty(proxies)) {
-        console.log(`Proxy array of ${account.address} is empty ...`);
+        // console.log(`Proxy array of ${account.address} is empty ...`);
       } else {
-        console.log(
+        // console.log(
           "Proxy not found. Expected",
           matchCondition,
           "Actual",
@@ -112,7 +112,7 @@ class AutoCompound {
         );
       }
 
-      console.log(
+      // console.log(
         `Adding a proxy for paraId ${turingHelper.config.paraId}. Proxy address: ${proxyAddress} ...`
       );
       await mangataHelper.addProxy(proxyAddress, proxyType, account.pair);
@@ -130,7 +130,7 @@ class AutoCompound {
         firstTokenId: mangataHelper.getTokenIdBySymbol(mgxToken.symbol),
         secondTokenId: mangataHelper.getTokenIdBySymbol(turToken.symbol),
       });
-      console.log(`Found a pool of ${poolName}`, pool);
+      // console.log(`Found a pool of ${poolName}`, pool);
 
       if (_.isUndefined(pool)) {
         throw new Error(`Couldn’t find a liquidity pool for ${poolName} ...`);
@@ -139,7 +139,7 @@ class AutoCompound {
       // Calculate rwards amount in pool
       const { liquidityTokenId } = pool;
 
-      console.log(
+      // console.log(
         `Checking how much reward available in ${poolName} pool, tokenId: ${liquidityTokenId} ...`
       );
 
@@ -149,7 +149,7 @@ class AutoCompound {
         mangataAddress,
         liquidityTokenId
       );
-      console.log(`Claimable reward in ${poolName}: `, rewardAmount);
+      // console.log(`Claimable reward in ${poolName}: `, rewardAmount);
 
       const liquidityBalance = await mangataHelper.mangata.getTokenBalance(
         liquidityTokenId,
@@ -162,7 +162,7 @@ class AutoCompound {
         poolNameDecimalBN
       );
 
-      console.log(
+      // console.log(
         `Before auto-compound, ${
           account.name
         } reserved "${poolName}": ${numReserved.toString()} ...`
@@ -170,7 +170,7 @@ class AutoCompound {
 
       // Mint liquidity to create reserved MGR-TUR if it’s zero
       if (numReserved.toNumber() === 0) {
-        console.log(
+        // console.log(
           "Reserved pool token is zero; minting liquidity to generate rewards..."
         );
 
@@ -178,11 +178,11 @@ class AutoCompound {
         const MAX_SLIPPIAGE = 0.08; // 4% slippage; can’t be too large
         const poolRatio =
           pool.firstTokenAmountFloat / pool.secondTokenAmountFloat;
-        console.log("poolRatio", poolRatio);
+        // console.log("poolRatio", poolRatio);
         const expectedSecondTokenAmount =
           (firstTokenAmount / poolRatio) * (1 + MAX_SLIPPIAGE);
 
-        console.log(
+        // console.log(
           "pool.firstTokenAmountFloat",
           pool.firstTokenAmountFloat,
           "pool.secondTokenAmountFloat",
@@ -202,7 +202,7 @@ class AutoCompound {
           expectedSecondTokenAmount,
         });
 
-        console.log("fees", fees);
+        // console.log("fees", fees);
 
         let mlres = await mangataHelper.mintLiquidity({
           pair: account.pair,
@@ -211,7 +211,7 @@ class AutoCompound {
           firstTokenAmount: firstTokenAmount - fees,
           expectedSecondTokenAmount,
         });
-        console.log("mlres", mlres);
+        // console.log("mlres", mlres);
         // TODO: activate liquidity mining
         // figure out lp token amount
         // await mangataHelper.activateLiquidityV2({
@@ -219,15 +219,15 @@ class AutoCompound {
         //     amount:
         // })
       } else {
-        console.log("rpt not zero");
+        // console.log("rpt not zero");
       }
       if (rewardAmount === 0) {
-        console.log(
+        // console.log(
           "Reserved pool token is not zero but claimable rewards is. You might need to wait some time for it to accumulate ..."
         );
       }
 
-      console.log("rewardAmount", rewardAmount);
+      // console.log("rewardAmount", rewardAmount);
 
       const answerPool = await confirm({
         message:
@@ -235,11 +235,11 @@ class AutoCompound {
         default: true,
       });
 
-      console.log("answerPool", answerPool);
+      // console.log("answerPool", answerPool);
 
       if (answerPool) {
         // Create Mangata proxy call
-        console.log("\n4. Start to schedule an auto-compound call via XCM ...");
+        // console.log("\n4. Start to schedule an auto-compound call via XCM ...");
         const proxyExtrinsic = mangataHelper.api.tx.xyk.compoundRewards(
           liquidityTokenId,
           1000000
@@ -255,11 +255,11 @@ class AutoCompound {
           mangataAddress
         );
 
-        console.log("encodedMangataProxyCall: ", encodedMangataProxyCall);
-        console.log("mangataProxyCallFees: ", mangataProxyCallFees.toHuman());
+        // console.log("encodedMangataProxyCall: ", encodedMangataProxyCall);
+        // console.log("mangataProxyCallFees: ", mangataProxyCallFees.toHuman());
 
         // Create Turing scheduleXcmpTask extrinsic
-        console.log("\na) Create the call for scheduleXcmpTask ");
+        // console.log("\na) Create the call for scheduleXcmpTask ");
         const providedId = `xcmp_automation_test_${(Math.random() + 1)
           .toString(36)
           .substring(7)}`;
@@ -293,13 +293,13 @@ class AutoCompound {
           parseInt(mangataProxyCallFees.weight.refTime, 10)
         );
 
-        console.log("xcmpCall: ", xcmpCall);
+        // console.log("xcmpCall: ", xcmpCall);
 
         // Query automationTime fee
-        console.log("\nb) Query automationTime fee details ");
+        // console.log("\nb) Query automationTime fee details ");
         const { executionFee, xcmpFee } =
           await turingHelper.api.rpc.automationTime.queryFeeDetails(xcmpCall);
-        console.log("automationFeeDetails: ", {
+        // console.log("automationFeeDetails: ", {
           executionFee: executionFee.toHuman(),
           xcmpFee: xcmpFee.toHuman(),
         });
@@ -309,14 +309,14 @@ class AutoCompound {
           turingAddress,
           providedId
         );
-        console.log("TaskId:", taskId.toHuman());
+        // console.log("TaskId:", taskId.toHuman());
 
         // Send extrinsic
-        console.log("\nc) Sign and send scheduleXcmpTask call ...");
+        // console.log("\nc) Sign and send scheduleXcmpTask call ...");
         await turingHelper.sendXcmExtrinsic(xcmpCall, account.pair, taskId);
 
         // Listen XCM events on Mangata side
-        console.log(
+        // console.log(
           `\n5. Keep Listening XCM events on ${mangataChainName} until ${moment(
             timestampNextHour * 1000
           ).format(
@@ -333,13 +333,13 @@ class AutoCompound {
           nextHourExecutionTimeout
         );
         if (!isTaskExecuted) {
-          console.log("Timeout! Task was not executed.");
+          // console.log("Timeout! Task was not executed.");
           return;
         }
 
-        console.log("Task has been executed!");
+        // console.log("Task has been executed!");
 
-        console.log("\nWaiting 20 seconds before reading new chain states ...");
+        // console.log("\nWaiting 20 seconds before reading new chain states ...");
         await delay(20000);
 
         // Account’s reserved LP token after auto-compound
@@ -347,17 +347,17 @@ class AutoCompound {
           liquidityTokenId,
           mangataAddress
         );
-        console.log(
+        // console.log(
           `\nAfter auto-compound, reserved ${poolName} is: ${newLiquidityBalance.reserved.toString()} planck ...`
         );
 
-        console.log(
+        // console.log(
           `${account.name} has compounded ${newLiquidityBalance.reserved
             .sub(liquidityBalance.reserved)
             .toString()} planck more ${poolName} ...`
         );
 
-        console.log("\n5. Cancel task ...");
+        // console.log("\n5. Cancel task ...");
         const cancelTaskExtrinsic =
           turingHelper.api.tx.automationTime.cancelTask(taskId);
         await sendExtrinsic(turingHelper.api, cancelTaskExtrinsic, keyPair);
@@ -366,7 +366,7 @@ class AutoCompound {
           timestampTwoHoursLater
         );
 
-        console.log(
+        // console.log(
           `\n6. Keep Listening events on ${mangataChainName} until ${moment(
             timestampTwoHoursLater * 1000
           ).format(
@@ -381,10 +381,10 @@ class AutoCompound {
           twoHoursExecutionTimeout
         );
         if (isTaskExecutedAgain) {
-          console.log("Task cancellation failed! It executes again.");
+          // console.log("Task cancellation failed! It executes again.");
           return;
         }
-        console.log("Task canceled successfully! It didn't execute again.");
+        // console.log("Task canceled successfully! It didn't execute again.");
       }
     }
   };
diff --git a/src/utils/xcm/mangata/mangata-kusama.js b/src/utils/xcm/mangata/mangata-kusama.js
index 257c98a..4797def 100644
--- a/src/utils/xcm/mangata/mangata-kusama.js
+++ b/src/utils/xcm/mangata/mangata-kusama.js
@@ -21,6 +21,6 @@ async function main() {
 main()
   .catch(console.error)
   .finally(() => {
-    console.log("Reached end of main() ...");
+    // console.log("Reached end of main() ...");
     process.exit();
   });
diff --git a/src/utils/xcm/mangata/mangata-rococo.js b/src/utils/xcm/mangata/mangata-rococo.js
index cb09fa7..f4ce360 100644
--- a/src/utils/xcm/mangata/mangata-rococo.js
+++ b/src/utils/xcm/mangata/mangata-rococo.js
@@ -21,6 +21,6 @@ async function main() {
 main()
   .catch(console.error)
   .finally(() => {
-    console.log("Reached end of main() ...");
+    // console.log("Reached end of main() ...");
     process.exit();
   });
diff --git a/src/utils/xcm/mangata/mangata.js b/src/utils/xcm/mangata/mangata.js
index 65cf50a..b71f253 100644
--- a/src/utils/xcm/mangata/mangata.js
+++ b/src/utils/xcm/mangata/mangata.js
@@ -38,7 +38,7 @@ const keyring = new Keyring({ type: "sr25519" });
 async function main() {
   await cryptoWaitReady();
 
-  console.log("Initializing APIs of both chains ...");
+  // console.log("Initializing APIs of both chains ...");
   const turingHelper = new TuringHelper(TuringDev);
   await turingHelper.initialize();
 
@@ -52,18 +52,18 @@ async function main() {
   const turingNativeToken = _.first(turingHelper.config.assets);
   const mangataNativeToken = _.first(mangataHelper.config.assets);
 
-  console.log(
+  // console.log(
     `\nTuring chain name: ${turingChainName}, native token: ${JSON.stringify(
       turingNativeToken
     )}`
   );
-  console.log(
+  // console.log(
     `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
       mangataNativeToken
     )}\n`
   );
 
-  console.log("Reading token and balance of Alice account ...");
+  // console.log("Reading token and balance of Alice account ...");
   const keyPair = keyring.addFromUri("//Alice", undefined, "sr25519");
   keyPair.meta.name = "Alice";
 
@@ -76,7 +76,7 @@ async function main() {
   const poolName = `${mangataNativeToken.symbol}-${turingNativeToken.symbol}`;
 
   // Calculate rwards amount in pool
-  console.log(`Checking how much reward available in ${poolName} pool ...`);
+  // console.log(`Checking how much reward available in ${poolName} pool ...`);
 
   // TODO: determining liquidityTokenId by symbol name cannot handle duplicate symbols. It’s better we retrieve pools and find the correct pool
   const pools = await mangataHelper.getPools({ isPromoted: true });
@@ -93,7 +93,7 @@ async function main() {
     mangataAddress,
     liquidityTokenId
   );
-  console.log(`Claimable reward in ${poolName}: `, rewardAmount);
+  // console.log(`Claimable reward in ${poolName}: `, rewardAmount);
 
   // Alice’s reserved LP token before auto-compound
   const liquidityBalance = await mangataHelper.mangata.getTokenBalance(
@@ -103,7 +103,7 @@ async function main() {
   const liquidityDecimalBN = getDecimalBN(
     mangataHelper.getDecimalsBySymbol(poolName)
   );
-  console.log(
+  // console.log(
     `Before auto-compound, ${account.name} reserved ${poolName}: ${new BN(
       liquidityBalance.reserved
     )
@@ -112,7 +112,7 @@ async function main() {
   );
 
   // Create Mangata proxy call
-  console.log("\nStart to schedule an auto-compound call via XCM ...");
+  // console.log("\nStart to schedule an auto-compound call via XCM ...");
 
   const proxyType = "AutoCompound";
   const proxyExtrinsic = mangataHelper.api.tx.xyk.compoundRewards(
@@ -130,11 +130,11 @@ async function main() {
     mangataAddress
   );
 
-  console.log("encodedMangataProxyCall: ", encodedMangataProxyCall);
-  console.log("mangataProxyCallFees: ", mangataProxyCallFees.toHuman());
+  // console.log("encodedMangataProxyCall: ", encodedMangataProxyCall);
+  // console.log("mangataProxyCallFees: ", mangataProxyCallFees.toHuman());
 
   // Create Turing scheduleXcmpTask extrinsic
-  console.log("\n1. Create the call for scheduleXcmpTask ");
+  // console.log("\n1. Create the call for scheduleXcmpTask ");
   const secondsInHour = 3600;
   const millisecondsInHour = 3600 * 1000;
   const currentTimestamp = moment().valueOf();
@@ -165,13 +165,13 @@ async function main() {
     parseInt(mangataProxyCallFees.weight.refTime, 10)
   );
 
-  console.log("xcmpCall: ", xcmpCall);
+  // console.log("xcmpCall: ", xcmpCall);
 
   // Query automationTime fee
-  console.log("\n2. Query automationTime fee details ");
+  // console.log("\n2. Query automationTime fee details ");
   const { executionFee, xcmpFee } =
     await turingHelper.api.rpc.automationTime.queryFeeDetails(xcmpCall);
-  console.log("automationFeeDetails: ", {
+  // console.log("automationFeeDetails: ", {
     executionFee: executionFee.toHuman(),
     xcmpFee: xcmpFee.toHuman(),
   });
@@ -181,14 +181,14 @@ async function main() {
     turingAddress,
     providedId
   );
-  console.log("TaskId:", taskId.toHuman());
+  // console.log("TaskId:", taskId.toHuman());
 
   // Send extrinsic
-  console.log("\n3. Sign and send scheduleXcmpTask call ...");
+  // console.log("\n3. Sign and send scheduleXcmpTask call ...");
   await turingHelper.sendXcmExtrinsic(xcmpCall, account.pair, taskId);
 
   // Listen XCM events on Mangata side
-  console.log(
+  // console.log(
     `\n4. Keep Listening XCM events on ${parachainName} until ${moment(
       executionTime * 1000
     ).format(
@@ -204,13 +204,13 @@ async function main() {
     executionTime
   );
   if (!isTaskExecuted) {
-    console.log("Timeout! Task was not executed.");
+    // console.log("Timeout! Task was not executed.");
     return;
   }
 
-  console.log("Task has been executed!");
+  // console.log("Task has been executed!");
 
-  console.log("\nWaiting 20 seconds before reading new chain states ...");
+  // console.log("\nWaiting 20 seconds before reading new chain states ...");
   await delay(20000);
 
   // Account’s reserved LP token after auto-compound
@@ -221,7 +221,7 @@ async function main() {
   const newReservedBalanceBN = new BN(newLiquidityBalance.reserved).div(
     liquidityDecimalBN
   );
-  console.log(
+  // console.log(
     `\nAfter auto-compound, reserved ${poolName} is: ${newReservedBalanceBN} ${poolName} ...`
   );
 
@@ -229,13 +229,13 @@ async function main() {
     liquidityBalance.reserved
   );
   const reservedDeltaBN = reservedPlanckDeltaBN.div(liquidityDecimalBN);
-  console.log(
+  // console.log(
     `${
       account.name
     } has compounded ${reservedDeltaBN.toString()} more ${poolName} ...`
   );
 
-  console.log("\n5. Cancel task ...");
+  // console.log("\n5. Cancel task ...");
   const cancelTaskExtrinsic =
     turingHelper.api.tx.automationTime.cancelTask(taskId);
   await sendExtrinsic(turingHelper.api, cancelTaskExtrinsic, keyPair);
@@ -243,7 +243,7 @@ async function main() {
   const nextExecutionTime = executionTime + TASK_FREQUENCY;
   const nextExecutionTimeout = calculateTimeout(nextExecutionTime);
 
-  console.log(
+  // console.log(
     `\n6. Keep Listening events on ${parachainName} until ${moment(
       nextExecutionTime * 1000
     ).format(
@@ -258,15 +258,15 @@ async function main() {
     nextExecutionTimeout
   );
   if (isTaskExecutedAgain) {
-    console.log("Task cancellation failed! It executes again.");
+    // console.log("Task cancellation failed! It executes again.");
     return;
   }
-  console.log("Task canceled successfully! It didn't execute again.");
+  // console.log("Task canceled successfully! It didn't execute again.");
 }
 
 main()
   .catch(console.error)
   .finally(() => {
-    console.log("Reached end of main() ...");
+    // console.log("Reached end of main() ...");
     process.exit();
   });
diff --git a/src/utils/xcm/mangata/setup-mangata.js b/src/utils/xcm/mangata/setup-mangata.js
index 2929dab..2cadd41 100644
--- a/src/utils/xcm/mangata/setup-mangata.js
+++ b/src/utils/xcm/mangata/setup-mangata.js
@@ -28,7 +28,7 @@ const keyring = new Keyring({ type: "sr25519" });
 async function main() {
   await cryptoWaitReady();
 
-  console.log("Initializing APIs of both chains ...");
+  // console.log("Initializing APIs of both chains ...");
   const turingHelper = new TuringHelper(TuringDev);
   await turingHelper.initialize();
 
@@ -40,12 +40,12 @@ async function main() {
   const turingNativeToken = _.first(turingHelper.config.assets);
   const mangataNativeToken = _.first(mangataHelper.config.assets);
 
-  console.log(
+  // console.log(
     `\nTuring chain name: ${turingChainName}, native token: ${JSON.stringify(
       turingNativeToken
     )}`
   );
-  console.log(
+  // console.log(
     `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
       mangataNativeToken
     )}\n`
@@ -55,7 +55,7 @@ async function main() {
   keyPair.meta.name = "Alice";
   const account = new Account(keyPair);
 
-  console.log(`1. Reading token and balance of ${account.name} account ...`);
+  // console.log(`1. Reading token and balance of ${account.name} account ...`);
   await account.init([turingHelper, mangataHelper]);
   account.print();
 
@@ -71,10 +71,10 @@ async function main() {
   );
   const poolName = `${mgxToken.symbol}-${turToken.symbol}`;
 
-  console.log("\n2. Initing inssuance on Mangata ...");
+  // console.log("\n2. Initing inssuance on Mangata ...");
   await mangataHelper.initIssuance(account.pair);
 
-  console.log(
+  // console.log(
     `\n3. Minting tokens for ${account.name} on Maganta if balance is zero ...`
   );
 
@@ -83,7 +83,7 @@ async function main() {
     const { symbol, balance } = mangataTokens[i];
 
     if (balance === 0) {
-      console.log(
+      // console.log(
         `[${account.name}] ${symbol} balance on Mangata is zero; minting ${symbol} with sudo ...`
       );
       // Because sending extrinsic in parallel will cause repeated nonce errors
@@ -93,7 +93,7 @@ async function main() {
   }
 
   // If there is no proxy, add a proxy of Turing on Mangata
-  console.log(
+  // console.log(
     "\n4. Add a proxy on Mangata for paraId 2114, or skip this step if that exists ..."
   );
 
@@ -112,12 +112,12 @@ async function main() {
   const proxyMatch = _.find(proxies, matchCondition);
 
   if (proxyMatch) {
-    console.log(`Found proxy of ${account.address} on Mangata: `, proxyMatch);
+    // console.log(`Found proxy of ${account.address} on Mangata: `, proxyMatch);
   } else {
     if (_.isEmpty(proxies)) {
-      console.log(`Proxy array of ${account.address} is empty ...`);
+      // console.log(`Proxy array of ${account.address} is empty ...`);
     } else {
-      console.log(
+      // console.log(
         "Proxy not found. Expected",
         matchCondition,
         "Actual",
@@ -125,7 +125,7 @@ async function main() {
       );
     }
 
-    console.log(
+    // console.log(
       `Adding a proxy for paraId ${turingHelper.config.paraId}. Proxy address: ${proxyAddress} ...`
     );
     await mangataHelper.addProxy(proxyAddress, proxyType, account.pair);
@@ -139,7 +139,7 @@ async function main() {
   if (answerPool) {
     // Get current pools available
     const pools = await mangataHelper.getPools({ isPromoted: false });
-    console.log("\n5. Existing pools: ", pools);
+    // console.log("\n5. Existing pools: ", pools);
 
     const poolFound = _.find(
       pools,
@@ -152,7 +152,7 @@ async function main() {
 
     // Create a MGR-TUR pool is not found
     if (_.isUndefined(poolFound)) {
-      console.log(
+      // console.log(
         `No ${poolName} pool found; creating a ${poolName} pool with ${account.name} ...`
       );
 
@@ -168,12 +168,12 @@ async function main() {
       });
 
       // Update assets
-      console.log(
+      // console.log(
         `\nChecking out assets after pool creation; there should be a new ${poolName} token ...`
       );
       await mangataHelper.updateAssets();
     } else {
-      console.log(`An existing ${poolName} pool found; skip pool creation ...`);
+      // console.log(`An existing ${poolName} pool found; skip pool creation ...`);
     }
 
     const poolsRetry = await mangataHelper.getPools({ isPromoted: false });
@@ -182,10 +182,10 @@ async function main() {
       firstTokenId: mgxToken.id,
       secondTokenId: turToken.id,
     });
-    console.log(`Found a pool of ${poolName}`, pool);
+    // console.log(`Found a pool of ${poolName}`, pool);
 
     // Promote pool
-    console.log("\n6. Promote the pool to activate liquidity rewarding ...");
+    // console.log("\n6. Promote the pool to activate liquidity rewarding ...");
     await mangataHelper.updatePoolPromotion(
       pool.liquidityTokenId,
       100,
@@ -193,7 +193,7 @@ async function main() {
     );
 
     // Mint liquidity to generate rewards...
-    console.log("\n7. Mint liquidity to generate rewards...");
+    // console.log("\n7. Mint liquidity to generate rewards...");
 
     const firstTokenAmount = 1000;
     const MAX_SLIPPIAGE = 0.04; // 4% slippage; can’t be too large
@@ -210,7 +210,7 @@ async function main() {
       expectedSecondTokenAmount,
     });
 
-    console.log(`Mint Liquidity Fee: ${fees} ${mgxToken.symbol}`);
+    // console.log(`Mint Liquidity Fee: ${fees} ${mgxToken.symbol}`);
 
     await mangataHelper.mintLiquidity({
       pair: account.pair,
@@ -220,7 +220,7 @@ async function main() {
       expectedSecondTokenAmount,
     });
 
-    console.log("\nWaiting 120 seconds to check claimable reward ...");
+    // console.log("\nWaiting 120 seconds to check claimable reward ...");
     await delay(120 * 1000);
 
     const liquidityTokenId = mangataHelper.getTokenIdBySymbol(poolName);
@@ -228,13 +228,13 @@ async function main() {
       mangataAddress,
       liquidityTokenId
     );
-    console.log(`Claimable reward in ${poolName}: `, rewardAmount);
+    // console.log(`Claimable reward in ${poolName}: `, rewardAmount);
   }
 }
 
 main()
   .catch(console.error)
   .finally(() => {
-    console.log("Reached end of main() ...");
+    // console.log("Reached end of main() ...");
     process.exit();
   });
diff --git a/src/utils/xcm/rocstar.js b/src/utils/xcm/rocstar.js
index 01a06ee..4d5315b 100644
--- a/src/utils/xcm/rocstar.js
+++ b/src/utils/xcm/rocstar.js
@@ -31,7 +31,7 @@ const scheduleTask = async ({
   paraTokenIdOnTuring,
   keyPair,
 }) => {
-  console.log("\na). Create a payload to store in Turing’s task ...");
+  // console.log("\na). Create a payload to store in Turing’s task ...");
 
   // We are using a very simple system.remark extrinsic to demonstrate the payload here.
   // The real payload would be Shibuya’s utility.batch() call to claim staking rewards and stake
@@ -46,10 +46,10 @@ const scheduleTask = async ({
     parachainAddress
   );
   const encodedCallWeight = parseInt(payloadViaProxyFees.weight.refTime, 10);
-  console.log(`Encoded call data: ${encodedCallData}`);
-  console.log(`Encoded call weight: ${encodedCallWeight}`);
+  // console.log(`Encoded call data: ${encodedCallData}`);
+  // console.log(`Encoded call weight: ${encodedCallWeight}`);
 
-  console.log(
+  // console.log(
     "\nb) Prepare automationTime.scheduleXcmpTask extrinsic for XCM ..."
   );
 
@@ -84,10 +84,10 @@ const scheduleTask = async ({
   const taskViaProxyFees = await taskViaProxy.paymentInfo(turingAddress);
   const requireWeightAtMost = parseInt(taskViaProxyFees.weight, 10);
 
-  console.log(`Encoded call data: ${encodedTaskViaProxy}`);
-  console.log(`requireWeightAtMost: ${requireWeightAtMost}`);
+  // console.log(`Encoded call data: ${encodedTaskViaProxy}`);
+  // console.log(`requireWeightAtMost: ${requireWeightAtMost}`);
 
-  console.log(
+  // console.log(
     `\nc) Execute the above an XCM from ${shibuyaHelper.config.name} to schedule a task on ${turingHelper.config.name} ...`
   );
   const feePerSecond = await turingHelper.getFeePerSecond(paraTokenIdOnTuring);
@@ -101,7 +101,7 @@ const scheduleTask = async ({
   });
   await sendExtrinsic(shibuyaHelper.api, xcmpExtrinsic, keyPair);
 
-  console.log(`\nAt this point if the XCM succeeds, you should see the below events on both chains:\n
+  // console.log(`\nAt this point if the XCM succeeds, you should see the below events on both chains:\n
   1. Shibuya\n
   xcmpQueue.XcmpMessageSent and polkadotXcm.Sent - an XCM is successfully sent from Shibuya to Turing to schedule a task.\n
   2. Turing Dev\n
@@ -130,8 +130,8 @@ const main = async () => {
   const parachainName = shibuyaHelper.config.key;
   const parachainNativeToken = _.first(shibuyaHelper.config.assets);
 
-  console.log(`\nTuring chain key: ${turingChainName}`);
-  console.log(
+  // console.log(`\nTuring chain key: ${turingChainName}`);
+  // console.log(
     `Parachain name: ${parachainName}, native token: ${JSON.stringify(
       parachainNativeToken
     )}\n`
@@ -149,19 +149,19 @@ const main = async () => {
   const turingAddress = account.getChainByName(turingChainName)?.address;
   const decimalBN = getDecimalBN(parachainNativeToken.decimals);
 
-  console.log(
+  // console.log(
     `\nUser ${account.name} ${turingChainName} address: ${turingAddress}, ${parachainName} address: ${parachainAddress}`
   );
 
   const paraTokenIdOnTuring = await turingHelper.getAssetIdByParaId(
     shibuyaHelper.config.paraId
   );
-  console.log("Rocstar ID on Turing: ", paraTokenIdOnTuring);
+  // console.log("Rocstar ID on Turing: ", paraTokenIdOnTuring);
 
   // One-time setup - a proxy account needs to be created to execute an XCM message on behalf of its user
   // We also need to transfer tokens to the proxy account to pay for XCM and task execution fees
-  console.log(`\n1. One-time proxy setup on ${parachainName} ...`);
-  console.log(
+  // console.log(`\n1. One-time proxy setup on ${parachainName} ...`);
+  // console.log(
     `\na) Add a proxy for ${account.name} If there is none setup on ${parachainName} (paraId:${turingHelper.config.paraId}) \n`
   );
 
@@ -177,11 +177,11 @@ const main = async () => {
   });
 
   if (proxyMatch) {
-    console.log(
+    // console.log(
       `Proxy address ${proxyOnParachain} for paraId: ${turingHelper.config.paraId} and proxyType: ${proxyTypeParachain} already exists; skipping creation ...`
     );
   } else {
-    console.log(
+    // console.log(
       `Add a proxy of ${turingChainName} (paraId:${turingHelper.config.paraId}) and proxyType: ${proxyTypeParachain} on ${parachainName} ...\n Proxy address: ${proxyOnParachain}\n`
     );
     await sendExtrinsic(
@@ -199,7 +199,7 @@ const main = async () => {
   const balance = await shibuyaHelper.getBalance(proxyOnParachain);
 
   if (balance.free.lt(minBalance)) {
-    console.log("\nb) Topping up the proxy account on Shibuya with SBY ...\n");
+    // console.log("\nb) Topping up the proxy account on Shibuya with SBY ...\n");
     const amount = new BN(1000, 10);
     const amountBN = amount.mul(decimalBN);
     const topUpExtrinsic = shibuyaHelper.api.tx.balances.transfer(
@@ -209,13 +209,13 @@ const main = async () => {
     await sendExtrinsic(shibuyaHelper.api, topUpExtrinsic, keyPair);
   } else {
     const freeAmount = new BN(balance.free).div(decimalBN);
-    console.log(
+    // console.log(
       `\nb) Proxy’s balance is ${freeAmount.toString()}, no need to top it up with SBY transfer ...`
     );
   }
 
-  console.log("\n2. One-time proxy setup on Turing");
-  console.log(
+  // console.log("\n2. One-time proxy setup on Turing");
+  // console.log(
     `\na) Add a proxy for Alice If there is none setup on Turing (paraId:${shibuyaHelper.config.paraId})\n`
   );
   const proxyTypeTuring = "Any";
@@ -231,11 +231,11 @@ const main = async () => {
   });
 
   if (proxyMatchTuring) {
-    console.log(
+    // console.log(
       `Proxy address ${proxyOnTuring} for paraId: ${shibuyaHelper.config.paraId} and proxyType: ${proxyTypeTuring} already exists; skipping creation ...`
     );
   } else {
-    console.log(
+    // console.log(
       `Add a proxy of ${parachainName} (paraId:${shibuyaHelper.config.paraId}) and proxyType: ${proxyTypeTuring} on Turing ...\n Proxy address: ${proxyOnTuring}\n`
     );
     await sendExtrinsic(
@@ -253,7 +253,7 @@ const main = async () => {
   );
 
   if (balanceOnTuring.free.lt(minBalanceOnTuring)) {
-    console.log(
+    // console.log(
       `\nb) Topping up the proxy account on ${turingChainName} via reserve transfer ...`
     );
     const topUpAmount = new BN(1000, 10);
@@ -271,12 +271,12 @@ const main = async () => {
     );
   } else {
     const freeBalanceOnTuring = new BN(balanceOnTuring.free).div(decimalBN);
-    console.log(
+    // console.log(
       `\nb) Proxy’s balance is ${freeBalanceOnTuring.toString()}, no need to top it up with reserve transfer ...`
     );
   }
 
-  console.log(
+  // console.log(
     `\n3. Execute an XCM from ${parachainName} to schedule a task on ${turingChainName} ...`
   );
 
@@ -293,7 +293,7 @@ const main = async () => {
   const { taskId, providedId, executionTime } = result;
   const timeout = calculateTimeout(executionTime);
 
-  console.log(
+  // console.log(
     `\n4. Keep Listening events on ${parachainName} until ${moment(
       executionTime * 1000
     ).format(
@@ -308,13 +308,13 @@ const main = async () => {
   );
 
   if (!isTaskExecuted) {
-    console.log("Timeout! Task was not executed.");
+    // console.log("Timeout! Task was not executed.");
     return;
   }
 
-  console.log("Task has been executed!");
+  // console.log("Task has been executed!");
 
-  console.log("\n5. Cancel task ...");
+  // console.log("\n5. Cancel task ...");
   const cancelTaskExtrinsic =
     turingHelper.api.tx.automationTime.cancelTask(taskId);
   await sendExtrinsic(turingHelper.api, cancelTaskExtrinsic, keyPair);
@@ -322,7 +322,7 @@ const main = async () => {
   const nextExecutionTime = executionTime + TASK_FREQUENCY;
   const nextExecutionTimeout = calculateTimeout(nextExecutionTime);
 
-  console.log(
+  // console.log(
     `\n6. Keep Listening events on ${parachainName} until ${moment(
       nextExecutionTime * 1000
     ).format(
@@ -338,15 +338,15 @@ const main = async () => {
   );
 
   if (isTaskExecutedAgain) {
-    console.log("Task cancellation failed! It executes again.");
+    // console.log("Task cancellation failed! It executes again.");
     return;
   }
-  console.log("Task canceled successfully! It didn't execute again.");
+  // console.log("Task canceled successfully! It didn't execute again.");
 };
 
 main()
   .catch(console.error)
   .finally(() => {
-    console.log("Reached the end of main() ...");
+    // console.log("Reached the end of main() ...");
     process.exit();
   });
diff --git a/src/utils/xcm/shibuya.js b/src/utils/xcm/shibuya.js
index acd0891..a236159 100644
--- a/src/utils/xcm/shibuya.js
+++ b/src/utils/xcm/shibuya.js
@@ -30,7 +30,7 @@ const scheduleTask = async ({
   paraTokenIdOnTuring,
   keyPair,
 }) => {
-  console.log("\na). Create a payload to store in Turing’s task ...");
+  // console.log("\na). Create a payload to store in Turing’s task ...");
 
   // The real payload would be Shibuya’s utility.batch() call to claim staking rewards and stake
   const payload = shibuyaHelper.api.tx.dappsStaking.claimStaker({
@@ -46,10 +46,10 @@ const scheduleTask = async ({
     parachainAddress
   );
   const encodedCallWeight = parseInt(payloadViaProxyFees.weight.refTime, 10);
-  console.log(`Encoded call data: ${encodedCallData}`);
-  console.log(`Encoded call weight: ${encodedCallWeight}`);
+  // console.log(`Encoded call data: ${encodedCallData}`);
+  // console.log(`Encoded call weight: ${encodedCallWeight}`);
 
-  console.log(
+  // console.log(
     "\nb) Prepare automationTime.scheduleXcmpTask extrinsic for XCM ..."
   );
 
@@ -84,10 +84,10 @@ const scheduleTask = async ({
   const taskViaProxyFees = await taskViaProxy.paymentInfo(turingAddress);
   const requireWeightAtMost = parseInt(taskViaProxyFees.weight, 10);
 
-  console.log(`Encoded call data: ${encodedTaskViaProxy}`);
-  console.log(`requireWeightAtMost: ${requireWeightAtMost}`);
+  // console.log(`Encoded call data: ${encodedTaskViaProxy}`);
+  // console.log(`requireWeightAtMost: ${requireWeightAtMost}`);
 
-  console.log(
+  // console.log(
     `\nc) Execute the above an XCM from ${shibuyaHelper.config.name} to schedule a task on ${turingHelper.config.name} ...`
   );
   const feePerSecond = await turingHelper.getFeePerSecond(paraTokenIdOnTuring);
@@ -102,7 +102,7 @@ const scheduleTask = async ({
 
   await sendExtrinsic(shibuyaHelper.api, xcmpExtrinsic, keyPair);
 
-  console.log(`\nAt this point if the XCM succeeds, you should see the below events on both chains:\n
+  // console.log(`\nAt this point if the XCM succeeds, you should see the below events on both chains:\n
   1. Shibuya\n
   xcmpQueue.XcmpMessageSent and polkadotXcm.Sent - an XCM is successfully sent from Shibuya to Turing to schedule a task.\n
   2. Turing Dev\n
@@ -131,8 +131,8 @@ const main = async () => {
   const parachainName = shibuyaHelper.config.key;
   const parachainNativeToken = _.first(shibuyaHelper.config.assets);
 
-  console.log(`\nTuring chain key: ${turingChainName}`);
-  console.log(
+  // console.log(`\nTuring chain key: ${turingChainName}`);
+  // console.log(
     `Parachain name: ${parachainName}, native token: ${JSON.stringify(
       parachainNativeToken
     )}\n`
@@ -140,7 +140,7 @@ const main = async () => {
 
   const accountName = "Alice";
 
-  console.log(`1. Reading token and balance of ${accountName} account ...`);
+  // console.log(`1. Reading token and balance of ${accountName} account ...`);
 
   const keyPair = keyring.addFromUri(`//${accountName}`, undefined, "sr25519");
   const account = new Account(keyPair);
@@ -153,19 +153,19 @@ const main = async () => {
   const turingAddress = account.getChainByName(turingChainName)?.address;
   const decimalBN = getDecimalBN(parachainNativeToken.decimals);
 
-  console.log(
+  // console.log(
     `\nUser ${account.name} ${turingChainName} address: ${turingAddress}, ${parachainName} address: ${parachainAddress}`
   );
 
   const paraTokenIdOnTuring = await turingHelper.getAssetIdByParaId(
     shibuyaHelper.config.paraId
   );
-  console.log("Shibuya ID on Turing: ", paraTokenIdOnTuring);
+  // console.log("Shibuya ID on Turing: ", paraTokenIdOnTuring);
 
   // One-time setup - a proxy account needs to be created to execute an XCM message on behalf of its user
   // We also need to transfer tokens to the proxy account to pay for XCM and task execution fees
-  console.log(`\n1. One-time proxy setup on ${parachainName} ...`);
-  console.log(
+  // console.log(`\n1. One-time proxy setup on ${parachainName} ...`);
+  // console.log(
     `\na) Add a proxy for ${account.name} If there is none setup on ${parachainName} (paraId:${turingHelper.config.paraId}) \n`
   );
 
@@ -181,11 +181,11 @@ const main = async () => {
   });
 
   if (proxyMatch) {
-    console.log(
+    // console.log(
       `Proxy address ${proxyOnParachain} for paraId: ${turingHelper.config.paraId} and proxyType: ${proxyTypeParachain} already exists; skipping creation ...`
     );
   } else {
-    console.log(
+    // console.log(
       `Add a proxy of ${turingChainName} (paraId:${turingHelper.config.paraId}) and proxyType: ${proxyTypeParachain} on ${parachainName} ...\n Proxy address: ${proxyOnParachain}\n`
     );
     await sendExtrinsic(
@@ -203,7 +203,7 @@ const main = async () => {
   const balance = await shibuyaHelper.getBalance(proxyOnParachain);
 
   if (balance.free.lt(minBalance)) {
-    console.log("\nb) Topping up the proxy account on Shibuya with SBY ...\n");
+    // console.log("\nb) Topping up the proxy account on Shibuya with SBY ...\n");
     const amount = new BN(1000, 10);
     const amountBN = amount.mul(decimalBN);
     const topUpExtrinsic = shibuyaHelper.api.tx.balances.transfer(
@@ -213,13 +213,13 @@ const main = async () => {
     await sendExtrinsic(shibuyaHelper.api, topUpExtrinsic, keyPair);
   } else {
     const freeAmount = new BN(balance.free).div(decimalBN);
-    console.log(
+    // console.log(
       `\nb) Proxy’s balance is ${freeAmount.toString()}, no need to top it up with SBY transfer ...`
     );
   }
 
-  console.log("\n2. One-time proxy setup on Turing");
-  console.log(
+  // console.log("\n2. One-time proxy setup on Turing");
+  // console.log(
     `\na) Add a proxy for Alice If there is none setup on Turing (paraId:${shibuyaHelper.config.paraId})\n`
   );
   const proxyTypeTuring = "Any";
@@ -235,11 +235,11 @@ const main = async () => {
   });
 
   if (proxyMatchTuring) {
-    console.log(
+    // console.log(
       `Proxy address ${proxyOnTuring} for paraId: ${shibuyaHelper.config.paraId} and proxyType: ${proxyTypeTuring} already exists; skipping creation ...`
     );
   } else {
-    console.log(
+    // console.log(
       `Add a proxy of ${parachainName} (paraId:${shibuyaHelper.config.paraId}) and proxyType: ${proxyTypeTuring} on Turing ...\n Proxy address: ${proxyOnTuring}\n`
     );
     await sendExtrinsic(
@@ -257,7 +257,7 @@ const main = async () => {
   );
 
   if (balanceOnTuring.free.lt(minBalanceOnTuring)) {
-    console.log(
+    // console.log(
       `\nb) Topping up the proxy account on ${turingChainName} via reserve transfer ...`
     );
     const topUpAmount = new BN(1000, 10);
@@ -275,12 +275,12 @@ const main = async () => {
     );
   } else {
     const freeBalanceOnTuring = new BN(balanceOnTuring.free).div(decimalBN);
-    console.log(
+    // console.log(
       `\nb) Proxy’s balance is ${freeBalanceOnTuring.toString()}, no need to top it up with reserve transfer ...`
     );
   }
 
-  console.log(
+  // console.log(
     `\n3. Execute an XCM from ${parachainName} to schedule a task on ${turingChainName} ...`
   );
 
@@ -297,7 +297,7 @@ const main = async () => {
   const { taskId, providedId, executionTime } = result;
   const timeout = calculateTimeout(executionTime);
 
-  console.log(
+  // console.log(
     `\n4. Keep Listening events on ${parachainName} until ${moment(
       executionTime * 1000
     ).format(
@@ -312,13 +312,13 @@ const main = async () => {
   );
 
   if (!isTaskExecuted) {
-    console.log("Timeout! Task was not executed.");
+    // console.log("Timeout! Task was not executed.");
     return;
   }
 
-  console.log("Task has been executed!");
+  // console.log("Task has been executed!");
 
-  console.log("\n5. Cancel task ...");
+  // console.log("\n5. Cancel task ...");
   const cancelTaskExtrinsic =
     turingHelper.api.tx.automationTime.cancelTask(taskId);
   await sendExtrinsic(turingHelper.api, cancelTaskExtrinsic, keyPair);
@@ -326,7 +326,7 @@ const main = async () => {
   const nextExecutionTime = executionTime + TASK_FREQUENCY;
   const nextExecutionTimeout = calculateTimeout(nextExecutionTime);
 
-  console.log(
+  // console.log(
     `\n6. Keep Listening events on ${parachainName} until ${moment(
       nextExecutionTime * 1000
     ).format(
@@ -342,15 +342,15 @@ const main = async () => {
   );
 
   if (isTaskExecutedAgain) {
-    console.log("Task cancellation failed! It executes again.");
+    // console.log("Task cancellation failed! It executes again.");
     return;
   }
-  console.log("Task canceled successfully! It didn't execute again.");
+  // console.log("Task canceled successfully! It didn't execute again.");
 };
 
 main()
   .catch(console.error)
   .finally(() => {
-    console.log("Reached the end of main() ...");
+    // console.log("Reached the end of main() ...");
     process.exit();
   });
diff --git a/src/utils/xcm/utils.js b/src/utils/xcm/utils.js
index 36367d3..44f09ca 100644
--- a/src/utils/xcm/utils.js
+++ b/src/utils/xcm/utils.js
@@ -80,7 +80,7 @@ async function main() {
         isPromoted: true,
         thousandSeparator: true,
       });
-      console.log(pools);
+      // console.log(pools);
 
       break;
     }
@@ -137,7 +137,7 @@ async function main() {
       // 3. Set the amount of transfer
       const amount = 1000;
 
-      console.log("mgxToken", mgxToken);
+      // console.log("mgxToken", mgxToken);
 
       if (mgxToken.balance <= 0) {
         throw new Error(
@@ -161,9 +161,9 @@ async function main() {
       const keyPair = keyring.addFromJson(json);
       keyPair.unlock(process.env.PASS_PHRASE);
 
-      console.log(
-        `Restored account ${keyPair.meta.name} ${keyPair.address} ...`
-      );
+      // console.log(
+      //   `Restored account ${keyPair.meta.name} ${keyPair.address} ...`
+      // );
 
       const account = new Account(keyPair);
       await account.init([mangataHelper]);
@@ -192,9 +192,9 @@ async function main() {
       const keyPair = keyring.addFromJson(json);
       keyPair.unlock(process.env.PASS_PHRASE);
 
-      console.log(
-        `Restored account ${keyPair.meta.name} ${keyPair.address} ...`
-      );
+      // console.log(
+      //   `Restored account ${keyPair.meta.name} ${keyPair.address} ...`
+      // );
 
       const account = new Account(keyPair);
       await account.init([mangataHelper]);
@@ -218,7 +218,7 @@ async function main() {
       const address = "cxPKqGqUn2fhVvEvrRKdmu55ZzP1Xz3yBu4cwTgPdN4utjN";
       const result = getProxyAccount(mangataHelper.api, Turing.paraId, address);
 
-      console.log("result", result);
+      // console.log("result", result);
       break;
     }
     case "check-claimable rewards": {
@@ -227,9 +227,9 @@ async function main() {
       const keyPair = keyring.addFromJson(json);
       keyPair.unlock(process.env.PASS_PHRASE);
 
-      console.log(
-        `Restored account ${keyPair.meta.name} ${keyPair.address} ...`
-      );
+      // console.log(
+      //   `Restored account ${keyPair.meta.name} ${keyPair.address} ...`
+      // );
 
       const account = new Account(keyPair);
       await account.init([mangataHelper]);
@@ -250,15 +250,15 @@ async function main() {
       );
       const poolName = `${mgxToken.symbol}-${turToken.symbol}`;
 
-      console.log(`Checking how much reward available in ${poolName} pool ...`);
+      // console.log(`Checking how much reward available in ${poolName} pool ...`);
       const pools = await mangataHelper.getPools({ isPromoted: true });
-      console.log("pools", pools);
+      // console.log("pools", pools);
 
       const pool = _.find(pools, {
         firstTokenId: mangataHelper.getTokenIdBySymbol(mgxToken.symbol),
         secondTokenId: mangataHelper.getTokenIdBySymbol(turToken.symbol),
       });
-      console.log("pool", pool);
+      // console.log("pool", pool);
 
       if (_.isUndefined(pool)) {
         throw new Error(`Couldn’t find a liquidity pool for ${poolName} ...`);
@@ -270,7 +270,7 @@ async function main() {
         mangataAddress,
         liquidityTokenId
       );
-      console.log(`Claimable reward in ${poolName}: `, rewardAmount);
+      // console.log(`Claimable reward in ${poolName}: `, rewardAmount);
 
       const balance = await mangataHelper.mangata.getTokenBalance(
         liquidityTokenId,
@@ -281,18 +281,18 @@ async function main() {
       );
       const numReserved = new BN(balance.reserved).div(poolNameDecimalBN);
 
-      console.log(
-        `${account.name} reserved "${poolName}": ${numReserved.toString()} ...`
-      );
+      // console.log(
+      //   `${account.name} reserved "${poolName}": ${numReserved.toString()} ...`
+      // );
 
       break;
     }
     default:
-      console.log(`No action found for ${actionSelected}; skipping action ...`);
+      // console.log(`No action found for ${actionSelected}; skipping action ...`);
       break;
   }
 
-  console.log("End of main() ...");
+  // console.log("End of main() ...");
 }
 
 main()

From 4888dc68f19d202f6d4c666a418cea32359854e7 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 23 Aug 2023 02:10:41 +0530
Subject: [PATCH 15/27] fix: linting errors

---
 src/components/Library/SelectChain.tsx |   7 -
 src/hooks/useGasEstimation.ts          |   2 +-
 src/utils/xcm/common/turingHelper.js   |   4 +-
 src/utils/xcm/mangata/common.js        | 262 ++++++++++++-------------
 src/utils/xcm/mangata/mangata.js       |  70 +++----
 src/utils/xcm/mangata/setup-mangata.js |  61 +++---
 src/utils/xcm/rocstar.js               | 102 +++++-----
 src/utils/xcm/shibuya.js               | 102 +++++-----
 8 files changed, 298 insertions(+), 312 deletions(-)

diff --git a/src/components/Library/SelectChain.tsx b/src/components/Library/SelectChain.tsx
index a5004d4..6504ecc 100644
--- a/src/components/Library/SelectChain.tsx
+++ b/src/components/Library/SelectChain.tsx
@@ -17,13 +17,6 @@ const SelectChain: FC<Props> = ({ availableChains }) => {
   // State
   const [selectedChain, setSelectedChain] = useState(chains[filteredChainId]);
 
-  useEffect(() => {
-    // console.log({
-      filteredChainId: filteredChainId,
-      selectedChain: selectedChain,
-    });
-  }, [filteredChainId]);
-
   return (
     <Listbox
       value={{ id: filteredChainId, name: selectedChain }}
diff --git a/src/hooks/useGasEstimation.ts b/src/hooks/useGasEstimation.ts
index 0198990..865cbb2 100644
--- a/src/hooks/useGasEstimation.ts
+++ b/src/hooks/useGasEstimation.ts
@@ -87,7 +87,7 @@ const useGasEstimation = (
   const invalidStableAmmArgs =
     farmition.farmType === "StableAmm" &&
     functionType === 0 &&
-    args[0].every((a) => a === 0 || a === BigInt(0));
+    args[0].every((a: any) => a === 0 || a === BigInt(0));
 
   if (invalidArgs || invalidStableAmmArgs) {
     return {
diff --git a/src/utils/xcm/common/turingHelper.js b/src/utils/xcm/common/turingHelper.js
index 52dd3b9..1ef33a0 100644
--- a/src/utils/xcm/common/turingHelper.js
+++ b/src/utils/xcm/common/turingHelper.js
@@ -99,8 +99,8 @@ class TuringHelper {
               } else if (status.isFinalized) {
                 // console.log("Transaction is Finalized!");
                 // console.log(
-                  `Finalized block hash ${status.asFinalized.toHex()}`
-                );
+                //   `Finalized block hash ${status.asFinalized.toHex()}`
+                // );
                 setIsInProcess(false);
                 setIsSigning(false);
                 setIsSuccess(true);
diff --git a/src/utils/xcm/mangata/common.js b/src/utils/xcm/mangata/common.js
index 3b18d07..18f6eb7 100644
--- a/src/utils/xcm/mangata/common.js
+++ b/src/utils/xcm/mangata/common.js
@@ -38,21 +38,21 @@ class AutoCompound {
     const mangataHelper = new MangataHelper(this.managataConfig);
     await mangataHelper.initialize();
 
-    const turingChainName = turingHelper.config.key;
+    // const turingChainName = turingHelper.config.key;
     const mangataChainName = mangataHelper.config.key;
-    const turingNativeToken = _.first(turingHelper.config.assets);
-    const mangataNativeToken = _.first(mangataHelper.config.assets);
+    // const turingNativeToken = _.first(turingHelper.config.assets);
+    // const mangataNativeToken = _.first(mangataHelper.config.assets);
 
     // console.log(
-      `\nTuring chain name: ${turingChainName}, native token: ${JSON.stringify(
-        turingNativeToken
-      )}`
-    );
+    //   `\nTuring chain name: ${turingChainName}, native token: ${JSON.stringify(
+    //     turingNativeToken
+    //   )}`
+    // );
     // console.log(
-      `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
-        mangataNativeToken
-      )}\n`
-    );
+    //   `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
+    //     mangataNativeToken
+    //   )}\n`
+    // );
 
     // console.log("1. Reading token and balance of account ...");
 
@@ -65,56 +65,55 @@ class AutoCompound {
     account.print();
 
     const mangataAddress = account.getChainByName(mangataChainName)?.address;
-    const turingAddress = account.getChainByName(turingChainName)?.address;
-
-    const mgxToken = account.getAssetByChainAndSymbol(
-      mangataChainName,
-      mangataNativeToken.symbol
-    );
-    const turToken = account.getAssetByChainAndSymbol(
-      mangataChainName,
-      turingNativeToken.symbol
-    );
-    const poolName = `${mgxToken.symbol}-${turToken.symbol}`;
+    // const turingAddress = account.getChainByName(turingChainName)?.address;
+
+    // const mgxToken = account.getAssetByChainAndSymbol(
+    //   mangataChainName,
+    //   mangataNativeToken.symbol
+    // );
+    // const turToken = account.getAssetByChainAndSymbol(
+    //   mangataChainName,
+    //   turingNativeToken.symbol
+    // );
+    // const poolName = `${mgxToken.symbol}-${turToken.symbol}`;
 
     // console.log(
-      "\n2. Add a proxy on Mangata for paraId 2114, or skip this step if that exists ..."
-    );
+    //   "\n2. Add a proxy on Mangata for paraId 2114, or skip this step if that exists ..."
+    // );
 
     const proxyAddress = mangataHelper.getProxyAccount(
       mangataAddress,
       turingHelper.config.paraId
     );
-    const proxiesResponse = await mangataHelper.api.query.proxy.proxies(
-      mangataAddress
-    );
-    const proxies = _.first(proxiesResponse.toJSON());
+    // const proxiesResponse = await mangataHelper.api.query.proxy.proxies(
+    //   mangataAddress
+    // );
+    // const proxies = _.first(proxiesResponse.toJSON());
 
     const proxyType = "AutoCompound";
-    const matchCondition = { delegate: proxyAddress, proxyType };
+    // const matchCondition = { delegate: proxyAddress, proxyType };
 
-    const proxyMatch = _.find(proxies, matchCondition);
+    // const proxyMatch = _.find(proxies, matchCondition);
 
     if (proxyMatch) {
       // console.log(
-        `Found proxy of ${account.address} on Mangata, and will skip the addition ... `,
-        proxyMatch
-      );
+      //   `Found proxy of ${account.address} on Mangata, and will skip the addition ... `,
+      //   proxyMatch
+      // );
     } else {
-      if (_.isEmpty(proxies)) {
-        // console.log(`Proxy array of ${account.address} is empty ...`);
-      } else {
-        // console.log(
-          "Proxy not found. Expected",
-          matchCondition,
-          "Actual",
-          proxies
-        );
-      }
-
+      // if (_.isEmpty(proxies)) {
+      //   console.log(`Proxy array of ${account.address} is empty ...`);
+      // } else {
+      //   console.log(
+      //     "Proxy not found. Expected",
+      //     matchCondition,
+      //     "Actual",
+      //     proxies
+      //   );
+      // }
       // console.log(
-        `Adding a proxy for paraId ${turingHelper.config.paraId}. Proxy address: ${proxyAddress} ...`
-      );
+      //   `Adding a proxy for paraId ${turingHelper.config.paraId}. Proxy address: ${proxyAddress} ...`
+      // );
       await mangataHelper.addProxy(proxyAddress, proxyType, account.pair);
     }
 
@@ -140,15 +139,15 @@ class AutoCompound {
       const { liquidityTokenId } = pool;
 
       // console.log(
-        `Checking how much reward available in ${poolName} pool, tokenId: ${liquidityTokenId} ...`
-      );
+      //   `Checking how much reward available in ${poolName} pool, tokenId: ${liquidityTokenId} ...`
+      // );
 
       // Issue: current we couldn’t read this rewards value correct by always getting 0 on the claimable rewards.
       // The result is different from that in src/mangata.js
-      const rewardAmount = await mangataHelper.calculateRewardsAmount(
-        mangataAddress,
-        liquidityTokenId
-      );
+      // const rewardAmount = await mangataHelper.calculateRewardsAmount(
+      //   mangataAddress,
+      //   liquidityTokenId
+      // );
       // console.log(`Claimable reward in ${poolName}: `, rewardAmount);
 
       const liquidityBalance = await mangataHelper.mangata.getTokenBalance(
@@ -163,69 +162,64 @@ class AutoCompound {
       );
 
       // console.log(
-        `Before auto-compound, ${
-          account.name
-        } reserved "${poolName}": ${numReserved.toString()} ...`
-      );
+      //   `Before auto-compound, ${
+      //     account.name
+      //   } reserved "${poolName}": ${numReserved.toString()} ...`
+      // );
 
       // Mint liquidity to create reserved MGR-TUR if it’s zero
-      if (numReserved.toNumber() === 0) {
-        // console.log(
-          "Reserved pool token is zero; minting liquidity to generate rewards..."
-        );
-
-        const firstTokenAmount = 300;
-        const MAX_SLIPPIAGE = 0.08; // 4% slippage; can’t be too large
-        const poolRatio =
-          pool.firstTokenAmountFloat / pool.secondTokenAmountFloat;
-        // console.log("poolRatio", poolRatio);
-        const expectedSecondTokenAmount =
-          (firstTokenAmount / poolRatio) * (1 + MAX_SLIPPIAGE);
-
-        // console.log(
-          "pool.firstTokenAmountFloat",
-          pool.firstTokenAmountFloat,
-          "pool.secondTokenAmountFloat",
-          pool.secondTokenAmountFloat,
-          "firstTokenAmount",
-          firstTokenAmount,
-          "expectedSecondTokenAmount",
-          expectedSecondTokenAmount
-        );
-
-        // Estimate of fees; no need to be accurate
-        const fees = await mangataHelper.getMintLiquidityFee({
-          pair: account.pair,
-          firstTokenId: mgxToken.id,
-          secondTokenId: turToken.id,
-          firstTokenAmount,
-          expectedSecondTokenAmount,
-        });
-
-        // console.log("fees", fees);
-
-        let mlres = await mangataHelper.mintLiquidity({
-          pair: account.pair,
-          firstTokenId: mgxToken.id,
-          secondTokenId: turToken.id,
-          firstTokenAmount: firstTokenAmount - fees,
-          expectedSecondTokenAmount,
-        });
-        // console.log("mlres", mlres);
-        // TODO: activate liquidity mining
-        // figure out lp token amount
-        // await mangataHelper.activateLiquidityV2({
-        //     tokenId: liquidityTokenId,
-        //     amount:
-        // })
-      } else {
-        // console.log("rpt not zero");
-      }
-      if (rewardAmount === 0) {
-        // console.log(
-          "Reserved pool token is not zero but claimable rewards is. You might need to wait some time for it to accumulate ..."
-        );
-      }
+      // if (numReserved.toNumber() === 0) {
+      // console.log(
+      //   "Reserved pool token is zero; minting liquidity to generate rewards..."
+      // );
+      // const firstTokenAmount = 300;
+      // const MAX_SLIPPIAGE = 0.08; // 4% slippage; can’t be too large
+      // const poolRatio =
+      //   pool.firstTokenAmountFloat / pool.secondTokenAmountFloat;
+      // console.log("poolRatio", poolRatio);
+      // const expectedSecondTokenAmount =
+      //   (firstTokenAmount / poolRatio) * (1 + MAX_SLIPPIAGE);
+      // console.log(
+      //   "pool.firstTokenAmountFloat",
+      //   pool.firstTokenAmountFloat,
+      //   "pool.secondTokenAmountFloat",
+      //   pool.secondTokenAmountFloat,
+      //   "firstTokenAmount",
+      //   firstTokenAmount,
+      //   "expectedSecondTokenAmount",
+      //   expectedSecondTokenAmount
+      // );
+      // Estimate of fees; no need to be accurate
+      // const fees = await mangataHelper.getMintLiquidityFee({
+      //   pair: account.pair,
+      //   firstTokenId: mgxToken.id,
+      //   secondTokenId: turToken.id,
+      //   firstTokenAmount,
+      //   expectedSecondTokenAmount,
+      // });
+      // console.log("fees", fees);
+      // let mlres = await mangataHelper.mintLiquidity({
+      //   pair: account.pair,
+      //   firstTokenId: mgxToken.id,
+      //   secondTokenId: turToken.id,
+      //   firstTokenAmount: firstTokenAmount - fees,
+      //   expectedSecondTokenAmount,
+      // });
+      // console.log("mlres", mlres);
+      // figure out lp token amount
+      // await mangataHelper.activateLiquidityV2({
+      //     tokenId: liquidityTokenId,
+      //     amount:
+      // })
+      // }
+      // else {
+      //   console.log("rpt not zero");
+      // }
+      // if (rewardAmount === 0) {
+      //   console.log(
+      //     "Reserved pool token is not zero but claimable rewards is. You might need to wait some time for it to accumulate ..."
+      //   );
+      // }
 
       // console.log("rewardAmount", rewardAmount);
 
@@ -300,9 +294,9 @@ class AutoCompound {
         const { executionFee, xcmpFee } =
           await turingHelper.api.rpc.automationTime.queryFeeDetails(xcmpCall);
         // console.log("automationFeeDetails: ", {
-          executionFee: executionFee.toHuman(),
-          xcmpFee: xcmpFee.toHuman(),
-        });
+        //   executionFee: executionFee.toHuman(),
+        //   xcmpFee: xcmpFee.toHuman(),
+        // });
 
         // Get a TaskId from Turing rpc
         const taskId = await turingHelper.api.rpc.automationTime.generateTaskId(
@@ -317,12 +311,12 @@ class AutoCompound {
 
         // Listen XCM events on Mangata side
         // console.log(
-          `\n5. Keep Listening XCM events on ${mangataChainName} until ${moment(
-            timestampNextHour * 1000
-          ).format(
-            "YYYY-MM-DD HH:mm:ss"
-          )}(${timestampNextHour}) to verify that the task(taskId: ${taskId}, providerId: ${providedId}) will be successfully executed ...`
-        );
+        //   `\n5. Keep Listening XCM events on ${mangataChainName} until ${moment(
+        //     timestampNextHour * 1000
+        //   ).format(
+        //     "YYYY-MM-DD HH:mm:ss"
+        //   )}(${timestampNextHour}) to verify that the task(taskId: ${taskId}, providerId: ${providedId}) will be successfully executed ...`
+        // );
         await listenEvents(mangataHelper.api, "proxy", "ProxyExecuted");
 
         const nextHourExecutionTimeout = calculateTimeout(timestampNextHour);
@@ -348,14 +342,14 @@ class AutoCompound {
           mangataAddress
         );
         // console.log(
-          `\nAfter auto-compound, reserved ${poolName} is: ${newLiquidityBalance.reserved.toString()} planck ...`
-        );
+        //   `\nAfter auto-compound, reserved ${poolName} is: ${newLiquidityBalance.reserved.toString()} planck ...`
+        // );
 
         // console.log(
-          `${account.name} has compounded ${newLiquidityBalance.reserved
-            .sub(liquidityBalance.reserved)
-            .toString()} planck more ${poolName} ...`
-        );
+        //   `${account.name} has compounded ${newLiquidityBalance.reserved
+        //     .sub(liquidityBalance.reserved)
+        //     .toString()} planck more ${poolName} ...`
+        // );
 
         // console.log("\n5. Cancel task ...");
         const cancelTaskExtrinsic =
@@ -367,12 +361,12 @@ class AutoCompound {
         );
 
         // console.log(
-          `\n6. Keep Listening events on ${mangataChainName} until ${moment(
-            timestampTwoHoursLater * 1000
-          ).format(
-            "YYYY-MM-DD HH:mm:ss"
-          )}(${timestampTwoHoursLater}) to verify that the task was successfully canceled ...`
-        );
+        //   `\n6. Keep Listening events on ${mangataChainName} until ${moment(
+        //     timestampTwoHoursLater * 1000
+        //   ).format(
+        //     "YYYY-MM-DD HH:mm:ss"
+        //   )}(${timestampTwoHoursLater}) to verify that the task was successfully canceled ...`
+        // );
 
         const isTaskExecutedAgain = await listenEvents(
           mangataHelper.api,
diff --git a/src/utils/xcm/mangata/mangata.js b/src/utils/xcm/mangata/mangata.js
index b71f253..3fab941 100644
--- a/src/utils/xcm/mangata/mangata.js
+++ b/src/utils/xcm/mangata/mangata.js
@@ -53,15 +53,15 @@ async function main() {
   const mangataNativeToken = _.first(mangataHelper.config.assets);
 
   // console.log(
-    `\nTuring chain name: ${turingChainName}, native token: ${JSON.stringify(
-      turingNativeToken
-    )}`
-  );
+  //   `\nTuring chain name: ${turingChainName}, native token: ${JSON.stringify(
+  //     turingNativeToken
+  //   )}`
+  // );
   // console.log(
-    `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
-      mangataNativeToken
-    )}\n`
-  );
+  //   `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
+  //     mangataNativeToken
+  //   )}\n`
+  // );
 
   // console.log("Reading token and balance of Alice account ...");
   const keyPair = keyring.addFromUri("//Alice", undefined, "sr25519");
@@ -104,12 +104,12 @@ async function main() {
     mangataHelper.getDecimalsBySymbol(poolName)
   );
   // console.log(
-    `Before auto-compound, ${account.name} reserved ${poolName}: ${new BN(
-      liquidityBalance.reserved
-    )
-      .div(liquidityDecimalBN)
-      .toString()} ...`
-  );
+  //   `Before auto-compound, ${account.name} reserved ${poolName}: ${new BN(
+  //     liquidityBalance.reserved
+  //   )
+  //     .div(liquidityDecimalBN)
+  //     .toString()} ...`
+  // );
 
   // Create Mangata proxy call
   // console.log("\nStart to schedule an auto-compound call via XCM ...");
@@ -172,9 +172,9 @@ async function main() {
   const { executionFee, xcmpFee } =
     await turingHelper.api.rpc.automationTime.queryFeeDetails(xcmpCall);
   // console.log("automationFeeDetails: ", {
-    executionFee: executionFee.toHuman(),
-    xcmpFee: xcmpFee.toHuman(),
-  });
+  //   executionFee: executionFee.toHuman(),
+  //   xcmpFee: xcmpFee.toHuman(),
+  // });
 
   // Get a TaskId from Turing rpc
   const taskId = await turingHelper.api.rpc.automationTime.generateTaskId(
@@ -189,12 +189,12 @@ async function main() {
 
   // Listen XCM events on Mangata side
   // console.log(
-    `\n4. Keep Listening XCM events on ${parachainName} until ${moment(
-      executionTime * 1000
-    ).format(
-      "YYYY-MM-DD HH:mm:ss"
-    )}(${executionTime}) to verify that the task(taskId: ${taskId}, providerId: ${providedId}) will be successfully executed ...`
-  );
+  //   `\n4. Keep Listening XCM events on ${parachainName} until ${moment(
+  //     executionTime * 1000
+  //   ).format(
+  //     "YYYY-MM-DD HH:mm:ss"
+  //   )}(${executionTime}) to verify that the task(taskId: ${taskId}, providerId: ${providedId}) will be successfully executed ...`
+  // );
   await listenEvents(mangataHelper.api, "proxy", "ProxyExecuted");
 
   const isTaskExecuted = await listenEvents(
@@ -222,18 +222,18 @@ async function main() {
     liquidityDecimalBN
   );
   // console.log(
-    `\nAfter auto-compound, reserved ${poolName} is: ${newReservedBalanceBN} ${poolName} ...`
-  );
+  //   `\nAfter auto-compound, reserved ${poolName} is: ${newReservedBalanceBN} ${poolName} ...`
+  // );
 
   const reservedPlanckDeltaBN = newLiquidityBalance.reserved.sub(
     liquidityBalance.reserved
   );
   const reservedDeltaBN = reservedPlanckDeltaBN.div(liquidityDecimalBN);
   // console.log(
-    `${
-      account.name
-    } has compounded ${reservedDeltaBN.toString()} more ${poolName} ...`
-  );
+  //   `${
+  //     account.name
+  //   } has compounded ${reservedDeltaBN.toString()} more ${poolName} ...`
+  // );
 
   // console.log("\n5. Cancel task ...");
   const cancelTaskExtrinsic =
@@ -244,12 +244,12 @@ async function main() {
   const nextExecutionTimeout = calculateTimeout(nextExecutionTime);
 
   // console.log(
-    `\n6. Keep Listening events on ${parachainName} until ${moment(
-      nextExecutionTime * 1000
-    ).format(
-      "YYYY-MM-DD HH:mm:ss"
-    )}(${nextExecutionTime}) to verify that the task was successfully canceled ...`
-  );
+  //   `\n6. Keep Listening events on ${parachainName} until ${moment(
+  //     nextExecutionTime * 1000
+  //   ).format(
+  //     "YYYY-MM-DD HH:mm:ss"
+  //   )}(${nextExecutionTime}) to verify that the task was successfully canceled ...`
+  // );
 
   const isTaskExecutedAgain = await listenEvents(
     mangataHelper.api,
diff --git a/src/utils/xcm/mangata/setup-mangata.js b/src/utils/xcm/mangata/setup-mangata.js
index 2cadd41..3e5b593 100644
--- a/src/utils/xcm/mangata/setup-mangata.js
+++ b/src/utils/xcm/mangata/setup-mangata.js
@@ -41,15 +41,15 @@ async function main() {
   const mangataNativeToken = _.first(mangataHelper.config.assets);
 
   // console.log(
-    `\nTuring chain name: ${turingChainName}, native token: ${JSON.stringify(
-      turingNativeToken
-    )}`
-  );
+  //   `\nTuring chain name: ${turingChainName}, native token: ${JSON.stringify(
+  //     turingNativeToken
+  //   )}`
+  // );
   // console.log(
-    `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
-      mangataNativeToken
-    )}\n`
-  );
+  //   `Mangata chain name: ${mangataChainName}, native token: ${JSON.stringify(
+  //     mangataNativeToken
+  //   )}\n`
+  // );
 
   const keyPair = keyring.addFromUri("//Alice", undefined, "sr25519");
   keyPair.meta.name = "Alice";
@@ -75,8 +75,8 @@ async function main() {
   await mangataHelper.initIssuance(account.pair);
 
   // console.log(
-    `\n3. Minting tokens for ${account.name} on Maganta if balance is zero ...`
-  );
+  //   `\n3. Minting tokens for ${account.name} on Maganta if balance is zero ...`
+  // );
 
   // We are iterating all assets here for minting, but ROC is not used or required for this demo
   for (let i = 0; i < mangataTokens.length; i += 1) {
@@ -84,8 +84,8 @@ async function main() {
 
     if (balance === 0) {
       // console.log(
-        `[${account.name}] ${symbol} balance on Mangata is zero; minting ${symbol} with sudo ...`
-      );
+      //   `[${account.name}] ${symbol} balance on Mangata is zero; minting ${symbol} with sudo ...`
+      // );
       // Because sending extrinsic in parallel will cause repeated nonce errors
       // we need to wait for the previous extrinsic to be finalized before sending the extrinsic.
       await mangataHelper.mintToken(mangataAddress, symbol, account.pair);
@@ -94,8 +94,8 @@ async function main() {
 
   // If there is no proxy, add a proxy of Turing on Mangata
   // console.log(
-    "\n4. Add a proxy on Mangata for paraId 2114, or skip this step if that exists ..."
-  );
+  //   "\n4. Add a proxy on Mangata for paraId 2114, or skip this step if that exists ..."
+  // );
 
   const proxyAddress = mangataHelper.getProxyAccount(
     mangataAddress,
@@ -114,20 +114,19 @@ async function main() {
   if (proxyMatch) {
     // console.log(`Found proxy of ${account.address} on Mangata: `, proxyMatch);
   } else {
-    if (_.isEmpty(proxies)) {
-      // console.log(`Proxy array of ${account.address} is empty ...`);
-    } else {
-      // console.log(
-        "Proxy not found. Expected",
-        matchCondition,
-        "Actual",
-        proxies
-      );
-    }
-
+    // if (_.isEmpty(proxies)) {
+    // console.log(`Proxy array of ${account.address} is empty ...`);
+    // } else {
     // console.log(
-      `Adding a proxy for paraId ${turingHelper.config.paraId}. Proxy address: ${proxyAddress} ...`
-    );
+    //   "Proxy not found. Expected",
+    //   matchCondition,
+    //   "Actual",
+    //   proxies
+    // );
+    // }
+    // console.log(
+    //   `Adding a proxy for paraId ${turingHelper.config.paraId}. Proxy address: ${proxyAddress} ...`
+    // );
     await mangataHelper.addProxy(proxyAddress, proxyType, account.pair);
   }
 
@@ -153,8 +152,8 @@ async function main() {
     // Create a MGR-TUR pool is not found
     if (_.isUndefined(poolFound)) {
       // console.log(
-        `No ${poolName} pool found; creating a ${poolName} pool with ${account.name} ...`
-      );
+      //   `No ${poolName} pool found; creating a ${poolName} pool with ${account.name} ...`
+      // );
 
       const parachainTokenDeposit = 10000; // Add 10,000 initial MGR to pool
       const turingTokenDeposit = 1000; // Add 1,000 initial TUR to pool
@@ -169,8 +168,8 @@ async function main() {
 
       // Update assets
       // console.log(
-        `\nChecking out assets after pool creation; there should be a new ${poolName} token ...`
-      );
+      //   `\nChecking out assets after pool creation; there should be a new ${poolName} token ...`
+      // );
       await mangataHelper.updateAssets();
     } else {
       // console.log(`An existing ${poolName} pool found; skip pool creation ...`);
diff --git a/src/utils/xcm/rocstar.js b/src/utils/xcm/rocstar.js
index 4d5315b..a2994ed 100644
--- a/src/utils/xcm/rocstar.js
+++ b/src/utils/xcm/rocstar.js
@@ -50,8 +50,8 @@ const scheduleTask = async ({
   // console.log(`Encoded call weight: ${encodedCallWeight}`);
 
   // console.log(
-    "\nb) Prepare automationTime.scheduleXcmpTask extrinsic for XCM ..."
-  );
+  //   "\nb) Prepare automationTime.scheduleXcmpTask extrinsic for XCM ..."
+  // );
 
   // Schedule an XCMP task from Turing’s timeAutomation pallet
   // The parameter "Fixed: { executionTimes: [0] }" will trigger the task immediately, while in real world usage Recurring can achieve every day or every week
@@ -88,8 +88,8 @@ const scheduleTask = async ({
   // console.log(`requireWeightAtMost: ${requireWeightAtMost}`);
 
   // console.log(
-    `\nc) Execute the above an XCM from ${shibuyaHelper.config.name} to schedule a task on ${turingHelper.config.name} ...`
-  );
+  //   `\nc) Execute the above an XCM from ${shibuyaHelper.config.name} to schedule a task on ${turingHelper.config.name} ...`
+  // );
   const feePerSecond = await turingHelper.getFeePerSecond(paraTokenIdOnTuring);
   const xcmpExtrinsic = shibuyaHelper.createTransactExtrinsic({
     targetParaId: turingHelper.config.paraId,
@@ -102,13 +102,13 @@ const scheduleTask = async ({
   await sendExtrinsic(shibuyaHelper.api, xcmpExtrinsic, keyPair);
 
   // console.log(`\nAt this point if the XCM succeeds, you should see the below events on both chains:\n
-  1. Shibuya\n
-  xcmpQueue.XcmpMessageSent and polkadotXcm.Sent - an XCM is successfully sent from Shibuya to Turing to schedule a task.\n
-  2. Turing Dev\n
-  a) proxy.ProxyExecuted and automationTime.TaskScheduled - the above XCM is received and executed on Turing.\n
-  b) xcmpHandler.XcmTransactedLocally, xcmpQueue.XcmpMessageSent, xcmpHandler.XcmSent and automationTime.XcmpTaskSucceeded - the task is triggered and its payload is sent to Shibuya via XCM.\n
-  3. Shibuya\n
-  proxy.ProxyExecuted and xcmpQueue.Success - the above payload is received and executed.\n`);
+  // 1. Shibuya\n
+  // xcmpQueue.XcmpMessageSent and polkadotXcm.Sent - an XCM is successfully sent from Shibuya to Turing to schedule a task.\n
+  // 2. Turing Dev\n
+  // a) proxy.ProxyExecuted and automationTime.TaskScheduled - the above XCM is received and executed on Turing.\n
+  // b) xcmpHandler.XcmTransactedLocally, xcmpQueue.XcmpMessageSent, xcmpHandler.XcmSent and automationTime.XcmpTaskSucceeded - the task is triggered and its payload is sent to Shibuya via XCM.\n
+  // 3. Shibuya\n
+  // proxy.ProxyExecuted and xcmpQueue.Success - the above payload is received and executed.\n`);
 
   const taskIdCodec = await turingHelper.api.rpc.automationTime.generateTaskId(
     turingAddress,
@@ -132,10 +132,10 @@ const main = async () => {
 
   // console.log(`\nTuring chain key: ${turingChainName}`);
   // console.log(
-    `Parachain name: ${parachainName}, native token: ${JSON.stringify(
-      parachainNativeToken
-    )}\n`
-  );
+  //   `Parachain name: ${parachainName}, native token: ${JSON.stringify(
+  //     parachainNativeToken
+  //   )}\n`
+  // );
 
   const json = await readMnemonicFromFile();
   const keyPair = keyring.addFromJson(json);
@@ -150,8 +150,8 @@ const main = async () => {
   const decimalBN = getDecimalBN(parachainNativeToken.decimals);
 
   // console.log(
-    `\nUser ${account.name} ${turingChainName} address: ${turingAddress}, ${parachainName} address: ${parachainAddress}`
-  );
+  //   `\nUser ${account.name} ${turingChainName} address: ${turingAddress}, ${parachainName} address: ${parachainAddress}`
+  // );
 
   const paraTokenIdOnTuring = await turingHelper.getAssetIdByParaId(
     shibuyaHelper.config.paraId
@@ -162,8 +162,8 @@ const main = async () => {
   // We also need to transfer tokens to the proxy account to pay for XCM and task execution fees
   // console.log(`\n1. One-time proxy setup on ${parachainName} ...`);
   // console.log(
-    `\na) Add a proxy for ${account.name} If there is none setup on ${parachainName} (paraId:${turingHelper.config.paraId}) \n`
-  );
+  //   `\na) Add a proxy for ${account.name} If there is none setup on ${parachainName} (paraId:${turingHelper.config.paraId}) \n`
+  // );
 
   const proxyTypeParachain = "Any"; // We cannotset proxyType to "DappsStaking" without the actual auto-restake call
   const proxyOnParachain = shibuyaHelper.getProxyAccount(
@@ -178,12 +178,12 @@ const main = async () => {
 
   if (proxyMatch) {
     // console.log(
-      `Proxy address ${proxyOnParachain} for paraId: ${turingHelper.config.paraId} and proxyType: ${proxyTypeParachain} already exists; skipping creation ...`
-    );
+    //   `Proxy address ${proxyOnParachain} for paraId: ${turingHelper.config.paraId} and proxyType: ${proxyTypeParachain} already exists; skipping creation ...`
+    // );
   } else {
     // console.log(
-      `Add a proxy of ${turingChainName} (paraId:${turingHelper.config.paraId}) and proxyType: ${proxyTypeParachain} on ${parachainName} ...\n Proxy address: ${proxyOnParachain}\n`
-    );
+    //   `Add a proxy of ${turingChainName} (paraId:${turingHelper.config.paraId}) and proxyType: ${proxyTypeParachain} on ${parachainName} ...\n Proxy address: ${proxyOnParachain}\n`
+    // );
     await sendExtrinsic(
       shibuyaHelper.api,
       shibuyaHelper.api.tx.proxy.addProxy(
@@ -210,14 +210,14 @@ const main = async () => {
   } else {
     const freeAmount = new BN(balance.free).div(decimalBN);
     // console.log(
-      `\nb) Proxy’s balance is ${freeAmount.toString()}, no need to top it up with SBY transfer ...`
-    );
+    //   `\nb) Proxy’s balance is ${freeAmount.toString()}, no need to top it up with SBY transfer ...`
+    // );
   }
 
   // console.log("\n2. One-time proxy setup on Turing");
   // console.log(
-    `\na) Add a proxy for Alice If there is none setup on Turing (paraId:${shibuyaHelper.config.paraId})\n`
-  );
+  //   `\na) Add a proxy for Alice If there is none setup on Turing (paraId:${shibuyaHelper.config.paraId})\n`
+  // );
   const proxyTypeTuring = "Any";
   const proxyOnTuring = turingHelper.getProxyAccount(
     turingAddress,
@@ -232,12 +232,12 @@ const main = async () => {
 
   if (proxyMatchTuring) {
     // console.log(
-      `Proxy address ${proxyOnTuring} for paraId: ${shibuyaHelper.config.paraId} and proxyType: ${proxyTypeTuring} already exists; skipping creation ...`
-    );
+    //   `Proxy address ${proxyOnTuring} for paraId: ${shibuyaHelper.config.paraId} and proxyType: ${proxyTypeTuring} already exists; skipping creation ...`
+    // );
   } else {
     // console.log(
-      `Add a proxy of ${parachainName} (paraId:${shibuyaHelper.config.paraId}) and proxyType: ${proxyTypeTuring} on Turing ...\n Proxy address: ${proxyOnTuring}\n`
-    );
+    //   `Add a proxy of ${parachainName} (paraId:${shibuyaHelper.config.paraId}) and proxyType: ${proxyTypeTuring} on Turing ...\n Proxy address: ${proxyOnTuring}\n`
+    // );
     await sendExtrinsic(
       turingHelper.api,
       turingHelper.api.tx.proxy.addProxy(proxyOnTuring, proxyTypeTuring, 0),
@@ -254,8 +254,8 @@ const main = async () => {
 
   if (balanceOnTuring.free.lt(minBalanceOnTuring)) {
     // console.log(
-      `\nb) Topping up the proxy account on ${turingChainName} via reserve transfer ...`
-    );
+    //   `\nb) Topping up the proxy account on ${turingChainName} via reserve transfer ...`
+    // );
     const topUpAmount = new BN(1000, 10);
     const topUpAmountBN = topUpAmount.mul(decimalBN);
     const reserveTransferAssetsExtrinsic =
@@ -270,15 +270,15 @@ const main = async () => {
       keyPair
     );
   } else {
-    const freeBalanceOnTuring = new BN(balanceOnTuring.free).div(decimalBN);
+    // const freeBalanceOnTuring = new BN(balanceOnTuring.free).div(decimalBN);
     // console.log(
-      `\nb) Proxy’s balance is ${freeBalanceOnTuring.toString()}, no need to top it up with reserve transfer ...`
-    );
+    //   `\nb) Proxy’s balance is ${freeBalanceOnTuring.toString()}, no need to top it up with reserve transfer ...`
+    // );
   }
 
   // console.log(
-    `\n3. Execute an XCM from ${parachainName} to schedule a task on ${turingChainName} ...`
-  );
+  //   `\n3. Execute an XCM from ${parachainName} to schedule a task on ${turingChainName} ...`
+  // );
 
   const result = await scheduleTask({
     turingHelper,
@@ -291,15 +291,15 @@ const main = async () => {
   });
 
   const { taskId, providedId, executionTime } = result;
-  const timeout = calculateTimeout(executionTime);
+  // const timeout = calculateTimeout(executionTime);
 
   // console.log(
-    `\n4. Keep Listening events on ${parachainName} until ${moment(
-      executionTime * 1000
-    ).format(
-      "YYYY-MM-DD HH:mm:ss"
-    )}(${executionTime}) to verify that the task(taskId: ${taskId}, providerId: ${providedId}) will be successfully executed ...`
-  );
+  //   `\n4. Keep Listening events on ${parachainName} until ${moment(
+  //     executionTime * 1000
+  //   ).format(
+  //     "YYYY-MM-DD HH:mm:ss"
+  //   )}(${executionTime}) to verify that the task(taskId: ${taskId}, providerId: ${providedId}) will be successfully executed ...`
+  // );
   const isTaskExecuted = await listenEvents(
     shibuyaHelper.api,
     "proxy",
@@ -323,12 +323,12 @@ const main = async () => {
   const nextExecutionTimeout = calculateTimeout(nextExecutionTime);
 
   // console.log(
-    `\n6. Keep Listening events on ${parachainName} until ${moment(
-      nextExecutionTime * 1000
-    ).format(
-      "YYYY-MM-DD HH:mm:ss"
-    )}(${nextExecutionTime}) to verify that the task was successfully canceled ...`
-  );
+  //   `\n6. Keep Listening events on ${parachainName} until ${moment(
+  //     nextExecutionTime * 1000
+  //   ).format(
+  //     "YYYY-MM-DD HH:mm:ss"
+  //   )}(${nextExecutionTime}) to verify that the task was successfully canceled ...`
+  // );
 
   const isTaskExecutedAgain = await listenEvents(
     shibuyaHelper.api,
diff --git a/src/utils/xcm/shibuya.js b/src/utils/xcm/shibuya.js
index a236159..51407e5 100644
--- a/src/utils/xcm/shibuya.js
+++ b/src/utils/xcm/shibuya.js
@@ -2,8 +2,8 @@ import _ from "lodash";
 import Keyring from "@polkadot/keyring";
 import BN from "bn.js";
 import moment from "moment";
-import TuringHelper from "./common/turingHelper";
-import ShibuyaHelper from "./common/shibuyaHelper";
+// import TuringHelper from "./common/turingHelper";
+// import ShibuyaHelper from "./common/shibuyaHelper";
 import {
   sendExtrinsic,
   getDecimalBN,
@@ -50,8 +50,8 @@ const scheduleTask = async ({
   // console.log(`Encoded call weight: ${encodedCallWeight}`);
 
   // console.log(
-    "\nb) Prepare automationTime.scheduleXcmpTask extrinsic for XCM ..."
-  );
+  //   "\nb) Prepare automationTime.scheduleXcmpTask extrinsic for XCM ..."
+  // );
 
   // Schedule an XCMP task from Turing’s timeAutomation pallet
   // The parameter "Fixed: { executionTimes: [0] }" will trigger the task immediately, while in real world usage Recurring can achieve every day or every week
@@ -88,8 +88,8 @@ const scheduleTask = async ({
   // console.log(`requireWeightAtMost: ${requireWeightAtMost}`);
 
   // console.log(
-    `\nc) Execute the above an XCM from ${shibuyaHelper.config.name} to schedule a task on ${turingHelper.config.name} ...`
-  );
+  //   `\nc) Execute the above an XCM from ${shibuyaHelper.config.name} to schedule a task on ${turingHelper.config.name} ...`
+  // );
   const feePerSecond = await turingHelper.getFeePerSecond(paraTokenIdOnTuring);
   const xcmpExtrinsic = shibuyaHelper.createTransactExtrinsic({
     targetParaId: turingHelper.config.paraId,
@@ -103,13 +103,13 @@ const scheduleTask = async ({
   await sendExtrinsic(shibuyaHelper.api, xcmpExtrinsic, keyPair);
 
   // console.log(`\nAt this point if the XCM succeeds, you should see the below events on both chains:\n
-  1. Shibuya\n
-  xcmpQueue.XcmpMessageSent and polkadotXcm.Sent - an XCM is successfully sent from Shibuya to Turing to schedule a task.\n
-  2. Turing Dev\n
-  a) proxy.ProxyExecuted and automationTime.TaskScheduled - the above XCM is received and executed on Turing.\n
-  b) xcmpHandler.XcmTransactedLocally, xcmpQueue.XcmpMessageSent, xcmpHandler.XcmSent and automationTime.XcmpTaskSucceeded - the task is triggered and its payload is sent to Shibuya via XCM.\n
-  3. Shibuya\n
-  proxy.ProxyExecuted and xcmpQueue.Success - the above payload is received and executed.\n`);
+  // 1. Shibuya\n
+  // xcmpQueue.XcmpMessageSent and polkadotXcm.Sent - an XCM is successfully sent from Shibuya to Turing to schedule a task.\n
+  // 2. Turing Dev\n
+  // a) proxy.ProxyExecuted and automationTime.TaskScheduled - the above XCM is received and executed on Turing.\n
+  // b) xcmpHandler.XcmTransactedLocally, xcmpQueue.XcmpMessageSent, xcmpHandler.XcmSent and automationTime.XcmpTaskSucceeded - the task is triggered and its payload is sent to Shibuya via XCM.\n
+  // 3. Shibuya\n
+  // proxy.ProxyExecuted and xcmpQueue.Success - the above payload is received and executed.\n`);
 
   const taskIdCodec = await turingHelper.api.rpc.automationTime.generateTaskId(
     turingAddress,
@@ -133,10 +133,10 @@ const main = async () => {
 
   // console.log(`\nTuring chain key: ${turingChainName}`);
   // console.log(
-    `Parachain name: ${parachainName}, native token: ${JSON.stringify(
-      parachainNativeToken
-    )}\n`
-  );
+  //   `Parachain name: ${parachainName}, native token: ${JSON.stringify(
+  //     parachainNativeToken
+  //   )}\n`
+  // );
 
   const accountName = "Alice";
 
@@ -154,8 +154,8 @@ const main = async () => {
   const decimalBN = getDecimalBN(parachainNativeToken.decimals);
 
   // console.log(
-    `\nUser ${account.name} ${turingChainName} address: ${turingAddress}, ${parachainName} address: ${parachainAddress}`
-  );
+  //   `\nUser ${account.name} ${turingChainName} address: ${turingAddress}, ${parachainName} address: ${parachainAddress}`
+  // );
 
   const paraTokenIdOnTuring = await turingHelper.getAssetIdByParaId(
     shibuyaHelper.config.paraId
@@ -166,8 +166,8 @@ const main = async () => {
   // We also need to transfer tokens to the proxy account to pay for XCM and task execution fees
   // console.log(`\n1. One-time proxy setup on ${parachainName} ...`);
   // console.log(
-    `\na) Add a proxy for ${account.name} If there is none setup on ${parachainName} (paraId:${turingHelper.config.paraId}) \n`
-  );
+  //   `\na) Add a proxy for ${account.name} If there is none setup on ${parachainName} (paraId:${turingHelper.config.paraId}) \n`
+  // );
 
   const proxyTypeParachain = "Any"; // We cannotset proxyType to "DappsStaking" without the actual auto-restake call
   const proxyOnParachain = shibuyaHelper.getProxyAccount(
@@ -182,12 +182,12 @@ const main = async () => {
 
   if (proxyMatch) {
     // console.log(
-      `Proxy address ${proxyOnParachain} for paraId: ${turingHelper.config.paraId} and proxyType: ${proxyTypeParachain} already exists; skipping creation ...`
-    );
+    //   `Proxy address ${proxyOnParachain} for paraId: ${turingHelper.config.paraId} and proxyType: ${proxyTypeParachain} already exists; skipping creation ...`
+    // );
   } else {
     // console.log(
-      `Add a proxy of ${turingChainName} (paraId:${turingHelper.config.paraId}) and proxyType: ${proxyTypeParachain} on ${parachainName} ...\n Proxy address: ${proxyOnParachain}\n`
-    );
+    //   `Add a proxy of ${turingChainName} (paraId:${turingHelper.config.paraId}) and proxyType: ${proxyTypeParachain} on ${parachainName} ...\n Proxy address: ${proxyOnParachain}\n`
+    // );
     await sendExtrinsic(
       shibuyaHelper.api,
       shibuyaHelper.api.tx.proxy.addProxy(
@@ -214,14 +214,14 @@ const main = async () => {
   } else {
     const freeAmount = new BN(balance.free).div(decimalBN);
     // console.log(
-      `\nb) Proxy’s balance is ${freeAmount.toString()}, no need to top it up with SBY transfer ...`
-    );
+    //   `\nb) Proxy’s balance is ${freeAmount.toString()}, no need to top it up with SBY transfer ...`
+    // );
   }
 
   // console.log("\n2. One-time proxy setup on Turing");
   // console.log(
-    `\na) Add a proxy for Alice If there is none setup on Turing (paraId:${shibuyaHelper.config.paraId})\n`
-  );
+  //   `\na) Add a proxy for Alice If there is none setup on Turing (paraId:${shibuyaHelper.config.paraId})\n`
+  // );
   const proxyTypeTuring = "Any";
   const proxyOnTuring = turingHelper.getProxyAccount(
     turingAddress,
@@ -236,12 +236,12 @@ const main = async () => {
 
   if (proxyMatchTuring) {
     // console.log(
-      `Proxy address ${proxyOnTuring} for paraId: ${shibuyaHelper.config.paraId} and proxyType: ${proxyTypeTuring} already exists; skipping creation ...`
-    );
+    //   `Proxy address ${proxyOnTuring} for paraId: ${shibuyaHelper.config.paraId} and proxyType: ${proxyTypeTuring} already exists; skipping creation ...`
+    // );
   } else {
     // console.log(
-      `Add a proxy of ${parachainName} (paraId:${shibuyaHelper.config.paraId}) and proxyType: ${proxyTypeTuring} on Turing ...\n Proxy address: ${proxyOnTuring}\n`
-    );
+    //   `Add a proxy of ${parachainName} (paraId:${shibuyaHelper.config.paraId}) and proxyType: ${proxyTypeTuring} on Turing ...\n Proxy address: ${proxyOnTuring}\n`
+    // );
     await sendExtrinsic(
       turingHelper.api,
       turingHelper.api.tx.proxy.addProxy(proxyOnTuring, proxyTypeTuring, 0),
@@ -258,8 +258,8 @@ const main = async () => {
 
   if (balanceOnTuring.free.lt(minBalanceOnTuring)) {
     // console.log(
-      `\nb) Topping up the proxy account on ${turingChainName} via reserve transfer ...`
-    );
+    //   `\nb) Topping up the proxy account on ${turingChainName} via reserve transfer ...`
+    // );
     const topUpAmount = new BN(1000, 10);
     const topUpAmountBN = topUpAmount.mul(decimalBN);
     const reserveTransferAssetsExtrinsic =
@@ -276,13 +276,13 @@ const main = async () => {
   } else {
     const freeBalanceOnTuring = new BN(balanceOnTuring.free).div(decimalBN);
     // console.log(
-      `\nb) Proxy’s balance is ${freeBalanceOnTuring.toString()}, no need to top it up with reserve transfer ...`
-    );
+    //   `\nb) Proxy’s balance is ${freeBalanceOnTuring.toString()}, no need to top it up with reserve transfer ...`
+    // );
   }
 
   // console.log(
-    `\n3. Execute an XCM from ${parachainName} to schedule a task on ${turingChainName} ...`
-  );
+  //   `\n3. Execute an XCM from ${parachainName} to schedule a task on ${turingChainName} ...`
+  // );
 
   const result = await scheduleTask({
     turingHelper,
@@ -298,12 +298,12 @@ const main = async () => {
   const timeout = calculateTimeout(executionTime);
 
   // console.log(
-    `\n4. Keep Listening events on ${parachainName} until ${moment(
-      executionTime * 1000
-    ).format(
-      "YYYY-MM-DD HH:mm:ss"
-    )}(${executionTime}) to verify that the task(taskId: ${taskId}, providerId: ${providedId}) will be successfully executed ...`
-  );
+  //   `\n4. Keep Listening events on ${parachainName} until ${moment(
+  //     executionTime * 1000
+  //   ).format(
+  //     "YYYY-MM-DD HH:mm:ss"
+  //   )}(${executionTime}) to verify that the task(taskId: ${taskId}, providerId: ${providedId}) will be successfully executed ...`
+  // );
   const isTaskExecuted = await listenEvents(
     shibuyaHelper.api,
     "proxy",
@@ -327,12 +327,12 @@ const main = async () => {
   const nextExecutionTimeout = calculateTimeout(nextExecutionTime);
 
   // console.log(
-    `\n6. Keep Listening events on ${parachainName} until ${moment(
-      nextExecutionTime * 1000
-    ).format(
-      "YYYY-MM-DD HH:mm:ss"
-    )}(${nextExecutionTime}) to verify that the task was successfully canceled ...`
-  );
+  //   `\n6. Keep Listening events on ${parachainName} until ${moment(
+  //     nextExecutionTime * 1000
+  //   ).format(
+  //     "YYYY-MM-DD HH:mm:ss"
+  //   )}(${nextExecutionTime}) to verify that the task was successfully canceled ...`
+  // );
 
   const isTaskExecutedAgain = await listenEvents(
     shibuyaHelper.api,

From bc6aad95c84ab1670e5aa38cf6f0f9afb8af64d3 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 23 Aug 2023 16:03:59 +0530
Subject: [PATCH 16/27] fix: input issues in stable

---
 src/components/App/index.tsx                  |  12 +-
 .../AddLiquidityModal/AddSectionStable.tsx    |  24 ++--
 .../AddLiquidityModal/AddSectionStandard.tsx  | 133 +-----------------
 .../Library/AddLiquidityModal/TokenInput.tsx  |  24 ++--
 4 files changed, 28 insertions(+), 165 deletions(-)

diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index 2e041ec..894039e 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -90,13 +90,11 @@ const Home: NextPage = () => {
 
   useEffect(() => {
     if (router.query.id) {
-      router.push(
-        `${
-          typeof window !== "undefined"
-            ? `http://${window.location.host}` // for testing locally
-            : "https://list.yieldbay.io"
-        }/farm/${router.query.id}?addr=${router.query.farm}`
-      );
+      const url =
+        typeof window !== "undefined"
+          ? `http://${window.location.host}` // for testing locally
+          : "https://list.yieldbay.io";
+      router.push(`${url}/farm/${router.query.id}?addr=${router.query.farm}`);
     }
   }, [router]);
 
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index 894e710..1848345 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -500,22 +500,14 @@ const AddSectionStable: FC = () => {
               {estLpAmount < 0.01 ? "<0.01" : toUnits(estLpAmount, 2)}
             </span>
             {/* Make a mapping here */}
-            <div className="z-10 flex overflow-hidden rounded-full">
-              <Image
-                src={farm?.asset.logos[0] as string}
-                alt={farm?.asset.logos[0] as string}
-                width={24}
-                height={24}
-              />
-            </div>
-            <div className="z-10 flex overflow-hidden rounded-full">
-              <Image
-                src={farm?.asset.logos[1] as string}
-                alt={farm?.asset.logos[1] as string}
-                width={24}
-                height={24}
-              />
-            </div>
+            {farm?.asset.logos.map((logo, index) => (
+              <div
+                key={logo}
+                className="z-10 flex overflow-hidden rounded-full"
+              >
+                <Image src={logo} alt={logo} width={24} height={24} />
+              </div>
+            ))}
           </div>
           <p>{farm?.asset.symbol} Tokens</p>
         </div>
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index 1c7d779..0983887 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -10,7 +10,7 @@ import {
 import { useAtom } from "jotai";
 import clsx from "clsx";
 import Image from "next/image";
-import { parseAbi, parseUnits, parseEther } from "viem";
+import { parseAbi } from "viem";
 import {
   useAccount,
   useBalance,
@@ -26,17 +26,11 @@ import { CogIcon } from "@heroicons/react/solid";
 // Component, Util and Hook Imports
 import MButton from "@components/Library/MButton";
 import Spinner from "@components/Library/Spinner";
-import {
-  addLiqModalOpenAtom,
-  evmPosLoadingAtom,
-  lpUpdatedAtom,
-  slippageModalOpenAtom,
-} from "@store/commonAtoms";
+import { addLiqModalOpenAtom, slippageModalOpenAtom } from "@store/commonAtoms";
 import {
   selectedFarmAtom,
   slippageAtom,
   tokenPricesAtom,
-  farmsAtom,
   positionsAtom,
   lpTokenPricesAtom,
 } from "@store/atoms";
@@ -56,10 +50,7 @@ import { getNativeTokenAddress } from "@utils/network";
 import WrongNetworkModal from "../WrongNetworkModal";
 import { handleAddLiquidityEvent } from "@utils/tracking";
 import getTimestamp from "@utils/getTimestamp";
-import {
-  // fetchEvmPositions,
-  updateEvmPositions,
-} from "@utils/position-utils/evmPositions";
+import { updateEvmPositions } from "@utils/position-utils/evmPositions";
 import BigNumber from "bignumber.js";
 import Countdown from "../Countdown";
 import { createNumRegex } from "@utils/createRegex";
@@ -87,12 +78,9 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const [isSlippageModalOpen, setIsSlippageModalOpen] = useAtom(
     slippageModalOpenAtom
   );
-  const [farms] = useAtom(farmsAtom);
   const [positions, setPositions] = useAtom(positionsAtom);
   const [lpTokenPricesMap] = useAtom(lpTokenPricesAtom);
   const [tokenPricesMap] = useAtom(tokenPricesAtom);
-  // const [, setIsEvmPosLoading] = useAtom(evmPosLoadingAtom);
-  // const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
 
   const [SLIPPAGE] = useAtom(slippageAtom);
   const [txnHash, setTxnHash] = useState<string>("");
@@ -124,121 +112,6 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     selectedFarm?.protocol!,
     selectedFarm?.router!
   );
-  // let iface = new ethers.Interface(
-  //   getRouterAbi(
-  //     selectedFarm?.protocol!,
-  //     selectedFarm?.farmType == "StandardAmm" ? false : true
-  //   )
-  // );
-  // const fdata = new ethers.Interface(
-  //   getRouterAbi(
-  //     selectedFarm?.protocol!,
-  //     selectedFarm?.farmType == "StandardAmm" ? false : true
-  //   )
-  // ).encodeFunctionData(
-  //   getAddLiqFunctionName(selectedFarm?.protocol as string) as any,
-  //   [
-  //     farmAsset0?.address, // TokenA Address
-  //     farmAsset1?.address, // TokenB Address
-  //     // 1,
-  //     // 1,
-  //     // 1,
-  //     // 1,
-  //     parseUnits(
-  //       `${
-  //         firstTokenAmount == "" || firstTokenAmount == "0"
-  //           ? 1
-  //           : parseFloat(firstTokenAmount)
-  //       }`,
-  //       farmAsset0?.decimals
-  //     ),
-  //     parseUnits(
-  //       `${
-  //         secondTokenAmount == "" || secondTokenAmount == "0"
-  //           ? 1 /
-  //             getPoolRatio(
-  //               reserve0,
-  //               reserve1,
-  //               farmAsset0.decimals,
-  //               farmAsset1.decimals
-  //             )
-  //           : parseFloat(secondTokenAmount)
-  //       }`,
-  //       farmAsset1?.decimals
-  //     ),
-  //     parseUnits(
-  //       `${
-  //         (firstTokenAmount == "" || firstTokenAmount == "0"
-  //           ? 1
-  //           : parseFloat(firstTokenAmount) * (100 - SLIPPAGE)) / 100
-  //       }`,
-  //       farmAsset0?.decimals
-  //     ), // amountAMin
-  //     parseUnits(
-  //       `${
-  //         (secondTokenAmount == "" || secondTokenAmount == "0"
-  //           ? 1 /
-  //             getPoolRatio(
-  //               reserve0,
-  //               reserve1,
-  //               farmAsset0.decimals,
-  //               farmAsset1.decimals
-  //             )
-  //           : parseFloat(secondTokenAmount) * (100 - SLIPPAGE)) / 100
-  //       }`,
-  //       farmAsset1?.decimals
-  //     ), // amountBMin
-  //     address, // To
-  //     1784096161000, // deadline (uint256)
-  //   ]
-  // );
-  // const x = estimateGas(iface, fdata, selectedFarm!.router, address!);
-
-  // useEffect(function siriusReserves() {
-  //   if (selectedFarm?.protocol!.toLowerCase() == "sirius") {
-  //     const { data: bal0 } = useContractRead({
-  //       address: selectedFarm?.router!,
-  //       abi: parseAbi(siriusRouterAbi),
-  //       functionName: "getTokenBalance",
-  //       args: [0],
-  //       enabled: !!selectedFarm?.protocol! && !!selectedFarm?.router!,
-  //     });
-  //     const { data: bal1 } = useContractRead({
-  //       address: selectedFarm?.router!,
-  //       abi: parseAbi(siriusRouterAbi),
-  //       functionName: "getTokenBalance",
-  //       args: [1],
-  //       enabled: !!selectedFarm?.protocol! && !!selectedFarm?.router!,
-  //     });
-  //     reserve0 = (bal0 as bigint).toString();
-  //     reserve1 = (bal1 as bigint).toString();
-  //     // console.log("sirbal", bal0, bal1, router, selectedFarm?.protocol!);
-  //     // return {
-  //     //   reserve0: (bal0 as bigint).toString(),
-  //     //   reserve1: (bal1 as bigint).toString(),
-  //     // };
-  //   }
-  // });
-  // const { data: bal0 } = useContractRead({
-  //   address: selectedFarm?.router!,
-  //   abi: parseAbi(siriusRouterAbi),
-  //   functionName: "getTokenBalance",
-  //   args: [0],
-  //   enabled: !!selectedFarm?.protocol! && !!selectedFarm?.router!,
-  // });
-  // // eslint-disable-next-line react-hooks/rules-of-hooks
-  // const { data: bal1 } = useContractRead({
-  //   address: selectedFarm?.router!,
-  //   abi: parseAbi(siriusRouterAbi),
-  //   functionName: "getTokenBalance",
-  //   args: [1],
-  //   enabled: !!selectedFarm?.protocol! && !!selectedFarm?.router!,
-  // });
-  // // console.log("sirbal", bal0, bal1, router, selectedFarm?.protocol!);
-  // // return {
-  // //   reserve0: (bal0 as bigint).toString(),
-  // //   reserve1: (bal1 as bigint).toString(),
-  // // };
 
   const { minLpTokens, totalSupply } = useMinimumLPTokens(
     selectedFarm?.asset.address!,
diff --git a/src/components/Library/AddLiquidityModal/TokenInput.tsx b/src/components/Library/AddLiquidityModal/TokenInput.tsx
index 2ff13b8..8502a3c 100644
--- a/src/components/Library/AddLiquidityModal/TokenInput.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenInput.tsx
@@ -75,17 +75,17 @@ const TokenInput: React.FC<TokenInputProps> = ({
     }
   }, [isSuccess]);
 
-  function isAllTrue(isApprovingMap: { [address: string]: boolean }): boolean {
-    // Iterate over the keys in isApprovingMap
-    for (const address in isApprovingMap) {
-      // If any value is false, return false
-      if (!isApprovingMap[address]) {
-        return false;
-      }
-    }
-    // If all values are true, return true
-    return true;
-  }
+  // function isAllTrue(isApprovingMap: { [address: string]: boolean }): boolean {
+  //   // Iterate over the keys in isApprovingMap
+  //   for (const address in isApprovingMap) {
+  //     // If any value is false, return false
+  //     if (!isApprovingMap[address]) {
+  //       return false;
+  //     }
+  //   }
+  //   // If all values are true, return true
+  //   return true;
+  // }
 
   return (
     <div>
@@ -121,7 +121,7 @@ const TokenInput: React.FC<TokenInputProps> = ({
               : "text-[#4E4C4C]"
           )}
           min={0}
-          disabled={isAllTrue(isApproving)}
+          // disabled={isAllTrue(isApproving)}
           value={inputMap[token?.address] ?? ""}
           onChange={(event) => {
             event.preventDefault();

From fbd95aca0c047ba6ef2cce63bc2fb621ae178757 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 23 Aug 2023 16:04:34 +0530
Subject: [PATCH 17/27] revamped: useapprovalhooks improvised

---
 src/hooks/useApprovalHooks.ts | 91 +++++++++++++++++------------------
 1 file changed, 44 insertions(+), 47 deletions(-)

diff --git a/src/hooks/useApprovalHooks.ts b/src/hooks/useApprovalHooks.ts
index c4cd117..763c8dc 100644
--- a/src/hooks/useApprovalHooks.ts
+++ b/src/hooks/useApprovalHooks.ts
@@ -7,70 +7,63 @@ import {
   useWaitForTransaction,
 } from "wagmi";
 import { tokenAbi } from "@components/Common/Layout/evmUtils";
-import { useEffect } from "react";
+import { useEffect, useMemo } from "react";
 import toast from "react-hot-toast";
 import BigNumber from "bignumber.js";
 
+// Define known structure for tokenBalance (Modify as needed)
+interface TokenBalance {
+  decimals: number;
+  formatted: string;
+  symbol: string;
+  value: bigint;
+}
+
 /**
+ * Check if a token is approved.
  *
- * @param token Underlying Asset
- * @param spender spender Contract Address
- * @returns data, isLoading, isError, isSuccess
+ * @param tokenAddress Address of the token
+ * @param spender Contract address of the spender
+ * @param tokenBalance Balance of the token
+ * @param input Input value
+ * @returns Object containing data, isLoading, isError, and isSuccess
  */
 const useIsApprovedToken = (
   tokenAddress: Address,
   spender: Address,
-  tokenBalance: any | undefined,
+  tokenBalance: TokenBalance | undefined,
   input: number
 ) => {
   const { address } = useAccount();
+
   const { data, isLoading, isError } = useContractRead({
     address: tokenAddress,
     abi: parseAbi(tokenAbi),
-    functionName: "allowance" as any,
-    args: [
-      address, // owner
-      spender, // spender
-    ],
+    functionName: "allowance",
+    args: [address, spender], // owner, spender
     enabled: !!address && !!spender,
   });
 
-  const allow = data as bigint;
+  const allowanceRaw = data as bigint;
 
-  const allowance = BigNumber(allow?.toString() ?? "0", 10)
-    // .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
-    .decimalPlaces(0, 1);
+  const allowance = new BigNumber(
+    allowanceRaw?.toString() ?? "0"
+  ).decimalPlaces(0, 1);
   // // console.log("allowance bigint", allow);
   // console.log("allowance", allowance.toString());
 
-  // console.log("rawinput", input);
-  // console.log("tokenbalance", tokenBalance);
-
-  const inputAmount = BigNumber(input.toString(), 10)
-    .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
-    .decimalPlaces(0, 1);
-  // console.log("inputAmount", inputAmount.toString());
+  const inputAmount = useMemo(() => {
+    if (tokenBalance?.decimals && input) {
+      return new BigNumber(input.toString())
+        .multipliedBy(new BigNumber(10).pow(tokenBalance.decimals))
+        .decimalPlaces(0, 1);
+    }
+    return new BigNumber(0);
+  }, [tokenBalance, input]);
 
   const compare = inputAmount.isLessThanOrEqualTo(allowance);
   // console.log("compare", compare);
-
   // const isSuccess = useMemo(() => {
-  //   const numdata = Number(data) / 10 ** 12;
-  //   // // console.log(
-  //   //   "token_address",
-  //   //   tokenAddress,
-  //   //   "\ndata",
-  //   //   data,
-  //   //   "\nnumber_data",
-  //   //   numdata,
-  //   //   "\ntokenBalance",
-  //   //   parseFloat(tokenBalance ?? "0"),
-  //   //   "\nisApproved: should be true if data >= tokenBalance"
-  //   //   // !tokenBalance ? false : numdata >= formatData(parseFloat(tokenBalance))
-  //   //   // !input ? false : numdata >= formatData(parseFloat(tokenBalance))
-  //   // );
-
-  //   // allowed tokens >= token balance
   //   // return !tokenBalance
   //   //   ? false
   //   //   : numdata >= formatData(parseFloat(tokenBalance));
@@ -79,19 +72,22 @@ const useIsApprovedToken = (
 };
 
 /**
+ * Approve a token.
  *
- * @param token Underlying Asset
- * @param spender spender Contract Address
- * @returns data, isLoadingApproveCall, isLoadingApproveTxn, isError, isSuccessApproveCall, isSuccessApproveTxn, writeAsync
+ * @param tokenAddress Address of the token
+ * @param spender Contract address of the spender
+ * @param tokenSymbol Symbol of the token
+ * @param tokenBalance Balance of the token
+ * @returns Object containing various states and the writeAsync function
  */
 const useApproveToken = (
   tokenAddress: Address,
   spender: Address,
   tokenSymbol: string,
-  tokenBalance: any | undefined
+  tokenBalance: TokenBalance | undefined
 ) => {
   const { chain } = useNetwork();
-  // console.log("token", tokenSymbol, "\ntokenBalance", tokenBalance);
+
   const {
     data,
     isLoading: isLoadingApproveCall,
@@ -104,14 +100,15 @@ const useApproveToken = (
     functionName: "approve" as any,
     chainId: chain?.id,
     args: [
-      spender, // spender
-      BigNumber(tokenBalance?.formatted, 10)
-        .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals))
+      spender,
+      new BigNumber(tokenBalance?.formatted ?? "0")
+        .multipliedBy(new BigNumber(10).pow(tokenBalance?.decimals ?? 0))
         .decimalPlaces(0, 1)
         .toString(),
     ],
     onError: (error) => {
-      // console.log(`Error while Approving:`, error);
+      // This is just logging the error. Depending on your needs, you might want to show this to the user or take corrective action.
+      console.error(`Error while Approving:`, error);
     },
   });
 

From 9cca276b2658b0a7bba0d55ca0e95a1a04284007 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 23 Aug 2023 17:05:42 +0530
Subject: [PATCH 18/27] addstable fix

---
 .../Library/AddLiquidityModal/AddSectionStable.tsx       | 2 +-
 src/components/Library/AddLiquidityModal/TokenButton.tsx | 2 ++
 src/hooks/useApprovalHooks.ts                            | 9 ++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index 1848345..0926b3e 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -172,7 +172,7 @@ const AddSectionStable: FC = () => {
     // Setting inputMapAmount of amount array for calculation
     setInputMapAmount((pre: any) => ({
       ...pre,
-      [token.address]: isNaN(parseFloat(value)) ? 0 : value,
+      [token.address]: isNaN(parseFloat(value)) ? 0 : parseFloat(value),
     }));
   }, []);
 
diff --git a/src/components/Library/AddLiquidityModal/TokenButton.tsx b/src/components/Library/AddLiquidityModal/TokenButton.tsx
index 7b241d3..3ec3283 100644
--- a/src/components/Library/AddLiquidityModal/TokenButton.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenButton.tsx
@@ -56,6 +56,8 @@ const TokenButton: React.FC<Props> = ({
     inputMapAmount[token?.address]
   );
 
+  console.log("inputMapAmount[token?.address]", inputMapAmount, token?.address);
+
   // Approve token
   const {
     isLoadingApproveCall,
diff --git a/src/hooks/useApprovalHooks.ts b/src/hooks/useApprovalHooks.ts
index 763c8dc..f244879 100644
--- a/src/hooks/useApprovalHooks.ts
+++ b/src/hooks/useApprovalHooks.ts
@@ -49,8 +49,8 @@ const useIsApprovedToken = (
   const allowance = new BigNumber(
     allowanceRaw?.toString() ?? "0"
   ).decimalPlaces(0, 1);
-  // // console.log("allowance bigint", allow);
-  // console.log("allowance", allowance.toString());
+  // console.log("allowance bigint", allowance);
+  console.log("allowance", allowanceRaw);
 
   const inputAmount = useMemo(() => {
     if (tokenBalance?.decimals && input) {
@@ -61,8 +61,11 @@ const useIsApprovedToken = (
     return new BigNumber(0);
   }, [tokenBalance, input]);
 
+  console.log("input", input);
+  console.log("inputAmount", inputAmount);
+
   const compare = inputAmount.isLessThanOrEqualTo(allowance);
-  // console.log("compare", compare);
+  console.log("compare", compare);
   // const isSuccess = useMemo(() => {
   //   // return !tokenBalance
   //   //   ? false

From cdea57a81637d1911c59d8cc334bc383ef3d1d6e Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 23 Aug 2023 20:32:05 +0530
Subject: [PATCH 19/27] approval stable fix

---
 .../Library/AddLiquidityModal/TokenButton.tsx |  3 +-
 src/hooks/useApprovalHooks.ts                 | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/TokenButton.tsx b/src/components/Library/AddLiquidityModal/TokenButton.tsx
index 3ec3283..9eb8550 100644
--- a/src/components/Library/AddLiquidityModal/TokenButton.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenButton.tsx
@@ -56,8 +56,6 @@ const TokenButton: React.FC<Props> = ({
     inputMapAmount[token?.address]
   );
 
-  console.log("inputMapAmount[token?.address]", inputMapAmount, token?.address);
-
   // Approve token
   const {
     isLoadingApproveCall,
@@ -106,6 +104,7 @@ const TokenButton: React.FC<Props> = ({
     !inputMapAmount[token?.address] ||
     Object.keys(approvalMap).find((key) => key === token?.address)
   ) {
+    // console.log("ApprovalMap", approvalMap, !inputMapAmount[token?.address]);
     return <></>;
   }
 
diff --git a/src/hooks/useApprovalHooks.ts b/src/hooks/useApprovalHooks.ts
index f244879..a88e042 100644
--- a/src/hooks/useApprovalHooks.ts
+++ b/src/hooks/useApprovalHooks.ts
@@ -46,26 +46,29 @@ const useIsApprovedToken = (
 
   const allowanceRaw = data as bigint;
 
-  const allowance = new BigNumber(
-    allowanceRaw?.toString() ?? "0"
-  ).decimalPlaces(0, 1);
+  const allowance = BigNumber(allowanceRaw?.toString() ?? "0").decimalPlaces(
+    0,
+    1
+  );
   // console.log("allowance bigint", allowance);
-  console.log("allowance", allowanceRaw);
+  // console.log("allowance", allowanceRaw);
 
   const inputAmount = useMemo(() => {
     if (tokenBalance?.decimals && input) {
-      return new BigNumber(input.toString())
-        .multipliedBy(new BigNumber(10).pow(tokenBalance.decimals))
+      return BigNumber(input.toString())
+        .multipliedBy(BigNumber(10).pow(tokenBalance.decimals))
         .decimalPlaces(0, 1);
     }
-    return new BigNumber(0);
+    return BigNumber(0);
   }, [tokenBalance, input]);
 
-  console.log("input", input);
-  console.log("inputAmount", inputAmount);
+  // console.log("input", input);
 
-  const compare = inputAmount.isLessThanOrEqualTo(allowance);
-  console.log("compare", compare);
+  const compare =
+    input == undefined || input == 0
+      ? false
+      : inputAmount.isLessThanOrEqualTo(allowance);
+  // console.log("compare", compare);
   // const isSuccess = useMemo(() => {
   //   // return !tokenBalance
   //   //   ? false
@@ -104,8 +107,8 @@ const useApproveToken = (
     chainId: chain?.id,
     args: [
       spender,
-      new BigNumber(tokenBalance?.formatted ?? "0")
-        .multipliedBy(new BigNumber(10).pow(tokenBalance?.decimals ?? 0))
+      BigNumber(tokenBalance?.formatted ?? "0")
+        .multipliedBy(BigNumber(10).pow(tokenBalance?.decimals ?? 0))
         .decimalPlaces(0, 1)
         .toString(),
     ],
@@ -124,6 +127,9 @@ const useApproveToken = (
   useEffect(() => {
     if (isSuccessApproveTxn) {
       toast(`${tokenSymbol} Approved!`);
+      // console.log(
+      //   `${tokenSymbol} Approved by ${tokenBalance?.formatted} Amount`
+      // );
     }
   }, [isSuccessApproveTxn]);
 

From bf000ac1235a3680d1706a4137c478d4e7de6c40 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 23 Aug 2023 20:54:14 +0530
Subject: [PATCH 20/27] add standard approve btn copy

---
 .../AddLiquidityModal/AddSectionStandard.tsx       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index 0983887..7b24b69 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -733,7 +733,9 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
                     approveToken0CallLoading || approveToken0TxnLoading
                   }
                   text={
-                    approveToken0CallLoading
+                    fixedAmtNum(firstTokenAmount) <= 0
+                      ? "Please enter amount"
+                      : approveToken0CallLoading
                       ? "Sign the Txn in Wallet"
                       : approveToken0TxnLoading
                       ? "Waiting for Approval"
@@ -743,7 +745,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
                     approveToken0TxnSuccess ||
                     approveToken0CallLoading ||
                     approveToken0TxnLoading ||
-                    typeof approveToken0 == "undefined"
+                    typeof approveToken0 == "undefined" ||
+                    fixedAmtNum(firstTokenAmount) <= 0
                     // fixedAmtNum(nativeBal?.formatted) <= gasEstimate
                   }
                   onClick={async () => {
@@ -768,7 +771,9 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
                       approveToken1CallLoading || approveToken1TxnLoading
                     }
                     text={
-                      approveToken1CallLoading
+                      fixedAmtNum(secondTokenAmount) <= 0
+                        ? "Please enter amount"
+                        : approveToken1CallLoading
                         ? "Sign the Txn in Wallet"
                         : approveToken1TxnLoading
                         ? "Waiting for Approval"
@@ -778,7 +783,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
                       approveToken1TxnSuccess ||
                       approveToken1CallLoading ||
                       approveToken1TxnLoading ||
-                      typeof approveToken1 == "undefined"
+                      typeof approveToken1 == "undefined" ||
+                      fixedAmtNum(secondTokenAmount) <= 0
                       // fixedAmtNum(nativeBal?.formatted) <= gasEstimate
                     }
                     onClick={async () => {

From 32f4fb1865eea11e07e77a62b63162eaaa647467 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Wed, 23 Aug 2023 21:11:48 +0530
Subject: [PATCH 21/27] rest modals approve btn copy

---
 .../Library/RemoveLiquidityModal/ChosenMethod.tsx   |  8 ++++----
 .../RemoveLiquidityModal/RemoveSectionStable.tsx    | 13 +++++++++++--
 .../RemoveLiquidityModal/RemoveSectionStandard.tsx  | 13 +++++++++++--
 src/components/Library/StakingModal/index.tsx       | 13 ++++++++++++-
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/components/Library/RemoveLiquidityModal/ChosenMethod.tsx b/src/components/Library/RemoveLiquidityModal/ChosenMethod.tsx
index 4104b7c..76b0e02 100644
--- a/src/components/Library/RemoveLiquidityModal/ChosenMethod.tsx
+++ b/src/components/Library/RemoveLiquidityModal/ChosenMethod.tsx
@@ -122,22 +122,22 @@ const ChosenMethod: React.FC<Props> = ({
         autoFocus
       />
       <div className="inline-flex items-center gap-x-2">
-        <p className="flex flex-col items-end text-[#667085] text-sm font-bold leading-5 opacity-50">
+        <div className="flex flex-col items-end text-[#667085] text-sm font-bold leading-5 opacity-50">
           {lpBalLoading ? (
             <span>loading...</span>
           ) : (
             !!lpBal && (
-              <div className="flex flex-col items-end">
+              <p className="flex flex-col items-end">
                 <span>Balance</span>
                 <span>
                   {parseFloat(lpBal) < 0.01
                     ? "<0.01"
                     : toUnits(parseFloat(lpBal), 2)}
                 </span>
-              </div>
+              </p>
             )
           )}
-        </p>
+        </div>
         <button
           className="p-2 bg-[#F1F1F1] rounded-lg text-[#8B8B8B] text-[14px] font-bold leading-5"
           onClick={() => {
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index 705d1df..0edd6d6 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -560,7 +560,13 @@ const RemoveSectionStable: FC = () => {
               type="secondary"
               isLoading={approveLpLoading || approveLpLoadingTxn}
               text={
-                approveLpLoadingTxn
+                (
+                  methodId == Method.PERCENTAGE
+                    ? fixedAmtNum(percentage) <= 0
+                    : fixedAmtNum(lpTokens) <= 0
+                )
+                  ? "Please enter amount"
+                  : approveLpLoadingTxn
                   ? "Waiting for Approval"
                   : approveLpLoading
                   ? "Sign the Txn in Wallet"
@@ -570,7 +576,10 @@ const RemoveSectionStable: FC = () => {
                 approveLpSuccessTxn ||
                 approveLpLoading ||
                 approveLpLoadingTxn ||
-                typeof approveLpToken == "undefined"
+                typeof approveLpToken == "undefined" ||
+                (methodId == Method.PERCENTAGE
+                  ? fixedAmtNum(percentage) <= 0
+                  : fixedAmtNum(lpTokens) <= 0)
                 // parseFloat(nativeBal?.formatted ?? "0") <= gasEstimate
               }
               onClick={async () => {
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index bb823cc..50e567c 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -523,7 +523,13 @@ const RemoveSectionStandard = () => {
                 type="secondary"
                 isLoading={approveLpLoading || approveLpLoadingTxn}
                 text={
-                  approveLpLoadingTxn
+                  (
+                    methodId == Method.PERCENTAGE
+                      ? fixedAmtNum(percentage) <= 0
+                      : fixedAmtNum(lpTokens) <= 0
+                  )
+                    ? "Please enter amount"
+                    : approveLpLoadingTxn
                     ? "Waiting for Approval"
                     : approveLpLoading
                     ? "Sign the Txn in Wallet"
@@ -533,7 +539,10 @@ const RemoveSectionStandard = () => {
                   approveLpSuccessTxn ||
                   isLpApprovedLoading ||
                   approveLpLoadingTxn ||
-                  typeof approveLpToken == "undefined"
+                  typeof approveLpToken == "undefined" ||
+                  (methodId == Method.PERCENTAGE
+                    ? fixedAmtNum(percentage) <= 0
+                    : fixedAmtNum(lpTokens) <= 0)
                   // parseFloat(nativeBal?.formatted ?? "0") <= gasEstimate
                 }
                 onClick={async () => {
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index 606b53b..cd6691d 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -415,7 +415,14 @@ const StakingModal = () => {
               type="secondary"
               isLoading={isLoadingApproveTxn || isLoadingApproveCall}
               text={
-                isLoadingApproveTxn
+                (
+                  methodId == 0
+                    ? fixedAmtNum(percentage) <= 0
+                    : fixedAmtNum(lpTokens) <= 0 ||
+                      fixedAmtNum(lpTokens) > lpBalanceNum
+                )
+                  ? "Please enter amount"
+                  : isLoadingApproveTxn
                   ? "Waiting for Approval"
                   : isLoadingApproveCall
                   ? "Sign the Txn in Wallet"
@@ -424,6 +431,10 @@ const StakingModal = () => {
               disabled={
                 isLoadingApproveCall ||
                 isLoadingApproveTxn ||
+                (methodId == 0
+                  ? fixedAmtNum(percentage) <= 0
+                  : fixedAmtNum(lpTokens) <= 0 ||
+                    fixedAmtNum(lpTokens) > lpBalanceNum) ||
                 typeof approveLpToken == "undefined"
               }
               onClick={async () => {

From ddb3530a98a39b0719068260e86f461a22b27e70 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Thu, 24 Aug 2023 07:55:41 +0530
Subject: [PATCH 22/27] Audit: AddLiquidity Standard

---
 .../AddLiquidityModal/AddSectionStandard.tsx  | 513 +++++++-----------
 .../AddLiquidityModal/TokenContainer.tsx      | 125 +++++
 2 files changed, 317 insertions(+), 321 deletions(-)
 create mode 100644 src/components/Library/AddLiquidityModal/TokenContainer.tsx

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index 7b24b69..2e3ce3c 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -6,6 +6,7 @@ import {
   useEffect,
   useState,
   useMemo,
+  useCallback,
 } from "react";
 import { useAtom } from "jotai";
 import clsx from "clsx";
@@ -55,6 +56,7 @@ import BigNumber from "bignumber.js";
 import Countdown from "../Countdown";
 import { createNumRegex } from "@utils/createRegex";
 import SlippageBox from "../SlippageBox";
+import TokenContainer from "./TokenContainer";
 
 enum InputType {
   Off = -1,
@@ -65,10 +67,12 @@ enum InputType {
 const getPoolRatio = (r0: string, r1: string, d0: number, d1: number) => {
   const amount0 = parseFloat(ethers.formatUnits(r0, d0));
   const amount1 = parseFloat(ethers.formatUnits(r1, d1));
-  const pr = amount0 / amount1;
-  return pr;
+  const poolRatio = amount0 / amount1;
+  return poolRatio;
 };
 
+const THIRTY_MINUTES_IN_MS = 60000 * 30;
+
 const AddSectionStandard: FC<PropsWithChildren> = () => {
   const { address, connector } = useAccount();
   const { chain } = useNetwork();
@@ -92,17 +96,12 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
 
   const [farmAsset0, farmAsset1] =
     selectedFarm?.asset.underlyingAssets ?? new Array<UnderlyingAssets>();
-  // const [reserve0, reserve1] = useState("0");
 
   // Transaction Process Steps
   const [isConfirmStep, setIsConfirmStep] = useState(false);
   const [isProcessStep, setIsProcessStep] = useState(false);
   const [isSlippageStep, setIsSlippageStep] = useState(false);
 
-  useEffect(() => {
-    // console.log("selectedFarm", selectedFarm);
-  }, [selectedFarm]);
-
   // Amount States
   const [firstTokenAmount, setFirstTokenAmount] = useState("");
   const [secondTokenAmount, setSecondTokenAmount] = useState("");
@@ -148,22 +147,25 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const [nativePrice, setNativePrice] = useState<number>(0);
 
   useEffect(() => {
+    if (!selectedFarm) {
+      console.warn("Farm is not available!");
+      return;
+    }
     const { tokenSymbol, tokenAddress } = getNativeTokenAddress(
-      selectedFarm?.chain!
+      selectedFarm.chain
     );
-    const tokenPrice =
-      tokenPricesMap[
-        `${selectedFarm?.chain!}-${selectedFarm?.protocol!}-${tokenSymbol}-${tokenAddress}`
-      ];
-    // // console.log(
-    //   "tokenkey",
-    //   `${selectedFarm?.chain!}-${selectedFarm?.protocol!}-${tokenSymbol}-${tokenAddress}`
-    // );
-    // console.log("token", tokenPrice);
-    if (!!tokenPrice && typeof tokenPrice == "number") {
-      // console.log("...setting tokenprice", tokenPrice);
-      setNativePrice(tokenPrice);
+    if (!tokenSymbol || !tokenAddress) {
+      console.warn("Native token is not available!");
+      return;
+    }
+    const tokenPriceKey = `${selectedFarm.chain}-${selectedFarm.protocol}-${tokenSymbol}-${tokenAddress}`;
+    const tokenPrice = tokenPricesMap[tokenPriceKey];
+
+    if (typeof tokenPrice !== "number") {
+      console.warn(`Token price for ${tokenPriceKey} is not a number`);
+      return;
     }
+    setNativePrice(tokenPrice);
   }, [selectedFarm, tokenPricesMap]);
 
   // Balance Token0
@@ -174,8 +176,6 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     enabled: !!address && !!selectedFarm,
   });
 
-  // console.log("token0Balance", token0Balance);
-
   // Balance Token1
   const { data: token1Balance, isLoading: token1BalanceLoading } = useBalance({
     address,
@@ -184,8 +184,6 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     enabled: !!address && !!selectedFarm,
   });
 
-  // console.log("token0Balance", token0Balance);
-
   // Check Approval Token0 & Token1
   const {
     // data: isToken0Approved,
@@ -213,7 +211,6 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const {
     isLoadingApproveCall: approveToken0CallLoading,
     isLoadingApproveTxn: approveToken0TxnLoading,
-    // isSuccessApproveCall: approveToken0CallSuccess,
     isSuccessApproveTxn: approveToken0TxnSuccess,
     writeAsync: approveToken0,
   } = useApproveToken(
@@ -225,7 +222,6 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const {
     isLoadingApproveCall: approveToken1CallLoading,
     isLoadingApproveTxn: approveToken1TxnLoading,
-    // isSuccessApproveCall: approveToken1CallSuccess,
     isSuccessApproveTxn: approveToken1TxnSuccess,
     writeAsync: approveToken1,
   } = useApproveToken(
@@ -271,57 +267,69 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     hash: addLiquidityData?.hash,
   });
 
+  /**
+   *
+   * @param amount - Amount to be formatted
+   * @param decimals - Decimals of the token
+   * @param multiplier - Multiplier to be applied to the amount
+   * @returns Formatted amount
+   */
+  const formatTokenAmount = (
+    amount: string,
+    decimals: number,
+    multiplier: number = 1
+  ) => {
+    return BigNumber(amount, 10)
+      .multipliedBy(BigNumber(10).pow(decimals))
+      .multipliedBy(multiplier)
+      .decimalPlaces(0, 1)
+      .toString();
+  };
+
   const handleAddLiquidity = async () => {
+    if (!addLiquidity) {
+      throw new Error("AddLiquidity is not defined!");
+    }
+
     try {
       // Fetch latest block's timestamp
       const block = await publicClient.getBlock();
       const blocktimestamp =
-        Number(block.timestamp.toString() + "000") + 60000 * 30; // Adding  30 minutes
-      // console.log("timestamp fetched //", blocktimestamp);
-
-      // console.log("calling addliquidity method...");
+        Number(block.timestamp.toString() + "000") + THIRTY_MINUTES_IN_MS;
 
       const addArgs = [
         farmAsset0?.address,
         farmAsset1?.address,
-        BigNumber(firstTokenAmount, 10)
-          .multipliedBy(BigNumber(10).pow(farmAsset0?.decimals))
-          .decimalPlaces(0, 1)
-          .toString(),
-        BigNumber(secondTokenAmount, 10)
-          .multipliedBy(BigNumber(10).pow(farmAsset1?.decimals))
-          .decimalPlaces(0, 1)
-          .toString(),
-        BigNumber(firstTokenAmount, 10)
-          .multipliedBy((100 - SLIPPAGE) / 100)
-          .multipliedBy(BigNumber(10).pow(farmAsset0?.decimals))
-          .decimalPlaces(0, 1)
-          .toString(),
-        BigNumber(secondTokenAmount, 10)
-          .multipliedBy((100 - SLIPPAGE) / 100)
-          .multipliedBy(BigNumber(10).pow(farmAsset1?.decimals))
-          .decimalPlaces(0, 1)
-          .toString(),
+        formatTokenAmount(firstTokenAmount, farmAsset0?.decimals),
+        formatTokenAmount(secondTokenAmount, farmAsset1?.decimals),
+        formatTokenAmount(
+          firstTokenAmount,
+          farmAsset0?.decimals,
+          (100 - SLIPPAGE) / 100
+        ),
+        formatTokenAmount(
+          secondTokenAmount,
+          farmAsset1?.decimals,
+          (100 - SLIPPAGE) / 100
+        ),
         address, // To
         blocktimestamp, // deadline (uint256)
       ];
-      // console.log("addArgs", addArgs);
 
       const txnRes = await addLiquidity?.({
         args: addArgs,
       });
+
       if (!!txnRes) {
         setTxnHash(txnRes.hash);
+        console.info("Add Liquidity Txn Hash", txnRes.hash);
       }
-      // console.log(
-      //   `Adding Liquidity in ${selectedFarm?.asset.symbol} Farm`,
-      //   txnRes
-      // );
     } catch (error) {
       console.error(
         `Error while adding liquidity -> ${selectedFarm?.asset.symbol} Farm\n`,
         error
       );
+      // throw error;
     }
   };
 
@@ -365,14 +373,6 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
       farmAsset0.decimals,
       farmAsset1.decimals
     );
-    // console.log(
-    //   "siri",
-    //   poolRatio,
-    //   reserve0,
-    //   reserve1,
-    //   farmAsset0.decimals,
-    //   farmAsset1.decimals
-    // );
     const expectedSecondTokenAmount = firstTokenAmount / poolRatio;
     const secondTokenAmount = isNaN(expectedSecondTokenAmount)
       ? "0"
@@ -394,55 +394,49 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     setFirstTokenAmount(firstTokenAmount);
   };
 
-  // update first token values
-  const handleChangeFirstTokenAmount = async (
-    e: React.ChangeEvent<HTMLInputElement>
+  // Handler function for handling inputs
+  const handleChangeTokenAmount = async (
+    e: React.ChangeEvent<HTMLInputElement>,
+    setTokenAmount: React.Dispatch<React.SetStateAction<string>>,
+    updateTokenAmount: (value: number) => void,
+    decimals: number
   ) => {
     const value = e.target.value;
     // regex only let numerical values upto token decimals
-    const regex = createNumRegex(farmAsset0.decimals);
+    const regex = createNumRegex(decimals);
     if (regex.test(value) || value === "") {
-      setFirstTokenAmount(value);
+      setTokenAmount(value);
       // update first amount based on second
-      updateSecondTokenAmount(parseFloat(value));
+      updateTokenAmount(parseFloat(value));
     }
   };
 
-  // update token values
-  const handleChangeSecondTokenAmount = async (
+  // update first token values
+  const handleChangeFirstTokenAmount = async (
     e: React.ChangeEvent<HTMLInputElement>
   ) => {
-    const value = e.target.value;
-    // regex only let numerical values upto token decimals
-    const regex = createNumRegex(farmAsset1.decimals);
-    if (regex.test(value) || value === "") {
-      setSecondTokenAmount(value);
-      // update first amount based on second
-      updateFirstTokenAmount(parseFloat(value));
-    }
+    handleChangeTokenAmount(
+      e,
+      setFirstTokenAmount,
+      updateSecondTokenAmount,
+      farmAsset0.decimals
+    );
   };
 
-  useEffect(() => {
-    if (!isToken0ApprovedLoading || !isToken1ApprovedLoading) {
-      // console.log("isToken0ApprovedSuccess", isToken0ApprovedSuccess);
-      // console.log("isToken1ApprovedSuccess", isToken1ApprovedSuccess);
-    }
-  }, [isToken1ApprovedSuccess, isToken0ApprovedSuccess]);
-
-  // Remove after testing
-  useEffect(() => {
-    if (isLoadingAddLiqCall) {
-      // console.log("addliq method loading... sign the txn");
-    } else if (isLoadingAddLiqTxn) {
-      // console.log("addliq txn loading...");
-      // console.log("call hash", addLiquidityData?.hash);
-    }
-  }, [isLoadingAddLiqCall, isLoadingAddLiqTxn]);
+  // update second token values
+  const handleChangeSecondTokenAmount = async (
+    e: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    handleChangeTokenAmount(
+      e,
+      setSecondTokenAmount,
+      updateFirstTokenAmount,
+      farmAsset1.decimals
+    );
+  };
 
   useEffect(() => {
     if (isSuccessAddLiqTxn) {
-      // console.log("addliq txn success!");
-
       // Tracking
       handleAddLiquidityEvent({
         userAddress: address!,
@@ -488,12 +482,6 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
         },
       });
       (async () => {
-        // console.log(
-        //   "beforeuepos",
-        //   selectedFarm?.chain!,
-        //   selectedFarm?.protocol!
-        // );
-
         const a = await updateEvmPositions({
           farm: {
             id: selectedFarm?.id!,
@@ -521,175 +509,77 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     }
   }, [isSuccessAddLiqTxn]);
 
-  useEffect(() => {
-    if (!isToken0ApprovedLoading || !isToken1ApprovedLoading) {
-      // console.log("isSuccess Approve0", approveToken0TxnSuccess);
-      // console.log("isSuccess Approve1", approveToken1TxnSuccess);
-    }
-  }, [approveToken0TxnSuccess, approveToken1TxnSuccess]);
-
   const InputStep = () => {
+    const disableInput =
+      approveToken0CallLoading ||
+      approveToken0TxnLoading ||
+      approveToken1CallLoading ||
+      approveToken1TxnLoading;
+
+    const disableApproveFirstToken =
+      approveToken0TxnSuccess ||
+      approveToken0CallLoading ||
+      approveToken0TxnLoading ||
+      typeof approveToken0 == "undefined" ||
+      fixedAmtNum(firstTokenAmount) <= 0;
+
+    const disableApproveSecondToken =
+      approveToken1TxnSuccess ||
+      approveToken1CallLoading ||
+      approveToken1TxnLoading ||
+      typeof approveToken1 == "undefined" ||
+      fixedAmtNum(secondTokenAmount) <= 0;
+
+    const disableConfirmButton =
+      fixedAmtNum(firstTokenAmount) <= 0 ||
+      fixedAmtNum(secondTokenAmount) <= 0 ||
+      !(isToken0ApprovedSuccess || approveToken0TxnSuccess) ||
+      !(isToken1ApprovedSuccess || approveToken1TxnSuccess) ||
+      fixedAmtNum(firstTokenAmount) > fixedAmtNum(token0Balance?.formatted) ||
+      fixedAmtNum(secondTokenAmount) > fixedAmtNum(token1Balance?.formatted);
+
     return (
       <div className="w-full mt-9 flex flex-col gap-y-3">
         {/* First token Container */}
-        <div className="relative flex flex-row justify-between px-6 py-[14px] border border-[#D0D5DD] rounded-lg">
-          <div className="absolute left-0 -top-9 flex flex-row gap-x-[6px] items-center">
-            <div className="z-10 flex overflow-hidden rounded-full">
-              <Image
-                src={selectedFarm?.asset.logos[0] as string}
-                alt={selectedFarm?.asset.logos[0] as string}
-                width={24}
-                height={24}
-              />
-            </div>
-            <span className="text-[#344054 text-[14px] font-medium leading-5">
-              {farmAsset0?.symbol}
-            </span>
-          </div>
-          <input
-            placeholder="0"
-            className={clsx(
-              "text-base text-[#4E4C4C] font-bold leading-6 text-left bg-transparent focus:outline-none"
-            )}
-            disabled={
-              approveToken0CallLoading ||
-              approveToken0TxnLoading ||
-              approveToken1CallLoading ||
-              approveToken1TxnLoading
-            }
-            onChange={handleChangeFirstTokenAmount}
-            value={firstTokenAmount}
-            name="firstTokenAmount"
-            id="firstTokenAmount"
-            ref={firstInputRef}
-            // onBlur={() => setFocusedInput(InputType.Off)}
-            onFocus={() => setFocusedInput(InputType.First)}
-            autoFocus={focusedInput === InputType.First}
-          />
-          <div className="inline-flex items-center gap-x-2">
-            <div className="flex flex-col items-end text-sm leading-5 opacity-50">
-              {token0BalanceLoading ? (
-                <span>loading...</span>
-              ) : (
-                !!token0Balance && (
-                  <div className="flex flex-col items-end">
-                    <span>Balance</span>
-                    <span>
-                      {parseFloat(token0Balance?.formatted).toLocaleString(
-                        "en-US"
-                      )}
-                    </span>
-                  </div>
-                )
-              )}
-            </div>
-            <button
-              className="p-2 bg-[#F1F1F1] rounded-lg text-[#8B8B8B] text-[14px] font-bold leading-5"
-              onClick={() => {
-                setFirstTokenAmount(token0Balance?.formatted ?? "0");
-                updateSecondTokenAmount(
-                  parseFloat(token0Balance?.formatted ?? "0")
-                );
-              }}
-            >
-              MAX
-            </button>
-          </div>
-        </div>
-        {fixedAmtNum(firstTokenAmount) >
-          fixedAmtNum(token0Balance?.formatted) && (
-          <div className="text-[#FF9999] leading-6 font-semibold text-base text-left">
-            {focusedInput == InputType.First
-              ? "Insufficient Balance"
-              : `You need ${
-                  fixedAmtNum(firstTokenAmount) -
-                  fixedAmtNum(token0Balance?.formatted)
-                } ${
-                  farmAsset0?.symbol
-                } for creating an LP token with ${fixedAmtNum(
-                  secondTokenAmount
-                )} ${farmAsset1?.symbol}`}
-          </div>
-        )}
+        <TokenContainer
+          handleChangeTokenAmount={handleChangeFirstTokenAmount}
+          inputToFocus={InputType.First}
+          focusedInput={focusedInput}
+          setFocusedInput={setFocusedInput}
+          farm={selectedFarm!}
+          tokenSymbol={farmAsset0?.symbol}
+          tokenAmount={firstTokenAmount}
+          inputRef={firstInputRef}
+          setTokenAmount={setFirstTokenAmount}
+          updateAnotherTokenAmount={updateSecondTokenAmount}
+          tokenBalanceLoading={token0BalanceLoading}
+          tokenBalance={token0Balance}
+          otherTokenAmount={secondTokenAmount}
+          otherTokenSymbol={farmAsset1?.symbol}
+          disableInput={disableInput}
+        />
         {/* Plus Icon */}
         <div className="bg-[#e0dcdc] flex justify-center p-3 max-w-fit items-center rounded-full text-base select-none mx-auto">
           <Image src="/icons/PlusIcon.svg" alt="Plus" width={16} height={16} />
         </div>
         {/* Second token container */}
-        <div className="relative flex flex-row justify-between px-6 py-[14px] border border-[#D0D5DD] rounded-lg">
-          <div className="absolute left-0 -top-9 flex flex-row gap-x-[6px] items-center">
-            <div className="z-10 flex overflow-hidden rounded-full">
-              <Image
-                src={selectedFarm?.asset.logos[1] as string}
-                alt={selectedFarm?.asset.logos[1] as string}
-                width={24}
-                height={24}
-              />
-            </div>
-            <span className="text-[#344054 text-[14px] font-medium leading-5">
-              {farmAsset1?.symbol}
-            </span>
-          </div>
-          <input
-            placeholder="0"
-            className={clsx(
-              "text-base text-[#4E4C4C] font-bold leading-6 text-left bg-transparent focus:outline-none"
-            )}
-            onChange={handleChangeSecondTokenAmount}
-            value={secondTokenAmount}
-            name="secondTokenAmount"
-            id="secondTokenAmount"
-            ref={secondInputRef}
-            // onBlur={() => setFocusedInput(InputType.Off)}
-            onFocus={() => setFocusedInput(InputType.Second)}
-            autoFocus={focusedInput === InputType.Second}
-          />
-          <div className="inline-flex items-center gap-x-2">
-            <div className="flex flex-col items-end text-sm leading-5 opacity-50">
-              {token1BalanceLoading ? (
-                <span>loading...</span>
-              ) : (
-                !!token1Balance && (
-                  <p className="flex flex-col items-end">
-                    <span>Balance</span>
-                    <span>
-                      {parseFloat(token1Balance?.formatted).toLocaleString(
-                        "en-US"
-                      )}
-                    </span>
-                  </p>
-                )
-              )}
-            </div>
-            <button
-              className="p-2 bg-[#F1F1F1] rounded-lg text-[#8B8B8B] text-[14px] font-bold leading-5"
-              onClick={() => {
-                setSecondTokenAmount(token1Balance?.formatted ?? "0");
-                updateFirstTokenAmount(
-                  parseFloat(token1Balance?.formatted ?? "0")
-                );
-              }}
-            >
-              MAX
-            </button>
-          </div>
-        </div>
-        {fixedAmtNum(secondTokenAmount) >
-          fixedAmtNum(token1Balance?.formatted) && (
-          <div className="text-[#FF9999] leading-6 font-semibold text-base text-left">
-            {focusedInput == InputType.Second
-              ? "Insufficient Balance"
-              : `You need ${
-                  fixedAmtNum(secondTokenAmount) -
-                  fixedAmtNum(token1Balance?.formatted)
-                } ${
-                  farmAsset1?.symbol
-                } for creating an LP token with ${fixedAmtNum(
-                  firstTokenAmount
-                )} ${farmAsset0?.symbol}`}
-          </div>
-        )}
-
+        <TokenContainer
+          handleChangeTokenAmount={handleChangeSecondTokenAmount}
+          inputToFocus={InputType.Second}
+          focusedInput={focusedInput}
+          setFocusedInput={setFocusedInput}
+          farm={selectedFarm!}
+          tokenSymbol={farmAsset1?.symbol}
+          tokenAmount={secondTokenAmount}
+          inputRef={secondInputRef}
+          setTokenAmount={setSecondTokenAmount}
+          updateAnotherTokenAmount={updateFirstTokenAmount}
+          tokenBalanceLoading={token1BalanceLoading}
+          tokenBalance={token1Balance}
+          otherTokenAmount={firstTokenAmount}
+          otherTokenSymbol={farmAsset0?.symbol}
+          disableInput={disableInput}
+        />
         {/* Relative Conversion and Share of Pool */}
         <div className="p-3 flex flex-row justify-between text-[#667085] text-[14px] leading-5 font-bold text-opacity-50">
           <div className="flex flex-col items-start gap-y-2">
@@ -741,14 +631,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
                       ? "Waiting for Approval"
                       : `Approve ${farmAsset0.symbol}`
                   }
-                  disabled={
-                    approveToken0TxnSuccess ||
-                    approveToken0CallLoading ||
-                    approveToken0TxnLoading ||
-                    typeof approveToken0 == "undefined" ||
-                    fixedAmtNum(firstTokenAmount) <= 0
-                    // fixedAmtNum(nativeBal?.formatted) <= gasEstimate
-                  }
+                  disabled={disableApproveFirstToken}
                   onClick={async () => {
                     try {
                       const txn = await approveToken0?.();
@@ -779,14 +662,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
                         ? "Waiting for Approval"
                         : `Approve ${farmAsset1.symbol}`
                     }
-                    disabled={
-                      approveToken1TxnSuccess ||
-                      approveToken1CallLoading ||
-                      approveToken1TxnLoading ||
-                      typeof approveToken1 == "undefined" ||
-                      fixedAmtNum(secondTokenAmount) <= 0
-                      // fixedAmtNum(nativeBal?.formatted) <= gasEstimate
-                    }
+                    disabled={disableApproveSecondToken}
                     onClick={async () => {
                       try {
                         const txn = await approveToken1?.();
@@ -803,20 +679,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
               <MButton
                 type="primary"
                 isLoading={false}
-                disabled={
-                  // firstTokenAmount == "" ||
-                  // secondTokenAmount == "" ||
-                  // parseFloat(firstTokenAmount) <= 0 ||
-                  // parseFloat(secondTokenAmount) <= 0 ||
-                  fixedAmtNum(firstTokenAmount) <= 0 ||
-                  fixedAmtNum(secondTokenAmount) <= 0 ||
-                  !(isToken0ApprovedSuccess || approveToken0TxnSuccess) ||
-                  !(isToken1ApprovedSuccess || approveToken1TxnSuccess) ||
-                  fixedAmtNum(firstTokenAmount) >
-                    fixedAmtNum(token0Balance?.formatted) ||
-                  fixedAmtNum(secondTokenAmount) >
-                    fixedAmtNum(token1Balance?.formatted)
-                }
+                disabled={disableConfirmButton}
                 text="Confirm Adding Liquidity"
                 onClick={() => {
                   setIsConfirmStep(true);
@@ -841,32 +704,23 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
       [
         farmAsset0?.address,
         farmAsset1?.address,
-        BigNumber(firstTokenAmount, 10)
-          .multipliedBy(BigNumber(10).pow(farmAsset0?.decimals))
-          .decimalPlaces(0, 1)
-          .toString(),
-        BigNumber(secondTokenAmount, 10)
-          .multipliedBy(BigNumber(10).pow(farmAsset1?.decimals))
-          .decimalPlaces(0, 1)
-          .toString(),
-        BigNumber(firstTokenAmount, 10)
-          .multipliedBy((100 - SLIPPAGE) / 100)
-          .multipliedBy(BigNumber(10).pow(farmAsset0?.decimals))
-          .decimalPlaces(0, 1)
-          .toString(),
-        BigNumber(secondTokenAmount, 10)
-          .multipliedBy((100 - SLIPPAGE) / 100)
-          .multipliedBy(BigNumber(10).pow(farmAsset1?.decimals))
-          .decimalPlaces(0, 1)
-          .toString(),
+        formatTokenAmount(firstTokenAmount, farmAsset0?.decimals),
+        formatTokenAmount(secondTokenAmount, farmAsset1?.decimals),
+        formatTokenAmount(
+          firstTokenAmount,
+          farmAsset0?.decimals,
+          (100 - SLIPPAGE) / 100
+        ),
+        formatTokenAmount(
+          secondTokenAmount,
+          farmAsset1?.decimals,
+          (100 - SLIPPAGE) / 100
+        ),
         address, // To
         1784096161000, // deadline (uint256)
       ]
     );
 
-    // console.log("firstTokenAmount", firstTokenAmount);
-    // console.log("secondTokenAmount", secondTokenAmount);
-
     return (
       <div className="flex flex-col gap-y-8 text-left">
         <button
@@ -1114,14 +968,31 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     );
   };
 
-  const isOpenModalCondition =
-    approveToken0CallLoading ||
-    approveToken1CallLoading ||
-    approveToken0TxnLoading ||
-    approveToken1TxnLoading ||
-    isLoadingAddLiqCall ||
-    isLoadingAddLiqTxn ||
-    isSlippageModalOpen;
+  const isOpenModalCondition = useMemo(() => {
+    return (
+      approveToken0CallLoading ||
+      approveToken1CallLoading ||
+      approveToken0TxnLoading ||
+      approveToken1TxnLoading ||
+      isLoadingAddLiqCall ||
+      isLoadingAddLiqTxn ||
+      isSlippageModalOpen
+    );
+  }, [
+    approveToken0CallLoading,
+    approveToken1CallLoading,
+    approveToken0TxnLoading,
+    approveToken1TxnLoading,
+    isLoadingAddLiqCall,
+    isLoadingAddLiqTxn,
+    isSlippageModalOpen,
+  ]);
+
+  const setOpenProp = useCallback(() => {
+    if (!isOpenModalCondition) {
+      setIsOpen(false);
+    }
+  }, [isOpenModalCondition]);
 
   if (selectedFarm?.chain.toLowerCase() !== chain?.name.toLowerCase()) {
     return (
@@ -1137,7 +1008,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     !!selectedFarm && (
       <LiquidityModalWrapper
         open={isOpen || isOpenModalCondition}
-        setOpen={isOpenModalCondition ? () => {} : setIsOpen}
+        setOpen={setOpenProp}
         title="Add Liquidity"
       >
         {isSlippageStep ? (
diff --git a/src/components/Library/AddLiquidityModal/TokenContainer.tsx b/src/components/Library/AddLiquidityModal/TokenContainer.tsx
new file mode 100644
index 0000000..351003f
--- /dev/null
+++ b/src/components/Library/AddLiquidityModal/TokenContainer.tsx
@@ -0,0 +1,125 @@
+import { fixedAmtNum } from "@utils/abis/contract-helper-methods";
+import { FarmType } from "@utils/types/common";
+import clsx from "clsx";
+import Image from "next/image";
+import { RefObject } from "react";
+
+interface TokenContainerProps {
+  handleChangeTokenAmount: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  inputToFocus: any; // replace with the actual type
+  focusedInput: any; // replace with the actual type
+  setFocusedInput: (input: any) => void; // replace with the actual type
+  farm: FarmType;
+  tokenSymbol: string;
+  tokenAmount: string;
+  inputRef: RefObject<HTMLInputElement>;
+  setTokenAmount: (amount: string) => void;
+  updateAnotherTokenAmount: (amount: number) => void;
+  tokenBalanceLoading: boolean;
+  tokenBalance:
+    | {
+        decimals: number;
+        formatted: string;
+        symbol: string;
+        value: bigint;
+      }
+    | undefined;
+  otherTokenAmount: string;
+  otherTokenSymbol: string;
+  disableInput: boolean;
+}
+
+const TokenContainer: React.FC<TokenContainerProps> = ({
+  handleChangeTokenAmount,
+  inputToFocus,
+  focusedInput,
+  setFocusedInput,
+  farm,
+  tokenSymbol,
+  tokenAmount,
+  inputRef,
+  setTokenAmount,
+  updateAnotherTokenAmount,
+  tokenBalanceLoading,
+  tokenBalance,
+  otherTokenAmount,
+  otherTokenSymbol,
+  disableInput,
+}) => {
+  return (
+    <>
+      <div className="relative flex flex-row justify-between px-6 py-[14px] border border-[#D0D5DD] rounded-lg">
+        <div className="absolute left-0 -top-9 flex flex-row gap-x-[6px] items-center">
+          <div className="z-10 flex overflow-hidden rounded-full">
+            <Image
+              src={farm?.asset.logos[0] as string}
+              alt={farm?.asset.logos[0] as string}
+              width={24}
+              height={24}
+            />
+          </div>
+          <span className="text-[#344054 text-[14px] font-medium leading-5">
+            {tokenSymbol}
+          </span>
+        </div>
+        <input
+          placeholder="0"
+          className={clsx(
+            "text-base text-[#4E4C4C] font-bold leading-6 text-left bg-transparent focus:outline-none"
+          )}
+          disabled={disableInput}
+          onChange={handleChangeTokenAmount}
+          value={tokenAmount}
+          name="firstTokenAmount"
+          id="firstTokenAmount"
+          ref={inputRef}
+          // onBlur={() => setFocusedInput(InputType.Off)}
+          onFocus={() => setFocusedInput(inputToFocus)}
+          autoFocus={focusedInput === inputToFocus}
+        />
+        <div className="inline-flex items-center gap-x-2">
+          <div className="flex flex-col items-end text-sm leading-5 opacity-50">
+            {tokenBalanceLoading ? (
+              <span>loading...</span>
+            ) : (
+              !!tokenBalance && (
+                <div className="flex flex-col items-end">
+                  <span>Balance</span>
+                  <span>
+                    {parseFloat(tokenBalance?.formatted).toLocaleString(
+                      "en-US"
+                    )}
+                  </span>
+                </div>
+              )
+            )}
+          </div>
+          <button
+            className="p-2 bg-[#F1F1F1] rounded-lg text-[#8B8B8B] text-[14px] font-bold leading-5"
+            onClick={() => {
+              setTokenAmount(tokenBalance?.formatted ?? "0");
+              updateAnotherTokenAmount(
+                parseFloat(tokenBalance?.formatted ?? "0")
+              );
+            }}
+          >
+            MAX
+          </button>
+        </div>
+      </div>
+      {fixedAmtNum(tokenAmount) > fixedAmtNum(tokenBalance?.formatted) && (
+        <div className="text-[#FF9999] leading-6 font-semibold text-base text-left">
+          {focusedInput == inputToFocus
+            ? "Insufficient Balance"
+            : `You need ${
+                fixedAmtNum(tokenAmount) - fixedAmtNum(tokenBalance?.formatted)
+              } ${tokenSymbol} for creating an LP token with ${fixedAmtNum(
+                otherTokenAmount
+              )} ${otherTokenSymbol}`}
+        </div>
+      )}
+    </>
+  );
+};
+
+export default TokenContainer;

From 25320ca59053471066abde5fa73ab42b3f83d29f Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Thu, 24 Aug 2023 08:28:02 +0530
Subject: [PATCH 23/27] gasEstimate UI error handling & small amounts

---
 .../Library/AddLiquidityModal/AddSectionStable.tsx | 14 +++++++++++---
 .../AddLiquidityModal/AddSectionStandard.tsx       | 14 +++++++++++---
 .../RemoveLiquidityModal/RemoveSectionStable.tsx   | 14 +++++++++++---
 .../RemoveLiquidityModal/RemoveSectionStandard.tsx | 14 +++++++++++---
 src/components/Library/StakingModal/index.tsx      | 14 +++++++++++---
 src/components/Library/UnstakingModal/index.tsx    | 14 +++++++++++---
 6 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index 0926b3e..d81c0b6 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -544,14 +544,21 @@ const AddSectionStable: FC = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              {gasEstimate === 0 && !isError ? (
+              {isError ? (
+                <p className="text-red-400">Error estimating gas</p>
+              ) : gasEstimate === 0 ? (
                 <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
-                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                    {gasEstimate < 0.001 ? "<0.001" : gasEstimate.toFixed(3)}{" "}
+                    {nativeBal?.symbol}
                   </span>
-                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  {gasEstimate * nativePrice < 0.00001 ? (
+                    "<$0.00001"
+                  ) : (
+                    <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  )}
                 </p>
               )}
             </div>
@@ -583,6 +590,7 @@ const AddSectionStable: FC = () => {
         <MButton
           type="primary"
           isLoading={false}
+          disabled={isError}
           text="Confirm Supply"
           onClick={() => {
             // console.log("args:", {});
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index 2e3ce3c..adf1bcd 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -823,14 +823,21 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              {gasEstimate === 0 && !isError ? (
+              {isError ? (
+                <p className="text-red-400">Error estimating gas</p>
+              ) : gasEstimate === 0 ? (
                 <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
-                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                    {gasEstimate < 0.001 ? "<0.001" : gasEstimate.toFixed(3)}{" "}
+                    {nativeBal?.symbol}
                   </span>
-                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  {gasEstimate * nativePrice < 0.00001 ? (
+                    "<$0.00001"
+                  ) : (
+                    <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  )}
                 </p>
               )}
             </div>
@@ -862,6 +869,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
         <MButton
           type="primary"
           isLoading={false}
+          disabled={isError}
           text="Confirm Supply"
           onClick={() => {
             // console.log("args:", {
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index 0edd6d6..8220d6b 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -710,14 +710,21 @@ const RemoveSectionStable: FC = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              {gasEstimate === 0 && !isError ? (
+              {isError ? (
+                <p className="text-red-400">Error estimating gas</p>
+              ) : gasEstimate === 0 ? (
                 <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
-                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                    {gasEstimate < 0.001 ? "<0.001" : gasEstimate.toFixed(3)}{" "}
+                    {nativeBal?.symbol}
                   </span>
-                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  {gasEstimate * nativePrice < 0.00001 ? (
+                    "<$0.00001"
+                  ) : (
+                    <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  )}
                 </p>
               )}
             </div>
@@ -749,6 +756,7 @@ const RemoveSectionStable: FC = () => {
         <MButton
           type="primary"
           isLoading={false}
+          disabled={isError}
           text="Confirm Withdrawal"
           onClick={() => {
             handleRemoveLiquidity();
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index 50e567c..6cb444d 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -693,14 +693,21 @@ const RemoveSectionStandard = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              {gasEstimate === 0 && !isError ? (
+              {isError ? (
+                <p className="text-red-400">Error estimating gas</p>
+              ) : gasEstimate === 0 ? (
                 <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
-                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                    {gasEstimate < 0.001 ? "<0.001" : gasEstimate.toFixed(3)}{" "}
+                    {nativeBal?.symbol}
                   </span>
-                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  {gasEstimate * nativePrice < 0.00001 ? (
+                    "<$0.00001"
+                  ) : (
+                    <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  )}
                 </p>
               )}
             </div>
@@ -732,6 +739,7 @@ const RemoveSectionStandard = () => {
         <MButton
           type="primary"
           isLoading={false}
+          disabled={isError}
           text="Confirm Withdrawal"
           onClick={async () => {
             await handleRemoveLiquidity();
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index cd6691d..a7b185c 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -536,14 +536,21 @@ const StakingModal = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              {gasEstimate === 0 && !isError ? (
+              {isError ? (
+                <p className="text-red-400">Error estimating gas</p>
+              ) : gasEstimate === 0 ? (
                 <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
-                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                    {gasEstimate < 0.001 ? "<0.001" : gasEstimate.toFixed(3)}{" "}
+                    {nativeBal?.symbol}
                   </span>
-                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  {gasEstimate * nativePrice < 0.00001 ? (
+                    "<$0.00001"
+                  ) : (
+                    <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  )}
                 </p>
               )}
             </div>
@@ -575,6 +582,7 @@ const StakingModal = () => {
         <MButton
           type="primary"
           isLoading={false}
+          disabled={isError}
           text="Confirm Staking"
           onClick={() => {
             handleStaking();
diff --git a/src/components/Library/UnstakingModal/index.tsx b/src/components/Library/UnstakingModal/index.tsx
index 4d20c7a..68249aa 100644
--- a/src/components/Library/UnstakingModal/index.tsx
+++ b/src/components/Library/UnstakingModal/index.tsx
@@ -478,14 +478,21 @@ const UnstakingModal = () => {
           >
             <div className="inline-flex justify-between text-[#4E4C4C] font-bold leading-5 text-base">
               <span>Estimated Gas Fees:</span>
-              {gasEstimate === 0 && !isError ? (
+              {isError ? (
+                <p className="text-red-400">Error estimating gas</p>
+              ) : gasEstimate === 0 ? (
                 <p>estimating gas...</p>
               ) : (
                 <p>
                   <span className="opacity-40 mr-2 font-semibold">
-                    {gasEstimate.toFixed(3) ?? 0} {nativeBal?.symbol}
+                    {gasEstimate < 0.001 ? "<0.001" : gasEstimate.toFixed(3)}{" "}
+                    {nativeBal?.symbol}
                   </span>
-                  <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  {gasEstimate * nativePrice < 0.00001 ? (
+                    "<$0.00001"
+                  ) : (
+                    <span>${(gasEstimate * nativePrice).toFixed(5)}</span>
+                  )}
                 </p>
               )}
             </div>
@@ -517,6 +524,7 @@ const UnstakingModal = () => {
         <MButton
           type="primary"
           isLoading={false}
+          disabled={isError}
           text="Confirm Unstaking"
           onClick={() => {
             handleUnstaking();

From c77753ee898ffe0a67073b3f16827d41242ea2b1 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Thu, 24 Aug 2023 17:36:39 +0530
Subject: [PATCH 24/27] AddStable minor-audit, tokenInput for ASTR, Hide a pool

---
 src/components/App/FarmList.tsx               |  8 +++
 .../AddLiquidityModal/AddSectionStable.tsx    | 70 +++++++++----------
 .../Library/AddLiquidityModal/TokenInput.tsx  | 14 +++-
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/src/components/App/FarmList.tsx b/src/components/App/FarmList.tsx
index f9b122a..71c679b 100644
--- a/src/components/App/FarmList.tsx
+++ b/src/components/App/FarmList.tsx
@@ -55,6 +55,14 @@ const FarmsList: FC<Props> = ({ farms, positions }) => {
           undefined;
         const isSupported = checkIfPoolSupported(farm);
 
+        // Skipping a particular farm
+        if (
+          farm?.id == 1 &&
+          farm?.asset.address == "0xcB274236fBA7B873FC8F154bb0475a166C24B119"
+        ) {
+          return;
+        }
+
         return (
           <tr
             key={`${farm.asset.address}-${farm.tvl}`}
diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index d81c0b6..54ed968 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -54,13 +54,25 @@ import getTimestamp from "@utils/getTimestamp";
 import Countdown from "../Countdown";
 import SlippageBox from "../SlippageBox";
 
+// Constants
+const STABLE_AMM_SYMBOLS = [
+  "MAI-tripool",
+  "FRAX-3pool",
+  "MIM-3pool",
+  "MAI-3pool",
+  "4PUSDT",
+  "4JPYC",
+  "4WETH",
+  "4oUSD",
+  "4BAI",
+  "4WBNB",
+];
+
 const AddSectionStable: FC = () => {
   const publicClient = usePublicClient();
   const { address, connector } = useAccount();
   const { chain } = useNetwork();
 
-  // const [isApproving, setIsApproving] = useState(false);
-
   // Transaction Process Steps
   const [isConfirmStep, setIsConfirmStep] = useState(false);
   const [isProcessStep, setIsProcessStep] = useState(false);
@@ -92,7 +104,7 @@ const AddSectionStable: FC = () => {
   // const [farms] = useAtom(farmsAtom);
   const [positions, setPositions] = useAtom(positionsAtom);
   const [lpTokenPricesMap, setLpTokenPricesMap] = useAtom(lpTokenPricesAtom);
-  const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
+  // const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
   const [tokenPricesMap] = useAtom(tokenPricesAtom);
   const [, setIsEvmPosLoading] = useAtom(evmPosLoadingAtom);
   // Checking if farm assets have a lp-token pair
@@ -100,19 +112,7 @@ const AddSectionStable: FC = () => {
     const symbol = farm?.asset.symbol;
     const assetLogos = farm?.asset.logos;
     let logos: (string | string[])[];
-    if (
-      symbol == "MAI-tripool" ||
-      symbol == "FRAX-3pool" ||
-      symbol == "MIM-3pool" ||
-      symbol == "MAI-3pool" ||
-      symbol == "4PUSDT" ||
-      symbol == "4JPYC" ||
-      symbol == "4WETH" ||
-      symbol == "4oUSD" ||
-      symbol == "4BAI" ||
-      symbol == "4WBNB"
-    ) {
-      // eg. FRAX-tripool -- logos = [FRAX, [USDC, BUSD, USDT]]
+    if (STABLE_AMM_SYMBOLS.includes(symbol ?? "")) {
       logos = [
         assetLogos?.[0]!,
         [assetLogos?.[1]!, assetLogos?.[2]!, assetLogos?.[3]!],
@@ -164,15 +164,16 @@ const AddSectionStable: FC = () => {
   // const tokens = farm?.asset.underlyingAssets ?? [];
 
   const handleInput = useCallback((token: UnderlyingAssets, value: string) => {
+    const parsedValue = isNaN(parseFloat(value)) ? 0 : parseFloat(value);
     // Setting inputMap for Input fields
-    setInputMap((pre: any) => ({
+    setInputMap((pre: { [address: Address]: string }) => ({
       ...pre,
       [token.address]: value,
     }));
     // Setting inputMapAmount of amount array for calculation
-    setInputMapAmount((pre: any) => ({
+    setInputMapAmount((pre: { [address: Address]: number }) => ({
       ...pre,
-      [token.address]: isNaN(parseFloat(value)) ? 0 : parseFloat(value),
+      [token.address]: parsedValue,
     }));
   }, []);
 
@@ -301,9 +302,9 @@ const AddSectionStable: FC = () => {
     });
   }, [approvalMap, inputMapAmount]);
 
-  useEffect(() => {
-    // console.log("balanceMap", balanceMap);
-  }, [balanceMap]);
+  // useEffect(() => {
+  // console.log("balanceMap", balanceMap);
+  // }, [balanceMap]);
 
   const isSufficientBalance = useMemo(() => {
     return Object.entries(balanceMap).every(([tokenAddress, balance]) => {
@@ -315,11 +316,11 @@ const AddSectionStable: FC = () => {
     });
   }, [inputMapAmount, balanceMap]);
 
-  useEffect(() => {
-    // console.log("isRequirementApproved", isRequirementApproved);
-    // console.log("approvalMap", approvalMap);
-    // console.log("inputMapAmount", inputMapAmount);
-  }, [isRequirementApproved]);
+  // useEffect(() => {
+  // console.log("isRequirementApproved", isRequirementApproved);
+  // console.log("approvalMap", approvalMap);
+  // console.log("inputMapAmount", inputMapAmount);
+  // }, [isRequirementApproved]);
 
   const handleAddLiquidity = async () => {
     try {
@@ -327,18 +328,19 @@ const AddSectionStable: FC = () => {
       const block = await publicClient.getBlock();
       const blocktimestamp =
         Number(block.timestamp.toString() + "000") + 60000 * 30; // Adding 30 minutes
-      // console.log("timestamp fetched //", blocktimestamp);
-      // console.log("calling addliquidity method...", amounts, estLpAmount);
-
+      const minToMint = parseUnits(
+        `${(estLpAmount * (100 - SLIPPAGE)) / 100}`,
+        18
+      );
       const args_to_pass =
         farm?.protocol.toLowerCase() == "curve"
           ? [
               amounts, // amounts (uint256[])
-              parseUnits(`${(estLpAmount * (100 - SLIPPAGE)) / 100}`, 18), // minToMint (uint256)
+              minToMint, // minToMint  (uint256)
             ]
           : [
               amounts, // amounts (uint256[])
-              parseUnits(`${(estLpAmount * (100 - SLIPPAGE)) / 100}`, 18), // minToMint (uint256)
+              minToMint, // minToMint (uint256)
               blocktimestamp, // deadline (uint256)
             ];
 
@@ -387,10 +389,6 @@ const AddSectionStable: FC = () => {
 
         {/* Relative Conversion and Share of Pool */}
         <div className="p-3 flex flex-row w-full justify-end text-[#667085] text-[14px] leading-5 font-bold text-opacity-50">
-          {/* <div className="flex flex-col gap-y-2">
-            <p>0.1234 GLMR per STELLA</p>
-            <p>0.1234 STELLA per GLMR</p>
-          </div> */}
           <p className="flex flex-col items-end">
             <span>
               {(totalSupply !== 0 && estLpAmount > 0
diff --git a/src/components/Library/AddLiquidityModal/TokenInput.tsx b/src/components/Library/AddLiquidityModal/TokenInput.tsx
index 8502a3c..d8dbe5a 100644
--- a/src/components/Library/AddLiquidityModal/TokenInput.tsx
+++ b/src/components/Library/AddLiquidityModal/TokenInput.tsx
@@ -116,7 +116,9 @@ const TokenInput: React.FC<TokenInputProps> = ({
           className={clsx(
             "text-base font-bold leading-6 text-left bg-transparent focus:outline-none",
             fixedAmtNum(inputMap[token.address]) >
-              fixedAmtNum(balance?.formatted)
+              fixedAmtNum(
+                token?.symbol == "ASTR" ? nativeBal : balance?.formatted
+              )
               ? "text-[#FF9999]"
               : "text-[#4E4C4C]"
           )}
@@ -159,7 +161,10 @@ const TokenInput: React.FC<TokenInputProps> = ({
           <button
             className="p-2 bg-[#F1F1F1] rounded-lg text-[#8B8B8B] text-[14px] font-bold leading-5"
             onClick={() => {
-              handleInput(token, balance?.formatted! ?? "0");
+              handleInput(
+                token,
+                token?.symbol == "ASTR" ? nativeBal : balance?.formatted ?? "0"
+              );
             }}
           >
             MAX
@@ -169,7 +174,10 @@ const TokenInput: React.FC<TokenInputProps> = ({
       <div
         className={clsx(
           "text-left text-base leading-6 font-bold mt-3",
-          fixedAmtNum(inputMap[token.address]) > fixedAmtNum(balance?.formatted)
+          fixedAmtNum(inputMap[token.address]) >
+            fixedAmtNum(
+              token?.symbol == "ASTR" ? nativeBal : balance?.formatted
+            )
             ? "text-[#FF9999]"
             : "hidden"
         )}

From c428168d51190bf0abd3742c990c1e543f0e06b2 Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Thu, 24 Aug 2023 18:50:05 +0530
Subject: [PATCH 25/27] fix: disable reading functions if wrong chain

---
 .../AddLiquidityModal/AddSectionStandard.tsx  | 23 ++++++----
 .../RemoveSectionStandard.tsx                 |  9 ++--
 .../useMinUnderlyingTokens.ts                 |  6 ++-
 src/components/Library/StakingModal/index.tsx | 42 ++++---------------
 .../Library/UnstakingModal/index.tsx          | 29 +++++++------
 src/hooks/useApprovalHooks.ts                 |  6 +--
 src/hooks/useMinLPTokens.ts                   |  5 ++-
 src/hooks/useTokenReserves.ts                 |  9 +++-
 8 files changed, 61 insertions(+), 68 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
index adf1bcd..95a9983 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStandard.tsx
@@ -94,6 +94,9 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const firstInputRef = useRef<HTMLInputElement>(null);
   const secondInputRef = useRef<HTMLInputElement>(null);
 
+  const isCorrectChain =
+    selectedFarm?.chain.toLowerCase() == chain?.name.toLowerCase();
+
   const [farmAsset0, farmAsset1] =
     selectedFarm?.asset.underlyingAssets ?? new Array<UnderlyingAssets>();
 
@@ -109,7 +112,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const { reserve0, reserve1 } = useTokenReserves(
     selectedFarm?.asset.address!,
     selectedFarm?.protocol!,
-    selectedFarm?.router!
+    selectedFarm?.router!,
+    isCorrectChain
   );
 
   const { minLpTokens, totalSupply } = useMinimumLPTokens(
@@ -120,7 +124,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     fixedAmtNum(firstTokenAmount),
     fixedAmtNum(secondTokenAmount),
     farmAsset0.decimals,
-    farmAsset1.decimals
+    farmAsset1.decimals,
+    isCorrectChain
   );
 
   useEffect(() => {
@@ -142,7 +147,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
   const { data: nativeBal, isLoading: isLoadingNativeBal } = useBalance({
     address,
     chainId: chain?.id,
-    enabled: !!address,
+    enabled: !!address && isCorrectChain,
   });
   const [nativePrice, setNativePrice] = useState<number>(0);
 
@@ -173,7 +178,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     address,
     chainId: chain?.id,
     token: farmAsset0?.address,
-    enabled: !!address && !!selectedFarm,
+    enabled: !!address && !!selectedFarm && isCorrectChain,
   });
 
   // Balance Token1
@@ -181,7 +186,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     address,
     chainId: chain?.id,
     token: farmAsset1?.address,
-    enabled: !!address && !!selectedFarm,
+    enabled: !!address && !!selectedFarm && isCorrectChain,
   });
 
   // Check Approval Token0 & Token1
@@ -193,7 +198,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     farmAsset0?.address,
     selectedFarm?.router!,
     token0Balance,
-    fixedAmtNum(firstTokenAmount)
+    fixedAmtNum(firstTokenAmount),
+    isCorrectChain
   );
 
   const {
@@ -204,7 +210,8 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     farmAsset1?.address,
     selectedFarm?.router!,
     token1Balance,
-    fixedAmtNum(secondTokenAmount)
+    fixedAmtNum(secondTokenAmount),
+    isCorrectChain
   );
 
   // To approve token0 and token1
@@ -1002,7 +1009,7 @@ const AddSectionStandard: FC<PropsWithChildren> = () => {
     }
   }, [isOpenModalCondition]);
 
-  if (selectedFarm?.chain.toLowerCase() !== chain?.name.toLowerCase()) {
+  if (!isCorrectChain) {
     return (
       <WrongNetworkModal
         isOpen={isOpen}
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
index 6cb444d..6cb159c 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStandard.tsx
@@ -87,6 +87,8 @@ const RemoveSectionStandard = () => {
 
   const { chain } = useNetwork();
 
+  const isCorrectChain = farm?.chain.toLowerCase() == chain?.name.toLowerCase();
+
   const tokenNames = formatTokenSymbols(farm?.asset.symbol ?? "");
   // const [token0, token1] = tokenNames;
   const [farmAsset0, farmAsset1] =
@@ -102,7 +104,8 @@ const RemoveSectionStandard = () => {
       : parseFloat(lpTokens),
     SLIPPAGE,
     farm?.asset.underlyingAssets[0].decimals!,
-    farm?.asset.underlyingAssets[1].decimals!
+    farm?.asset.underlyingAssets[1].decimals!,
+    isCorrectChain
   );
 
   // Transaction Process Steps
@@ -139,7 +142,7 @@ const RemoveSectionStandard = () => {
   const { data: nativeBal, isLoading: isLoadingNativeBal } = useBalance({
     address,
     chainId: chain?.id,
-    enabled: !!address,
+    enabled: !!address && isCorrectChain,
   });
 
   const [nativePrice, setNativePrice] = useState<number>(0);
@@ -831,7 +834,7 @@ const RemoveSectionStandard = () => {
     isLoadingRemoveLiqTxn ||
     isSlippageModalOpen;
 
-  if (farm?.chain.toLowerCase() !== chain?.name.toLowerCase()) {
+  if (!isCorrectChain) {
     return (
       <WrongNetworkModal
         isOpen={isOpen}
diff --git a/src/components/Library/RemoveLiquidityModal/useMinUnderlyingTokens.ts b/src/components/Library/RemoveLiquidityModal/useMinUnderlyingTokens.ts
index 1c43962..9c99a1d 100644
--- a/src/components/Library/RemoveLiquidityModal/useMinUnderlyingTokens.ts
+++ b/src/components/Library/RemoveLiquidityModal/useMinUnderlyingTokens.ts
@@ -17,13 +17,14 @@ export default function useMinimumUnderlyingTokens(
   lpAmount: number,
   slippage: number,
   d0: number,
-  d1: number
+  d1: number,
+  isEnable: boolean = false
 ): number[] {
   const { data: reserves } = useContractRead({
     address: pair,
     abi: parseAbi(lpAbi),
     functionName: "getReserves",
-    enabled: !!pair && !!protocol && protocol !== "curve",
+    enabled: !!pair && !!protocol && protocol !== "curve" && isEnable,
   });
 
   const totalReserves = reserves as bigint[];
@@ -35,6 +36,7 @@ export default function useMinimumUnderlyingTokens(
     address: pair,
     abi: parseAbi(lpAbi),
     functionName: "totalSupply",
+    enabled: !!pair && isEnable,
   });
 
   const minunderlyingtokens = useMemo(() => {
diff --git a/src/components/Library/StakingModal/index.tsx b/src/components/Library/StakingModal/index.tsx
index a7b185c..1959c55 100644
--- a/src/components/Library/StakingModal/index.tsx
+++ b/src/components/Library/StakingModal/index.tsx
@@ -61,7 +61,7 @@ const StakingModal = () => {
   const { address, connector } = useAccount();
   const { chain } = useNetwork();
 
-  const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
+  // const [lpUpdated, setLpUpdated] = useAtom(lpUpdatedAtom);
   const [lpTokenPricesMap] = useAtom(lpTokenPricesAtom);
 
   const [isSlippageModalOpen, setIsSlippageModalOpen] = useAtom(
@@ -84,9 +84,7 @@ const StakingModal = () => {
 
   const tokenNames = formatTokenSymbols(farm?.asset.symbol ?? "");
 
-  useEffect(() => {
-    // console.log("selectedFarm", farm);
-  }, [farm]);
+  const isCorrectChain = farm?.chain.toLowerCase() == chain?.name.toLowerCase();
 
   // When InputType.Percentage
   const handlePercChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -137,27 +135,11 @@ const StakingModal = () => {
 
     const amt =
       methodId == 0
-        ? // ? parseUnits(
-          //     `${
-          //       (lpBalanceNum * parseFloat(percentage == "" ? "0" : percentage)) /
-          //       100
-          //     }`,
-          //     18
-          //   )
-          pamt
+        ? pamt
         : BigNumber(lpTokens == "" ? "0" : lpTokens)
             .multipliedBy(BigNumber(10).pow(18))
             .decimalPlaces(0, 1)
             .toString();
-    // console.log(
-    //   "samt",
-    //   amt,
-    //   lpBalanceNum,
-    //   lpTokens,
-    //   lpBalance,
-    //   lpBalance?.formatted
-    // );
-    // : parseUnits(`${parseFloat(lpTokens == "" ? "0" : lpTokens)}`, 18); // amount
     if (farm?.protocol.toLowerCase() == "curve") {
       return [amt];
     } else if (farm?.protocol.toLowerCase() == "sirius") {
@@ -194,23 +176,12 @@ const StakingModal = () => {
     }
   }, [farm, tokenPricesMap]);
 
-  // // Gas estimate
-  // const { gasEstimate } = useGasEstimation(
-  //   farm!.chef,
-  //   0,
-  //   2,
-  //   farm?.protocol == "zenlink" ? ("stake" as any) : ("deposit" as any),
-  //   farm!,
-  //   address!,
-  //   getArgs()
-  // );
-
   // Balance of LP Tokens
   const { data: lpBalance, isLoading: lpBalanceLoading } = useBalance({
     address,
     chainId: chain?.id,
     token: farm?.asset.address,
-    enabled: !!farm,
+    enabled: !!farm && isCorrectChain,
   });
   const lpBalanceNum: number = !!lpBalance
     ? parseFloat(lpBalance.formatted)
@@ -226,7 +197,8 @@ const StakingModal = () => {
     lpBalance,
     methodId == 0
       ? (lpBalanceNum * fixedAmtNum(percentage)) / 100
-      : fixedAmtNum(lpTokens)
+      : fixedAmtNum(lpTokens),
+    isCorrectChain
   );
 
   const {
@@ -669,7 +641,7 @@ const StakingModal = () => {
     );
   };
 
-  if (farm?.chain.toLowerCase() !== chain?.name.toLowerCase()) {
+  if (!isCorrectChain) {
     return (
       <WrongNetworkModal
         isOpen={isOpen}
diff --git a/src/components/Library/UnstakingModal/index.tsx b/src/components/Library/UnstakingModal/index.tsx
index 68249aa..00df843 100644
--- a/src/components/Library/UnstakingModal/index.tsx
+++ b/src/components/Library/UnstakingModal/index.tsx
@@ -200,21 +200,24 @@ const UnstakingModal = () => {
         ? "userInfos"
         : "userInfo",
     args: farm?.protocol == "curve" ? [address] : [farm?.id, address],
-    enabled: !!farm && !!address,
+    enabled:
+      !!farm &&
+      !!address &&
+      farm?.chain.toLowerCase() == chain?.name.toLowerCase(),
   });
 
-  useEffect(() => {
-    // console.log("userInfo", userInfo, "\nargs", {
-    // address: farm?.chef as Address,
-    // abi: parseAbi(chefAbi),
-    // functionName:
-    //   farm?.protocol == "curve" || farm?.protocol.toLowerCase() == "sirius"
-    //     ? "balanceOf"
-    //     : "userInfo",
-    // args: farm?.protocol == "curve" ? [address] : [farm?.id, address],
-    // enabled: !!farm && !!address,
-    // });
-  }, [userInfo]);
+  // useEffect(() => {
+  // console.log("userInfo", userInfo, "\nargs", {
+  // address: farm?.chef as Address,
+  // abi: parseAbi(chefAbi),
+  // functionName:
+  //   farm?.protocol == "curve" || farm?.protocol.toLowerCase() == "sirius"
+  //     ? "balanceOf"
+  //     : "userInfo",
+  // args: farm?.protocol == "curve" ? [address] : [farm?.id, address],
+  // enabled: !!farm && !!address,
+  // });
+  // }, [userInfo]);
 
   const staked: string = useMemo(() => {
     // console.log("stakeduserInfo", userInfo);
diff --git a/src/hooks/useApprovalHooks.ts b/src/hooks/useApprovalHooks.ts
index a88e042..24ec864 100644
--- a/src/hooks/useApprovalHooks.ts
+++ b/src/hooks/useApprovalHooks.ts
@@ -32,7 +32,8 @@ const useIsApprovedToken = (
   tokenAddress: Address,
   spender: Address,
   tokenBalance: TokenBalance | undefined,
-  input: number
+  input: number,
+  isEnable: boolean = false
 ) => {
   const { address } = useAccount();
 
@@ -41,7 +42,7 @@ const useIsApprovedToken = (
     abi: parseAbi(tokenAbi),
     functionName: "allowance",
     args: [address, spender], // owner, spender
-    enabled: !!address && !!spender,
+    enabled: !!address && !!spender && isEnable,
   });
 
   const allowanceRaw = data as bigint;
@@ -93,7 +94,6 @@ const useApproveToken = (
   tokenBalance: TokenBalance | undefined
 ) => {
   const { chain } = useNetwork();
-
   const {
     data,
     isLoading: isLoadingApproveCall,
diff --git a/src/hooks/useMinLPTokens.ts b/src/hooks/useMinLPTokens.ts
index f88a8d8..8616435 100644
--- a/src/hooks/useMinLPTokens.ts
+++ b/src/hooks/useMinLPTokens.ts
@@ -12,7 +12,8 @@ const useMinimumLPTokens = (
   amount0: number,
   amount1: number,
   d0: number,
-  d1: number
+  d1: number,
+  isEnable: boolean = false
 ) => {
   /**
    * LP Tokens received ->
@@ -24,7 +25,7 @@ const useMinimumLPTokens = (
     address: pair,
     abi: parseAbi(lpAbi),
     functionName: "totalSupply",
-    enabled: !!pair,
+    enabled: !!pair && isEnable,
   });
 
   const minLpToken = useMemo(() => {
diff --git a/src/hooks/useTokenReserves.ts b/src/hooks/useTokenReserves.ts
index 25f3796..141ca1f 100644
--- a/src/hooks/useTokenReserves.ts
+++ b/src/hooks/useTokenReserves.ts
@@ -6,7 +6,12 @@ import {
 import { Address, parseAbi } from "viem";
 import { useContractRead } from "wagmi";
 
-const useTokenReserves = (pair: Address, protocol: string, router: Address) => {
+const useTokenReserves = (
+  pair: Address,
+  protocol: string,
+  router: Address,
+  isEnable: boolean = false
+) => {
   const { data: d } = useContractRead({
     address: protocol.toLowerCase() == "sirius" ? router : pair,
     abi: parseAbi(
@@ -23,7 +28,7 @@ const useTokenReserves = (pair: Address, protocol: string, router: Address) => {
         ? "getTokenBalance"
         : "getReserves",
     args: protocol.toLowerCase() == "sirius" ? [0] : [],
-    enabled: !!protocol,
+    enabled: !!protocol && isEnable,
   });
   const { data: bal1 } = useContractRead({
     address: router,

From 46220b10572291865d84d31f793eb1de968287fa Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Fri, 25 Aug 2023 00:10:02 +0530
Subject: [PATCH 26/27] fix: for stable disable read_methods on wrong chain

---
 .../AddLiquidityModal/AddSectionStable.tsx    | 14 ++++++++----
 .../RemoveSectionStable.tsx                   | 22 +++++++++++--------
 src/hooks/useLPBalance.ts                     |  4 ++--
 src/hooks/useMinLPTokensStable.ts             | 15 +++----------
 src/hooks/useTotalSupply.ts                   |  9 +++++---
 src/utils/useCalcMinAmount.ts                 |  5 +++--
 tailwind.config.js                            |  2 +-
 7 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
index 54ed968..a916d40 100644
--- a/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
+++ b/src/components/Library/AddLiquidityModal/AddSectionStable.tsx
@@ -15,7 +15,6 @@ import {
   slippageModalOpenAtom,
 } from "@store/commonAtoms";
 import {
-  farmsAtom,
   lpTokenPricesAtom,
   positionsAtom,
   selectedFarmAtom,
@@ -101,6 +100,8 @@ const AddSectionStable: FC = () => {
     [address: Address]: boolean;
   }>({});
 
+  const isCorrectChain = farm?.chain.toLowerCase() == chain?.name.toLowerCase();
+
   // const [farms] = useAtom(farmsAtom);
   const [positions, setPositions] = useAtom(positionsAtom);
   const [lpTokenPricesMap, setLpTokenPricesMap] = useAtom(lpTokenPricesAtom);
@@ -132,7 +133,11 @@ const AddSectionStable: FC = () => {
   // Input focus states
   const [focusedInput, setFocusedInput] = useState<number>(0);
 
-  const totalSupply = useTotalSupply(farm?.asset.address!, farm?.protocol!);
+  const totalSupply = useTotalSupply(
+    farm?.asset.address!,
+    farm?.protocol!,
+    isCorrectChain
+  );
 
   const { data: nativeBal, isLoading: isLoadingNativeBal } = useBalance({
     address,
@@ -182,7 +187,8 @@ const AddSectionStable: FC = () => {
   const estLpAmount = useMinLPTokensStable(
     farm?.router!,
     farm?.protocol!,
-    amounts
+    amounts,
+    isCorrectChain
   );
 
   const {
@@ -688,7 +694,7 @@ const AddSectionStable: FC = () => {
     );
   };
 
-  if (farm?.chain.toLowerCase() !== chain?.name.toLowerCase()) {
+  if (!isCorrectChain) {
     return (
       <WrongNetworkModal
         isOpen={isOpen}
diff --git a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
index 8220d6b..a5de893 100644
--- a/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
+++ b/src/components/Library/RemoveLiquidityModal/RemoveSectionStable.tsx
@@ -75,6 +75,8 @@ const RemoveSectionStable: FC = () => {
 
   const [txnHash, setTxnHash] = useState<string>("");
 
+  const isCorrectChain = farm?.chain.toLowerCase() == chain?.name.toLowerCase();
+
   // const [farms] = useAtom(farmsAtom);
   const [positions, setPositions] = useAtom(positionsAtom);
   const [lpTokenPricesMap, setLpTokenPricesMap] = useAtom(lpTokenPricesAtom);
@@ -86,7 +88,8 @@ const RemoveSectionStable: FC = () => {
 
   // Balance of LP Token
   const { lpBalanceObj, lpBalance, lpBalanceLoading } = useLPBalance(
-    farm?.asset.address!
+    farm?.asset.address!,
+    isCorrectChain
   );
 
   const [percentage, setPercentage] = useState("");
@@ -138,7 +141,7 @@ const RemoveSectionStable: FC = () => {
   const { data: nativeBal, isLoading: isLoadingNativeBal } = useBalance({
     address,
     chainId: chain?.id,
-    enabled: !!address,
+    enabled: !!address && isCorrectChain,
   });
 
   const [nativePrice, setNativePrice] = useState<number>(0);
@@ -168,14 +171,15 @@ const RemoveSectionStable: FC = () => {
       : parseFloat(lpTokens !== "" ? lpTokens : "0"),
     farm!,
     removeMethodId,
-    indiTokenId
+    indiTokenId,
+    isCorrectChain
   );
 
-  useEffect(() => {
-    if (!isLoadingMinAmount) {
-      // console.log("minamoutdata removeliq stable", minAmount);
-    }
-  }, [isLoadingMinAmount]);
+  // useEffect(() => {
+  // if (!isLoadingMinAmount) {
+  // console.log("minamoutdata removeliq stable", minAmount);
+  // }
+  // }, [isLoadingMinAmount]);
 
   const getArgs = (
     removalId: number,
@@ -867,7 +871,7 @@ const RemoveSectionStable: FC = () => {
     isLoadingRemoveLiqTxn ||
     isSlippageModalOpen;
 
-  if (farm?.chain.toLowerCase() !== chain?.name.toLowerCase()) {
+  if (!isCorrectChain) {
     return (
       <WrongNetworkModal
         isOpen={isOpen}
diff --git a/src/hooks/useLPBalance.ts b/src/hooks/useLPBalance.ts
index ff97a94..fe294e9 100644
--- a/src/hooks/useLPBalance.ts
+++ b/src/hooks/useLPBalance.ts
@@ -1,6 +1,6 @@
 import { Address, useAccount, useBalance, useNetwork } from "wagmi";
 
-const useLPBalance = (lpAddress: Address) => {
+const useLPBalance = (lpAddress: Address, isEnable: boolean = false) => {
   const { chain } = useNetwork();
   const { address } = useAccount();
 
@@ -9,7 +9,7 @@ const useLPBalance = (lpAddress: Address) => {
     address,
     chainId: chain?.id,
     token: lpAddress,
-    enabled: !!address && !!lpAddress && !!chain,
+    enabled: !!address && !!lpAddress && !!chain && isEnable,
   });
 
   const lpBalance = lpBalanceLoading ? "0" : lpbalance?.formatted;
diff --git a/src/hooks/useMinLPTokensStable.ts b/src/hooks/useMinLPTokensStable.ts
index 9f2b3a5..3811a49 100644
--- a/src/hooks/useMinLPTokensStable.ts
+++ b/src/hooks/useMinLPTokensStable.ts
@@ -5,26 +5,17 @@ import { getRouterAbi } from "@utils/abis/contract-helper-methods";
 const useMinLPTokensStable = (
   router: Address,
   protocol: string,
-  amounts: bigint[]
+  amounts: bigint[],
+  isEnable: boolean = false
 ) => {
   const { data: lpAmount } = useContractRead({
     address: router,
     abi: parseAbi(getRouterAbi(protocol, true)),
     functionName:
       protocol == "curve" ? "calc_token_amount" : "calculateTokenAmount",
-    enabled: !!router && !!protocol,
+    enabled: !!router && !!protocol && isEnable,
     args: [amounts, 1],
   });
-
-  // // console.log("lpAmount", Number(lpAmount) / 10 ** 18, {
-  //   address: router,
-  //   abi: parseAbi(getRouterAbi(protocol, true)),
-  //   functionName:
-  //     protocol == "curve" ? "calc_token_amount" : "calculateTokenAmount",
-  //   enabled: !!router && !!protocol,
-  //   args: [amounts, 1],
-  // });
-
   return Number(lpAmount) / 10 ** 18;
 };
 
diff --git a/src/hooks/useTotalSupply.ts b/src/hooks/useTotalSupply.ts
index be0c36e..37c6b3c 100644
--- a/src/hooks/useTotalSupply.ts
+++ b/src/hooks/useTotalSupply.ts
@@ -2,14 +2,17 @@ import { curveLpAbi, lpAbi } from "@components/Common/Layout/evmUtils";
 import { Address, parseAbi } from "viem";
 import { useContractRead } from "wagmi";
 
-const useTotalSupply = (pair: Address, protocol: string) => {
+const useTotalSupply = (
+  pair: Address,
+  protocol: string,
+  isEnable: boolean = false
+) => {
   const { data: totalSupply } = useContractRead({
     address: pair,
     abi: parseAbi(protocol.toLowerCase() === "curve" ? curveLpAbi : lpAbi),
     functionName: "totalSupply",
-    enabled: !!pair && !!protocol,
+    enabled: !!pair && !!protocol && isEnable,
   });
-  // // console.log("totalsupply @hook", Number(totalSupply) / 10 ** 18);
   return Number(totalSupply) / 10 ** 18;
 };
 
diff --git a/src/utils/useCalcMinAmount.ts b/src/utils/useCalcMinAmount.ts
index a3953e9..90d2a8d 100644
--- a/src/utils/useCalcMinAmount.ts
+++ b/src/utils/useCalcMinAmount.ts
@@ -11,14 +11,15 @@ const useCalcMinAmount = (
   amount: number,
   farm: FarmType,
   removalId: number,
-  singleTokenIndex: number
+  singleTokenIndex: number,
+  isEnable: boolean = false
 ) => {
   const { chain } = useNetwork();
   const [SLIPPAGE] = useAtom(slippageAtom);
 
   const { data: lpToken } = useToken({
     address: farm?.asset.address,
-    enabled: !!farm,
+    enabled: !!farm && isEnable,
   });
 
   // console.log("ridddd", removalId);
diff --git a/tailwind.config.js b/tailwind.config.js
index 6ba30e4..8ec57c3 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -18,7 +18,7 @@ module.exports = {
         baseBlueDark: "#010E23",
         primaryBlue: "#3780FF",
         primaryWhite: "#EEF1FC",
-        blueSilver: "#E2E8FF",
+        blueSilver: "#E3E3E3",
         bodyGray: "#EEF1FC",
         mediumGray: "#838383",
         success300: "#C5FFDC",

From 1f8b8e4959fb68af715ebc6e16edbdefe820192d Mon Sep 17 00:00:00 2001
From: Luke Skywalker <skywalker.eth@protonmail.com>
Date: Fri, 25 Aug 2023 00:54:21 +0530
Subject: [PATCH 27/27] audited PositionCard + fixed Banner on staked

---
 src/components/Portfolio/PositionCard.tsx | 77 ++++++++++++++---------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/components/Portfolio/PositionCard.tsx b/src/components/Portfolio/PositionCard.tsx
index d1d4b9b..e7f040e 100644
--- a/src/components/Portfolio/PositionCard.tsx
+++ b/src/components/Portfolio/PositionCard.tsx
@@ -1,4 +1,4 @@
-import { FC, useState } from "react";
+import { FC, useCallback, useState } from "react";
 import Link from "next/link";
 import clsx from "clsx";
 import {
@@ -44,6 +44,30 @@ const PositionCard: FC<Props> = ({ tokenNames, thisFarm, position }) => {
   const [, setUnstakingModalOpen] = useAtom(unstakingModalOpenAtom);
   const [, setSelectedFarm] = useAtom(selectedFarmAtom);
 
+  const handleAddLiquidity = useCallback(() => {
+    setAddLiqModalOpen(true);
+    setSelectedFarm(thisFarm);
+  }, [setAddLiqModalOpen, setSelectedFarm, thisFarm]);
+
+  const handleRemoveLiquidity = useCallback(() => {
+    setRemoveLiqModalOpen(true);
+    setSelectedFarm(thisFarm);
+  }, [setRemoveLiqModalOpen, setSelectedFarm, thisFarm]);
+
+  const handleStake = useCallback(() => {
+    setStakingModalOpen(true);
+    setSelectedFarm(thisFarm);
+  }, [setStakingModalOpen, setSelectedFarm, thisFarm]);
+
+  const handleUnstake = useCallback(() => {
+    setUnstakingModalOpen(true);
+    setSelectedFarm(thisFarm);
+  }, [setUnstakingModalOpen, setSelectedFarm, thisFarm]);
+
+  const toggleShowRewards = useCallback(() => {
+    setShowRewards((prevShowRewards) => !prevShowRewards);
+  }, []);
+
   return (
     <li className="col-span-1 divide-y border border-[#EAECF0] h-fit divide-[#EAECF0] z-0 p-6 max-w-sm rounded-xl bg-white shadow">
       <div className="flex-1 flex flex-row justify-between truncate mb-6">
@@ -125,10 +149,7 @@ const PositionCard: FC<Props> = ({ tokenNames, thisFarm, position }) => {
           <Button
             size="large"
             style="inline-flex justify-between items-center"
-            onButtonClick={() => {
-              setAddLiqModalOpen(true);
-              setSelectedFarm(thisFarm);
-            }}
+            onButtonClick={handleAddLiquidity}
           >
             <span>Add Liquidity</span>
             <PlusIcon className="text-black h-4 w-4" />
@@ -136,10 +157,7 @@ const PositionCard: FC<Props> = ({ tokenNames, thisFarm, position }) => {
           <Button
             size="large"
             style="inline-flex justify-between items-center"
-            onButtonClick={() => {
-              setRemoveLiqModalOpen(true);
-              setSelectedFarm(thisFarm);
-            }}
+            onButtonClick={handleRemoveLiquidity}
             disabled={
               position?.chain.toLowerCase() != "mangata kusama"
                 ? position.unstaked.amountUSD == 0
@@ -155,10 +173,7 @@ const PositionCard: FC<Props> = ({ tokenNames, thisFarm, position }) => {
               <Button
                 size="large"
                 style="inline-flex justify-between items-center w-1/2"
-                onButtonClick={() => {
-                  setStakingModalOpen(true);
-                  setSelectedFarm(thisFarm);
-                }}
+                onButtonClick={handleStake}
                 disabled={position.unstaked.amountUSD == 0}
                 tooltipText="You need to have liquidity first"
               >
@@ -173,10 +188,7 @@ const PositionCard: FC<Props> = ({ tokenNames, thisFarm, position }) => {
               <Button
                 size="large"
                 style="inline-flex justify-between items-center w-1/2"
-                onButtonClick={() => {
-                  setUnstakingModalOpen(true);
-                  setSelectedFarm(thisFarm);
-                }}
+                onButtonClick={handleUnstake}
                 disabled={position.staked.amountUSD == 0}
                 tooltipText="You need to stake tokens first"
               >
@@ -204,7 +216,7 @@ const PositionCard: FC<Props> = ({ tokenNames, thisFarm, position }) => {
                 "w-full inline-flex justify-between items-center bg-[#EDEDED] py-2 px-3",
                 showRewards ? "rounded-t-lg" : "rounded-lg"
               )}
-              onClick={() => setShowRewards(!showRewards)}
+              onClick={toggleShowRewards}
             >
               <p>Reward Breakdown</p>
               <ChevronDownIcon
@@ -262,19 +274,22 @@ const PositionCard: FC<Props> = ({ tokenNames, thisFarm, position }) => {
             </div>
           </div>
         )}
-        <div className="flex flex-col gap-2 sm:flex-row items-center text-base leading-5 justify-center py-6 bg-[#EDEDFF] rounded-lg">
-          <span className="font-medium">
-            Staked at {(thisFarm?.apr.base + thisFarm?.apr.reward).toFixed(2)}%
-            APY
-          </span>
-          <Link
-            // href={`/farm/${position.id}?addr=${position.address}`}
-            href={`/farm/${thisFarm?.id}?addr=${thisFarm?.asset.address}`}
-            className="font-bold underline underline-offset-2"
-          >
-            View Farm
-          </Link>
-        </div>
+        {/* Banner -- Display the APR at which liquidity is staked in a Pool */}
+        {position.staked.amount > 0 && !!thisFarm && (
+          <div className="flex flex-col gap-2 sm:flex-row items-center text-base leading-5 justify-center py-6 bg-[#EDEDFF] rounded-lg">
+            <span className="font-medium">
+              Staked at {(thisFarm.apr.base + thisFarm.apr.reward).toFixed(2)}%
+              APY
+            </span>
+            <Link
+              href={`/farm/${thisFarm.id}?addr=${thisFarm.asset.address}`}
+              className="font-bold underline underline-offset-2"
+              aria-label="View Farm"
+            >
+              View Farm
+            </Link>
+          </div>
+        )}
       </div>
     </li>
   );