diff --git a/src/App/hooks/useHandleRangeButtonMessage.ts b/src/App/hooks/useHandleRangeButtonMessage.ts
index fcf014ebe0..bc1c15fb80 100644
--- a/src/App/hooks/useHandleRangeButtonMessage.ts
+++ b/src/App/hooks/useHandleRangeButtonMessage.ts
@@ -38,7 +38,8 @@ export function useHandleRangeButtonMessage(
         } else if (
             (tokenAmount === '0' ||
                 tokenAmount === '0.00' ||
-                tokenAmount === '') &&
+                tokenAmount === '' ||
+                parseFloat(tokenAmount) < 0) &&
             !isTokenInputDisabled
         ) {
             rangeButtonErrorMessage = 'Enter an Amount';
diff --git a/src/components/Form/TokenInputQuantity.tsx b/src/components/Form/TokenInputQuantity.tsx
index 6c83fa3aca..86f81f95cd 100644
--- a/src/components/Form/TokenInputQuantity.tsx
+++ b/src/components/Form/TokenInputQuantity.tsx
@@ -114,12 +114,25 @@ function TokenInputQuantity(props: propsIF) {
 
     const onChange = (event: ChangeEvent<HTMLInputElement>) => {
         let inputStringNoCommas = event.target.value
-            .replace(/,/g, '.')
-            .replace(/\s+/g, '');
+            .replace(/,/g, '.') // Replace commas with dots
+            .replace(/\s+/g, ''); // Remove any spaces
+
+        if (inputStringNoCommas === '.') inputStringNoCommas = '0.';
+
+        const inputStringNoUnfinishedExponent = isNaN(+inputStringNoCommas)
+            ? inputStringNoCommas.replace(
+                  /e[+-]?(?!\d)/gi, // Match 'e', 'e-' or 'e+' only if NOT followed by a number
+                  '',
+              )
+            : inputStringNoCommas;
+
         const isPrecisionGreaterThanDecimals =
             precisionOfInput(inputStringNoCommas) > token.decimals;
-        if (inputStringNoCommas === '.') inputStringNoCommas = '0.';
-        if (!isPrecisionGreaterThanDecimals && !isNaN(+inputStringNoCommas)) {
+
+        if (
+            !isPrecisionGreaterThanDecimals &&
+            !isNaN(+inputStringNoUnfinishedExponent)
+        ) {
             handleTokenInputEvent(inputStringNoCommas);
             setDisplayValue(inputStringNoCommas);
         }
diff --git a/src/components/Swap/SwapTokenInput/SwapTokenInput.tsx b/src/components/Swap/SwapTokenInput/SwapTokenInput.tsx
index dd3f8b6827..ae335c521f 100644
--- a/src/components/Swap/SwapTokenInput/SwapTokenInput.tsx
+++ b/src/components/Swap/SwapTokenInput/SwapTokenInput.tsx
@@ -16,7 +16,10 @@ import { PoolContext } from '../../../contexts/PoolContext';
 import { TradeTableContext } from '../../../contexts/TradeTableContext';
 import { TradeTokenContext } from '../../../contexts/TradeTokenContext';
 import { FlexContainer } from '../../../styled/Common';
-import { truncateDecimals } from '../../../ambient-utils/dataLayer';
+import {
+    precisionOfInput,
+    truncateDecimals,
+} from '../../../ambient-utils/dataLayer';
 import { linkGenMethodsIF, useLinkGen } from '../../../utils/hooks/useLinkGen';
 import { formatTokenInput } from '../../../utils/numbers';
 import TokenInputWithWalletBalance from '../../Form/TokenInputWithWalletBalance';
@@ -152,7 +155,7 @@ function SwapTokenInput(props: propsIF) {
         input: string,
         sellToken: boolean,
     ): Promise<number | undefined> {
-        if (isNaN(parseFloat(input)) || parseFloat(input) === 0 || !crocEnv) {
+        if (isNaN(parseFloat(input)) || parseFloat(input) <= 0 || !crocEnv) {
             setIsLiquidityInsufficient(false);
 
             return undefined;
@@ -175,10 +178,24 @@ function SwapTokenInput(props: propsIF) {
             });
         }
         if (sellToken) {
+            let precisionForTruncation = 6;
+
             const rawTokenBQty = impact?.buyQty ? parseFloat(impact.buyQty) : 0;
+
+            // find the largest precision that doesn't exceed the token's decimal places
+            while (
+                precisionOfInput(
+                    rawTokenBQty.toPrecision(precisionForTruncation),
+                ) > tokenB.decimals &&
+                precisionForTruncation > 1
+            ) {
+                precisionForTruncation--;
+            }
             const truncatedTokenBQty = rawTokenBQty
                 ? rawTokenBQty < 2
-                    ? rawTokenBQty.toPrecision(6)
+                    ? rawTokenBQty
+                          .toPrecision(precisionForTruncation)
+                          .replace(/\.?0+$/, '')
                     : truncateDecimals(rawTokenBQty, rawTokenBQty < 100 ? 3 : 2)
                 : '';
 
@@ -188,12 +205,27 @@ function SwapTokenInput(props: propsIF) {
                 setIsBuyLoading(false);
             }
         } else {
+            let precisionForTruncation = 6;
+
             const rawTokenAQty = impact?.sellQty
                 ? parseFloat(impact.sellQty)
                 : 0;
+
+            // find the largest precision that doesn't exceed the token's decimal places
+            while (
+                precisionOfInput(
+                    rawTokenAQty.toPrecision(precisionForTruncation),
+                ) > tokenA.decimals &&
+                precisionForTruncation > 1
+            ) {
+                precisionForTruncation--;
+            }
+
             const truncatedTokenAQty = rawTokenAQty
                 ? rawTokenAQty < 2
-                    ? rawTokenAQty.toPrecision(6)
+                    ? rawTokenAQty
+                          .toPrecision(precisionForTruncation)
+                          .replace(/\.?0+$/, '')
                     : truncateDecimals(rawTokenAQty, rawTokenAQty < 100 ? 3 : 2)
                 : '';
 
diff --git a/src/components/Trade/Limit/LimitTokenInput/LimitTokenInput.tsx b/src/components/Trade/Limit/LimitTokenInput/LimitTokenInput.tsx
index 45ab5d8702..21d01d1bf0 100644
--- a/src/components/Trade/Limit/LimitTokenInput/LimitTokenInput.tsx
+++ b/src/components/Trade/Limit/LimitTokenInput/LimitTokenInput.tsx
@@ -5,7 +5,10 @@ import { PoolContext } from '../../../../contexts/PoolContext';
 import { TradeTableContext } from '../../../../contexts/TradeTableContext';
 import { TradeTokenContext } from '../../../../contexts/TradeTokenContext';
 import { FlexContainer } from '../../../../styled/Common';
-import { truncateDecimals } from '../../../../ambient-utils/dataLayer';
+import {
+    precisionOfInput,
+    truncateDecimals,
+} from '../../../../ambient-utils/dataLayer';
 import {
     limitParamsIF,
     linkGenMethodsIF,
@@ -155,9 +158,34 @@ function LimitTokenInput(props: propsIF) {
             );
         }
 
+        let precisionForTruncation = 6;
+
+        const fixedTokenBQty = parseFloat(
+            rawTokenBQty.toFixed(tokenB.decimals),
+        );
+
+        const precisionOfTruncatedTokenBQty = precisionOfInput(
+            fixedTokenBQty.toPrecision(precisionForTruncation),
+        );
+
+        // find the largest precision that doesn't exceed the token's decimal places
+        while (
+            precisionOfTruncatedTokenBQty > tokenB.decimals &&
+            precisionForTruncation > 1
+        ) {
+            precisionForTruncation--;
+        }
+
+        const truncatedTokenBQtyIsZero =
+            fixedTokenBQty.toPrecision(precisionForTruncation) === '0.00000';
+
         const truncatedTokenBQty = rawTokenBQty
             ? rawTokenBQty < 2
-                ? rawTokenBQty.toPrecision(6)
+                ? truncatedTokenBQtyIsZero
+                    ? '0'
+                    : fixedTokenBQty
+                          .toPrecision(precisionForTruncation)
+                          .replace(/\.?0+$/, '') // Remove trailing zeros
                 : truncateDecimals(rawTokenBQty, 2)
             : '';
 
@@ -220,9 +248,34 @@ function LimitTokenInput(props: propsIF) {
                 fromDisplayQty(formattedRawTokenAQty, tokenA.decimals),
             );
         }
+        let precisionForTruncation = 6;
+
+        const fixedTokenAQty = parseFloat(
+            rawTokenAQty.toFixed(tokenA.decimals),
+        );
+
+        const precisionOfTruncatedTokenAQty = precisionOfInput(
+            fixedTokenAQty.toPrecision(precisionForTruncation),
+        );
+
+        // find the largest precision that doesn't exceed the token's decimal places
+        while (
+            precisionOfTruncatedTokenAQty > tokenA.decimals &&
+            precisionForTruncation > 1
+        ) {
+            precisionForTruncation--;
+        }
+
+        const truncatedTokenAQtyIsZero =
+            fixedTokenAQty.toPrecision(precisionForTruncation) === '0.00000';
+
         const truncatedTokenAQty = rawTokenAQty
             ? rawTokenAQty < 2
-                ? rawTokenAQty.toPrecision(6)
+                ? truncatedTokenAQtyIsZero
+                    ? '0'
+                    : fixedTokenAQty
+                          .toPrecision(precisionForTruncation)
+                          .replace(/\.?0+$/, '')
                 : truncateDecimals(rawTokenAQty, 2)
             : '';
 
diff --git a/src/pages/platformAmbient/Trade/Limit/Limit.tsx b/src/pages/platformAmbient/Trade/Limit/Limit.tsx
index 037e277de1..0d0a802be9 100644
--- a/src/pages/platformAmbient/Trade/Limit/Limit.tsx
+++ b/src/pages/platformAmbient/Trade/Limit/Limit.tsx
@@ -123,6 +123,30 @@ export default function Limit() {
     const [tokenBInputQty, setTokenBInputQty] = useState<string>(
         !isTokenAPrimary ? primaryQuantity : '',
     );
+
+    const tokenAInputQtyNoExponentString = useMemo(() => {
+        return tokenAInputQty.includes('e')
+            ? toDisplayQty(
+                  fromDisplayQty(tokenAInputQty || '0', tokenA.decimals),
+                  tokenA.decimals,
+              )
+            : tokenAInputQty;
+    }, [tokenAInputQty, tokenA.decimals]);
+
+    const tokenBInputQtyNoExponentString = useMemo(() => {
+        try {
+            return tokenBInputQty.includes('e')
+                ? toDisplayQty(
+                      fromDisplayQty(tokenBInputQty || '0', tokenB.decimals),
+                      tokenB.decimals,
+                  )
+                : tokenBInputQty;
+        } catch (error) {
+            console.log({ error });
+            return tokenBInputQty;
+        }
+    }, [tokenBInputQty, tokenB.decimals]);
+
     const [isWithdrawFromDexChecked, setIsWithdrawFromDexChecked] =
         useState(false);
     const [isSaveAsDexSurplusChecked, setIsSaveAsDexSurplusChecked] = useState(
@@ -187,14 +211,17 @@ export default function Limit() {
         : quoteTokenDexBalance;
     const tokenASurplusMinusTokenARemainderNum =
         fromDisplayQty(tokenADexBalance || '0', tokenA.decimals) -
-        fromDisplayQty(tokenAInputQty || '0', tokenA.decimals);
+        fromDisplayQty(tokenAInputQtyNoExponentString || '0', tokenA.decimals);
     const isTokenADexSurplusSufficient =
         tokenASurplusMinusTokenARemainderNum >= 0;
     const tokenAQtyCoveredByWalletBalance = isWithdrawFromDexChecked
         ? tokenASurplusMinusTokenARemainderNum < 0
             ? tokenASurplusMinusTokenARemainderNum * -1n
             : 0n
-        : fromDisplayQty(tokenAInputQty || '0', tokenA.decimals);
+        : fromDisplayQty(
+              tokenAInputQtyNoExponentString || '0',
+              tokenA.decimals,
+          );
     const isTokenAAllowanceSufficient =
         tokenAAllowance === undefined
             ? true
@@ -493,11 +520,14 @@ export default function Limit() {
 
     useEffect(() => {
         handleLimitButtonMessage(
-            fromDisplayQty(tokenAInputQty || '0', tokenA.decimals),
+            fromDisplayQty(
+                tokenAInputQtyNoExponentString || '0',
+                tokenA.decimals,
+            ),
         );
     }, [
         isOrderValid,
-        tokenAInputQty,
+        tokenAInputQtyNoExponentString,
         isPoolInitialized,
         poolPriceNonDisplay,
         limitTick,
@@ -601,8 +631,8 @@ export default function Limit() {
         const sellToken = tokenA.address;
         const buyToken = tokenB.address;
 
-        const sellQty = tokenAInputQty;
-        const buyQty = tokenBInputQty;
+        const sellQty = tokenAInputQtyNoExponentString;
+        const buyQty = tokenBInputQtyNoExponentString;
 
         const qty = isTokenAPrimary ? sellQty : buyQty;
         const type = isTokenAPrimary ? 'sell' : 'buy';
@@ -898,8 +928,8 @@ export default function Limit() {
 
     const percentDiffUsdValue =
         usdValueTokenA && usdValueTokenB
-            ? ((usdValueTokenB * parseFloat(tokenBInputQty) -
-                  usdValueTokenA * parseFloat(tokenAInputQty)) /
+            ? ((usdValueTokenB * parseFloat(tokenBInputQtyNoExponentString) -
+                  usdValueTokenA * parseFloat(tokenAInputQtyNoExponentString)) /
                   (usdValueTokenA * parseFloat(tokenAInputQty))) *
               100
             : 0;
@@ -921,7 +951,10 @@ export default function Limit() {
                         set: setTokenAInputQty,
                     }}
                     tokenBInputQty={{
-                        value: tokenBInputQty,
+                        value:
+                            tokenBInputQtyNoExponentString !== '0.0'
+                                ? tokenBInputQty
+                                : '0',
                         set: setTokenBInputQty,
                     }}
                     isSaveAsDexSurplusChecked={isSaveAsDexSurplusChecked}
@@ -964,8 +997,8 @@ export default function Limit() {
                     <ConfirmLimitModal
                         onClose={handleModalClose}
                         initiateLimitOrderMethod={sendLimitOrder}
-                        tokenAInputQty={tokenAInputQty}
-                        tokenBInputQty={tokenBInputQty}
+                        tokenAInputQty={tokenAInputQtyNoExponentString}
+                        tokenBInputQty={tokenBInputQtyNoExponentString}
                         insideTickDisplayPrice={endDisplayPrice}
                         newLimitOrderTransactionHash={
                             newLimitOrderTransactionHash
@@ -1029,7 +1062,7 @@ export default function Limit() {
                 isPoolInitialized &&
                 !isTokenAAllowanceSufficient &&
                 isTokenAWalletBalanceSufficient &&
-                parseFloat(tokenAInputQty) > 0 ? (
+                parseFloat(tokenAInputQtyNoExponentString) > 0 ? (
                     <Button
                         idForDOM='approve_limit_order_button'
                         style={{ textTransform: 'none' }}
diff --git a/src/pages/platformAmbient/Trade/Range/Range.tsx b/src/pages/platformAmbient/Trade/Range/Range.tsx
index f5d237f8d0..119ef8e6a6 100644
--- a/src/pages/platformAmbient/Trade/Range/Range.tsx
+++ b/src/pages/platformAmbient/Trade/Range/Range.tsx
@@ -1,4 +1,8 @@
-import { concDepositSkew, fromDisplayQty } from '@crocswap-libs/sdk';
+import {
+    concDepositSkew,
+    fromDisplayQty,
+    toDisplayQty,
+} from '@crocswap-libs/sdk';
 import { memo, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import Button from '../../../../components/Form/Button';
 import { useModal } from '../../../../components/Global/Modal/useModal';
@@ -116,10 +120,34 @@ function Range() {
     const [tokenAInputQty, setTokenAInputQty] = useState<string>(
         isTokenAPrimary ? primaryQuantity : '',
     );
+
     const [tokenBInputQty, setTokenBInputQty] = useState<string>(
         !isTokenAPrimary ? primaryQuantity : '',
     );
 
+    const tokenAInputQtyNoExponentString = useMemo(() => {
+        try {
+            return tokenAInputQty.includes('e')
+                ? toDisplayQty(
+                      fromDisplayQty(tokenAInputQty || '0', tokenA.decimals),
+                      tokenA.decimals,
+                  )
+                : tokenAInputQty;
+        } catch (error) {
+            console.log({ error });
+            return '0';
+        }
+    }, [tokenAInputQty, tokenA.decimals]);
+
+    const tokenBInputQtyNoExponentString = useMemo(() => {
+        return tokenBInputQty.includes('e')
+            ? toDisplayQty(
+                  fromDisplayQty(tokenBInputQty || '0', tokenB.decimals),
+                  tokenB.decimals,
+              )
+            : tokenBInputQty;
+    }, [tokenBInputQty, tokenB.decimals]);
+
     const [rangeWidthPercentage, setRangeWidthPercentage] =
         useState<number>(simpleRangeWidth);
     const [isAmbient, setIsAmbient] = useState(false);
@@ -258,23 +286,32 @@ function Range() {
 
     const tokenASurplusMinusTokenARemainderNum =
         fromDisplayQty(tokenADexBalance || '0', tokenA.decimals) -
-        fromDisplayQty(tokenAInputQty || '0', tokenA.decimals);
+        fromDisplayQty(tokenAInputQtyNoExponentString || '0', tokenA.decimals);
     const tokenBSurplusMinusTokenBRemainderNum =
         fromDisplayQty(tokenBDexBalance || '0', tokenB.decimals) -
-        fromDisplayQty(tokenBInputQty || '0', tokenB.decimals);
+        fromDisplayQty(tokenBInputQtyNoExponentString || '0', tokenB.decimals);
     const tokenAQtyCoveredByWalletBalance = isWithdrawTokenAFromDexChecked
         ? tokenASurplusMinusTokenARemainderNum < 0
             ? tokenASurplusMinusTokenARemainderNum * -1n
             : 0n
-        : fromDisplayQty(tokenAInputQty || '0', tokenA.decimals);
+        : fromDisplayQty(
+              tokenAInputQtyNoExponentString || '0',
+              tokenA.decimals,
+          );
     const tokenBQtyCoveredByWalletBalance = isWithdrawTokenBFromDexChecked
         ? tokenBSurplusMinusTokenBRemainderNum < 0
             ? tokenBSurplusMinusTokenBRemainderNum * -1n
             : 0n
-        : fromDisplayQty(tokenBInputQty || '0', tokenB.decimals);
-    const isQtyEntered = tokenAInputQty !== '' && tokenBInputQty !== '';
+        : fromDisplayQty(
+              tokenBInputQtyNoExponentString || '0',
+              tokenB.decimals,
+          );
+    const isQtyEntered =
+        tokenAInputQtyNoExponentString !== '' &&
+        tokenBInputQtyNoExponentString !== '';
     const showExtraInfoDropdown =
-        tokenAInputQty !== '' || tokenBInputQty !== '';
+        tokenAInputQtyNoExponentString !== '' ||
+        tokenBInputQtyNoExponentString !== '';
 
     const rangeSpanAboveCurrentPrice = defaultHighTick - currentPoolPriceTick;
     const rangeSpanBelowCurrentPrice = currentPoolPriceTick - defaultLowTick;
@@ -903,8 +940,12 @@ function Range() {
         createRangePosition({
             slippageTolerancePercentage,
             isAmbient,
-            tokenAInputQty: isTokenAInputDisabled ? '0' : tokenAInputQty,
-            tokenBInputQty: isTokenBInputDisabled ? '0' : tokenBInputQty,
+            tokenAInputQty: isTokenAInputDisabled
+                ? '0'
+                : tokenAInputQtyNoExponentString,
+            tokenBInputQty: isTokenBInputDisabled
+                ? '0'
+                : tokenBInputQtyNoExponentString,
             isWithdrawTokenAFromDexChecked,
             isWithdrawTokenBFromDexChecked,
             defaultLowTick,
@@ -945,7 +986,7 @@ function Range() {
         rangeButtonErrorMessage: rangeButtonErrorMessageTokenA,
     } = useHandleRangeButtonMessage(
         tokenA,
-        tokenAInputQty,
+        tokenAInputQtyNoExponentString,
         tokenABalance,
         tokenADexBalance,
         isTokenAInputDisabled,
@@ -1086,8 +1127,16 @@ function Range() {
             modal={
                 isOpen ? (
                     <ConfirmRangeModal
-                        tokenAQty={isTokenAInputDisabled ? '' : tokenAInputQty}
-                        tokenBQty={isTokenBInputDisabled ? '' : tokenBInputQty}
+                        tokenAQty={
+                            isTokenAInputDisabled
+                                ? ''
+                                : tokenAInputQtyNoExponentString
+                        }
+                        tokenBQty={
+                            isTokenBInputDisabled
+                                ? ''
+                                : tokenBInputQtyNoExponentString
+                        }
                         spotPriceDisplay={getFormattedNumber({
                             value: displayPriceWithDenom,
                         })}
diff --git a/src/pages/platformAmbient/Trade/Swap/Swap.tsx b/src/pages/platformAmbient/Trade/Swap/Swap.tsx
index ac19588fec..1835930bd7 100644
--- a/src/pages/platformAmbient/Trade/Swap/Swap.tsx
+++ b/src/pages/platformAmbient/Trade/Swap/Swap.tsx
@@ -1,4 +1,9 @@
-import { CrocImpact, bigIntToFloat, fromDisplayQty } from '@crocswap-libs/sdk';
+import {
+    CrocImpact,
+    bigIntToFloat,
+    fromDisplayQty,
+    toDisplayQty,
+} from '@crocswap-libs/sdk';
 import { useContext, useState, useEffect, memo, useRef, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 import {
@@ -120,6 +125,31 @@ function Swap(props: propsIF) {
     const [buyQtyString, setBuyQtyString] = useState<string>(
         !isTokenAPrimary ? primaryQuantity : '',
     );
+
+    const sellQtyNoExponentString = useMemo(() => {
+        try {
+            return sellQtyString.includes('e')
+                ? toDisplayQty(
+                      fromDisplayQty(sellQtyString || '0', tokenA.decimals),
+                      tokenA.decimals,
+                  )
+                : sellQtyString;
+        } catch (error) {
+            console.log({ error });
+            return sellQtyString;
+        }
+    }, [sellQtyString, tokenA.decimals]);
+
+    const buyQtyNoExponentString = useMemo(() => {
+        const buyQtyBigInt = fromDisplayQty(
+            buyQtyString || '0',
+            tokenB.decimals,
+        );
+        return buyQtyString.includes('e')
+            ? toDisplayQty(buyQtyBigInt, tokenB.decimals)
+            : buyQtyString;
+    }, [buyQtyString, tokenB.decimals]);
+
     const [isSellLoading, setIsSellLoading] = useState(false);
     const [isBuyLoading, setIsBuyLoading] = useState(false);
     const [swapAllowed, setSwapAllowed] = useState<boolean>(
@@ -195,16 +225,36 @@ function Swap(props: propsIF) {
         setPriceImpactNumMemo(priceImpactNum);
     }, [priceImpactNum]);
 
-    const tokenASurplusMinusTokenARemainderNum =
-        fromDisplayQty(tokenADexBalance || '0', tokenA.decimals) -
-        fromDisplayQty(sellQtyString || '0', tokenA.decimals);
+    const tokenASurplusMinusTokenARemainderNum = useMemo(() => {
+        try {
+            return (
+                fromDisplayQty(tokenADexBalance || '0', tokenA.decimals) -
+                fromDisplayQty(sellQtyNoExponentString || '0', tokenA.decimals)
+            );
+        } catch (error) {
+            console.log({ error });
+            return 0n;
+        }
+    }, [tokenADexBalance, sellQtyNoExponentString]);
+
     const isTokenADexSurplusSufficient =
         tokenASurplusMinusTokenARemainderNum >= 0;
-    const tokenAQtyCoveredByWalletBalance = isWithdrawFromDexChecked
-        ? tokenASurplusMinusTokenARemainderNum < 0
-            ? tokenASurplusMinusTokenARemainderNum * -1n
-            : 0n
-        : fromDisplayQty(sellQtyString || '0', tokenA.decimals);
+
+    const tokenAQtyCoveredByWalletBalance = useMemo(() => {
+        try {
+            return isWithdrawFromDexChecked
+                ? tokenASurplusMinusTokenARemainderNum < 0
+                    ? tokenASurplusMinusTokenARemainderNum * -1n
+                    : 0n
+                : fromDisplayQty(
+                      sellQtyNoExponentString || '0',
+                      tokenA.decimals,
+                  );
+        } catch (error) {
+            console.log({ error });
+            return 0n;
+        }
+    }, [sellQtyNoExponentString, tokenASurplusMinusTokenARemainderNum]);
 
     const isTokenAWalletBalanceSufficient =
         fromDisplayQty(tokenABalance || '0', tokenA.decimals) >=
@@ -273,27 +323,28 @@ function Swap(props: propsIF) {
     useEffect(() => {
         if (tokenABalance === '') return;
         if (
-            (sellQtyString === '' && buyQtyString === '') ||
+            (sellQtyNoExponentString === '' && buyQtyNoExponentString === '') ||
             (isTokenAPrimary &&
                 !isBuyLoading &&
-                (isNaN(parseFloat(sellQtyString)) ||
-                    parseFloat(sellQtyString) <= 0)) ||
+                (isNaN(parseFloat(sellQtyNoExponentString)) ||
+                    parseFloat(sellQtyNoExponentString) <= 0)) ||
             (!isTokenAPrimary &&
                 !isSellLoading &&
-                (isNaN(parseFloat(buyQtyString)) ||
-                    parseFloat(buyQtyString) <= 0))
+                (isNaN(parseFloat(buyQtyNoExponentString)) ||
+                    parseFloat(buyQtyNoExponentString) <= 0))
         ) {
             setSwapAllowed(false);
             setSwapButtonErrorMessage('Enter an Amount');
             if (
                 isBuyLoading &&
-                (sellQtyString === '' || parseFloat(sellQtyString) <= 0)
+                (sellQtyNoExponentString === '' ||
+                    parseFloat(sellQtyNoExponentString) <= 0)
             ) {
                 setIsBuyLoading(false);
                 setLastImpactQuery(undefined);
             } else if (
                 isSellLoading &&
-                (buyQtyString === '' || parseFloat(buyQtyString) <= 0)
+                (buyQtyString === '' || parseFloat(buyQtyNoExponentString) <= 0)
             ) {
                 setIsSellLoading(false);
                 setLastImpactQuery(undefined);
@@ -318,13 +369,17 @@ function Swap(props: propsIF) {
                 : 'Wallet';
 
             setSwapAllowed(
-                fromDisplayQty(sellQtyString || '0', tokenA.decimals) <=
-                    hurdleBigInt,
+                fromDisplayQty(
+                    sellQtyNoExponentString || '0',
+                    tokenA.decimals,
+                ) <= hurdleBigInt,
             );
 
             if (
-                fromDisplayQty(sellQtyString || '0', tokenA.decimals) >
-                hurdleBigInt
+                fromDisplayQty(
+                    sellQtyNoExponentString || '0',
+                    tokenA.decimals,
+                ) > hurdleBigInt
             ) {
                 if (activeTxHashInPendingTxs) {
                     setSellQtyString('');
@@ -363,8 +418,8 @@ function Swap(props: propsIF) {
         isPoolInitialized === undefined, // Needed to distinguish false from undefined
         tokenA.address,
         tokenB.address,
-        buyQtyString,
-        sellQtyString,
+        buyQtyNoExponentString,
+        sellQtyNoExponentString,
         isWithdrawFromDexChecked,
         isBuyLoading,
         isSellLoading,
@@ -464,8 +519,8 @@ function Swap(props: propsIF) {
             if (!crocEnv || !L1_GAS_CALC_ENABLED) return;
 
             const qty = isTokenAPrimary
-                ? sellQtyString.replaceAll(',', '')
-                : buyQtyString.replaceAll(',', '');
+                ? sellQtyNoExponentString.replaceAll(',', '')
+                : buyQtyNoExponentString.replaceAll(',', '');
 
             if (qty === '' || parseFloat(qty) === 0) return;
             const l1Gas = userAddress
@@ -506,8 +561,8 @@ function Swap(props: propsIF) {
     }, [
         crocEnv,
         isTokenAPrimary,
-        sellQtyString,
-        buyQtyString,
+        sellQtyNoExponentString,
+        buyQtyNoExponentString,
         tokenA.address,
         tokenB.address,
         slippageTolerancePercentage,
@@ -535,7 +590,10 @@ function Swap(props: propsIF) {
         setShowConfirmation(true);
         if (!crocEnv) return;
 
-        const qty = isTokenAPrimary ? sellQtyString : buyQtyString;
+        const qty = isTokenAPrimary
+            ? sellQtyNoExponentString
+            : buyQtyNoExponentString;
+
         const isQtySell = isTokenAPrimary;
 
         let tx;
@@ -579,6 +637,7 @@ function Swap(props: propsIF) {
                 });
             }
         } catch (error) {
+            console.log({ error });
             setTxError(error);
         }
 
@@ -718,9 +777,9 @@ function Swap(props: propsIF) {
 
     const percentDiffUsdValue =
         usdValueTokenA && usdValueTokenB
-            ? ((usdValueTokenB * parseFloat(buyQtyString) -
-                  usdValueTokenA * parseFloat(sellQtyString)) /
-                  (usdValueTokenA * parseFloat(sellQtyString))) *
+            ? ((usdValueTokenB * parseFloat(buyQtyNoExponentString) -
+                  usdValueTokenA * parseFloat(sellQtyNoExponentString)) /
+                  (usdValueTokenA * parseFloat(sellQtyNoExponentString))) *
               100
             : 0;
 
@@ -830,8 +889,8 @@ function Swap(props: propsIF) {
                         }
                         effectivePrice={effectivePrice}
                         isSellTokenBase={isSellTokenBase}
-                        sellQtyString={sellQtyString}
-                        buyQtyString={buyQtyString}
+                        sellQtyString={sellQtyNoExponentString}
+                        buyQtyString={buyQtyNoExponentString}
                         isTokenAPrimary={isTokenAPrimary}
                         priceImpactWarning={priceImpactWarning}
                         isSaveAsDexSurplusChecked={isSaveAsDexSurplusChecked}
@@ -874,7 +933,10 @@ function Swap(props: propsIF) {
                 isPoolInitialized &&
                 isTokenAWalletBalanceSufficient &&
                 !isTokenAAllowanceSufficient &&
-                fromDisplayQty(sellQtyString || '0', tokenA.decimals) > 0 &&
+                fromDisplayQty(
+                    sellQtyNoExponentString || '0',
+                    tokenA.decimals,
+                ) > 0 &&
                 sellQtyString !== 'Infinity' ? (
                     <Button
                         idForDOM='approve_token_a_for_swap_module'