@ensofinance/checkout-widget 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ensofinance/checkout-widget",
-    "version": "0.1.4",
+    "version": "0.1.6",
     "type": "module",
     "homepage": "https://www.enso.build/",
     "repository": {

package/src/components/steps/ExchangeFlow.tsx

@@ -37,7 +37,11 @@ import {
     formatUSD,
     normalizeValue,
 } from "@/util";
-import { useTokenFromListBySymbols, precisionizeNumber } from "@/util/common";
+import {
+    useTokenFromListBySymbols,
+    precisionizeNumber,
+    getPositiveDecimalValue,
+} from "@/util/common";
 import {
     EXCHANGE_MAX_LIMIT_GAP_USD,
     EXCHANGE_MIN_LIMIT,
@@ -157,7 +161,6 @@ export enum WithdrawalStep {
 }
 const withdrawalSteps = [
     WithdrawalStep.ChooseExchange,
-    WithdrawalStep.CheckSessionKey,
     WithdrawalStep.ChooseExchangeAsset,
     WithdrawalStep.ChooseAmount,
     WithdrawalStep.SignUserOp,
@@ -904,14 +907,19 @@ const ChooseAmountStep = ({
         }
     }, [amount, tokenInData?.decimals, setAmountIn]);
 
-    const hasAmount = !!amount && amount !== ".";
+    const numericAmount = getPositiveDecimalValue(amount);
+    const hasPositiveAmount = numericAmount !== null;
     const hasUsdValue = !!usdValue && usdValue !== ".";
     const notEnoughBalance = selectedToken
-        ? hasAmount && parseFloat(amount) > selectedToken.balance
+        ? hasPositiveAmount &&
+          numericAmount !== null &&
+          numericAmount > selectedToken.balance
         : true;
 
     // Limits validation logic - only for CEX withdrawals
-    const currentUsdValue = hasUsdValue ? parseFloat(usdValue) : 0;
+    const currentUsdValue = hasUsdValue
+        ? getPositiveDecimalValue(usdValue) ?? 0
+        : 0;
     const minValueForToken =
         isWithdrawal && selectedToken
             ? EXCHANGE_MIN_LIMIT[
@@ -922,19 +930,23 @@ const ChooseAmountStep = ({
     const isBelowMinAmount =
         isWithdrawal &&
         selectedToken &&
-        hasAmount &&
+        hasPositiveAmount &&
         currentUsdValue > 0 &&
         minValueForToken &&
-        +amount < minValueForToken;
+        numericAmount !== null &&
+        numericAmount < minValueForToken;
     const isAboveMaxAmount =
         isWithdrawal &&
         selectedToken &&
-        hasAmount &&
+        hasPositiveAmount &&
         currentUsdValue > 0 &&
         currentUsdValue > +maxUsdAmount;
 
     const isAmountInvalid =
-        !hasAmount || isBelowMinAmount || isAboveMaxAmount || notEnoughBalance;
+        !hasPositiveAmount ||
+        isBelowMinAmount ||
+        isAboveMaxAmount ||
+        notEnoughBalance;
 
     if (!selectedToken) {
         return (
@@ -984,7 +996,7 @@ const ChooseAmountStep = ({
                         isAmountInvalid ? "visible" : "hidden"
                     }
                 >
-                    {!hasAmount
+                    {!hasPositiveAmount
                         ? "Please enter an amount"
                         : isBelowMinAmount
                           ? `Minimum amount is ${formatNumber(minValueForToken)} ${selectedToken.symbol}`

package/src/components/steps/WalletFlow/WalletAmountStep.tsx

@@ -7,7 +7,7 @@ import { AmountInput, AmountInputValue } from "@/components/AmountInput";
 import CurrencySwapDisplay from "@/components/CurrencySwapDisplay";
 import { useEnsoPrice } from "@/enso-api/api";
 import { normalizeValue, denormalizeValue } from "@/util";
-import { precisionizeNumber } from "@/util/common";
+import { precisionizeNumber, getPositiveDecimalValue } from "@/util/common";
 import { useTokenBalance } from "@/util/wallet";
 import { useAppDetails } from "@/util/enso-hooks";
 const WalletAmountStep = ({ setStep }: { setStep: (step: string) => void }) => {
@@ -100,9 +100,9 @@ const WalletAmountStep = ({ setStep }: { setStep: (step: string) => void }) => {
         }
     }, [tokenAmount, tokenInData?.decimals, setAmountIn]);
 
-    const hasTokenAmount = !!tokenAmount && tokenAmount !== ".";
-    const notEnoughBalance = hasTokenAmount ? +balanceIn < +amountIn : false;
-    const isAmountInvalid = !hasTokenAmount || notEnoughBalance;
+    const hasPositiveAmount = getPositiveDecimalValue(tokenAmount) !== null;
+    const notEnoughBalance = hasPositiveAmount ? +balanceIn < +amountIn : false;
+    const isAmountInvalid = !hasPositiveAmount || notEnoughBalance;
 
     return (
         <BodyWrapper>

package/src/components/steps/WalletFlow/WalletTokenStep.tsx

@@ -15,8 +15,16 @@ const WalletAssetStep = ({ setStep }: { setStep: (step: string) => void }) => {
     const tokenIn = useAppStore((state) => state.tokenIn);
     const setChainIdIn = useAppStore((state) => state.setChainIdIn);
     const chainIdIn = useAppStore((state) => state.chainIdIn);
+    const tokenOut = useAppStore((state) => state.tokenOut);
+    const chainIdOut = useAppStore((state) => state.chainIdOut);
     const { holdingsList, isLoading } = useWalletBalance();
 
+    const filteredHoldings = holdingsList?.filter(
+        (asset) =>
+            !(asset.token.toLowerCase() === tokenOut.toLowerCase() &&
+              asset.chainId === chainIdOut),
+    );
+
     useEffect(() => {
         setSelectedIntegration(null);
     }, []);
@@ -33,7 +41,7 @@ const WalletAssetStep = ({ setStep }: { setStep: (step: string) => void }) => {
                                   width="300px"
                               />
                           ))
-                        : holdingsList?.map((asset) => (
+                        : filteredHoldings?.map((asset) => (
                               <AssetCard
                                   key={`${asset.token}-${asset.chainId}`}
                                   chainId={asset.chainId}

package/src/util/common.tsx

@@ -373,3 +373,12 @@ export const sanitizeDecimalInput = (value: string, maxDecimals?: number) => {
 
     return integerPart;
 };
+
+export const getPositiveDecimalValue = (value: string) => {
+    if (!value || value === ".") return null;
+
+    const numeric = Number(value);
+    if (Number.isNaN(numeric) || numeric <= 0) return null;
+
+    return numeric;
+};