diff --git a/packages/widget-v2/eslint.config.mjs b/packages/widget-v2/eslint.config.mjs
index c84d60142..cc67ca013 100644
--- a/packages/widget-v2/eslint.config.mjs
+++ b/packages/widget-v2/eslint.config.mjs
@@ -13,10 +13,20 @@ export default tseslint.config(
       "react-hooks": fixupPluginRules(reactHooks),
     },
     rules: {
+      ...reactHooks.configs.recommended.rules,
       "@typescript-eslint/consistent-type-definitions": ["error", "type"],
+      "@typescript-eslint/no-unused-vars": ["error", {
+        "args": "all",
+        "argsIgnorePattern": "^_",
+        "caughtErrors": "all",
+        "caughtErrorsIgnorePattern": "^_",
+        "destructuredArrayIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "ignoreRestSiblings": true
+      }],
       "no-console": ["error", { allow: ["warn", "error"] }],
       "quotes": ["error", "double", { "avoidEscape": true }],
-      ...reactHooks.configs.recommended.rules,
+
     },
   }
 );
diff --git a/packages/widget-v2/package.json b/packages/widget-v2/package.json
index e3a1ece1d..7758d02d7 100644
--- a/packages/widget-v2/package.json
+++ b/packages/widget-v2/package.json
@@ -58,6 +58,7 @@
     "@tanstack/query-core": "^5.51.21",
     "chain-registry": "^1.63.43",
     "jotai": "^2.9.1",
+    "jotai-effect": "^1.0.2",
     "jotai-tanstack-query": "^0.8.6",
     "lodash.debounce": "^4.0.8",
     "match-sorter": "^6.3.4",
diff --git a/packages/widget-v2/src/components/AssetChainInput.tsx b/packages/widget-v2/src/components/AssetChainInput.tsx
index 1bc2fb36a..901c03b68 100644
--- a/packages/widget-v2/src/components/AssetChainInput.tsx
+++ b/packages/widget-v2/src/components/AssetChainInput.tsx
@@ -9,6 +9,8 @@ import { useAtom } from "jotai";
 import { skipAssetsAtom, skipChainsAtom } from "@/state/skipClient";
 import { useUsdValue } from "@/utils/useUsdValue";
 import { formatUSD } from "@/utils/intl";
+import { BigNumber } from "bignumber.js";
+import { formatNumberWithCommas, formatNumberWithoutCommas } from "@/utils/number";
 
 export type AssetChainInputProps = {
   value?: string;
@@ -19,7 +21,7 @@ export type AssetChainInputProps = {
 };
 
 export const AssetChainInput = ({
-  value = "0",
+  value,
   onChangeValue,
   selectedAssetDenom,
   handleChangeAsset,
@@ -39,6 +41,80 @@ export const AssetChainInput = ({
 
   const usdValue = useUsdValue({ ...selectedAsset, value });
 
+  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (!onChangeValue) return;
+    let latest = e.target.value;
+
+    if (latest.match(/^[.,]/)) latest = `0.${latest}`; // Handle first character being a period or comma
+    latest = latest.replace(/^[0]{2,}/, "0"); // Remove leading zeros
+    latest = latest.replace(/[^\d.,]/g, ""); // Remove non-numeric and non-decimal characters
+    latest = latest.replace(/[.]{2,}/g, "."); // Remove multiple decimals
+    latest = latest.replace(/[,]{2,}/g, ","); // Remove multiple commas
+    onChangeValue?.(formatNumberWithoutCommas(latest));
+  };
+
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    if (!onChangeValue) return;
+
+    let value: BigNumber;
+
+    switch (event.key) {
+      case "Escape":
+        if (
+          event.currentTarget.selectionStart ===
+          event.currentTarget.selectionEnd
+        ) {
+          event.currentTarget.select();
+        }
+        return;
+
+      case "ArrowUp":
+        event.preventDefault();
+        value = new BigNumber(
+          formatNumberWithoutCommas(event.currentTarget.value) || "0"
+        );
+
+        if (event.shiftKey) {
+          value = value.plus(10);
+        } else if (event.altKey || event.ctrlKey || event.metaKey) {
+          value = value.plus(0.1);
+        } else {
+          value = value.plus(1);
+        }
+
+        if (value.isNegative()) {
+          value = new BigNumber(0);
+        }
+
+        onChangeValue(value.toString());
+        break;
+
+      case "ArrowDown":
+        event.preventDefault();
+        value = new BigNumber(
+          formatNumberWithoutCommas(event.currentTarget.value) || "0"
+        );
+
+        if (event.shiftKey) {
+          value = value.minus(10);
+        } else if (event.altKey || event.ctrlKey || event.metaKey) {
+          value = value.minus(0.1);
+        } else {
+          value = value.minus(1);
+        }
+
+        if (value.isNegative()) {
+          value = new BigNumber(0);
+        }
+
+        onChangeValue(value.toString());
+        break;
+
+      default:
+        return;
+    }
+  };
+
   return (
     <StyledAssetChainInputWrapper
       justify="space-between"
@@ -48,8 +124,11 @@ export const AssetChainInput = ({
       <Row justify="space-between">
         <StyledInput
           type="text"
-          value={value}
-          onChange={(e) => onChangeValue?.(e.target.value)}
+          value={formatNumberWithCommas(value || "")}
+          placeholder="0"
+          inputMode="numeric"
+          onChange={handleInputChange}
+          onKeyDown={handleKeyDown}
         />
         <Button onClick={handleChangeAsset} gap={5}>
           {selectedAsset ? (
diff --git a/packages/widget-v2/src/pages/SwapPage/SwapPage.tsx b/packages/widget-v2/src/pages/SwapPage/SwapPage.tsx
index ba3df03dc..eae2bc1e2 100644
--- a/packages/widget-v2/src/pages/SwapPage/SwapPage.tsx
+++ b/packages/widget-v2/src/pages/SwapPage/SwapPage.tsx
@@ -1,12 +1,21 @@
 import { useCallback, useMemo, useState } from "react";
-import { useAtom } from "jotai";
+import { useAtom, useAtomValue, useSetAtom } from "jotai";
 import { AssetChainInput } from "@/components/AssetChainInput";
 import { Column } from "@/components/Layout";
 import { MainButton } from "@/components/MainButton";
 import { SmallText } from "@/components/Typography";
 import { ICONS } from "@/icons";
-import { skipAssetsAtom, getChainsContainingAsset, skipChainsAtom } from "@/state/skipClient";
-import { sourceAssetAtom, destinationAssetAtom } from "@/state/swapPage";
+import {
+  skipAssetsAtom,
+  getChainsContainingAsset,
+  skipChainsAtom,
+  skipRouteAtom,
+} from "@/state/skipClient";
+import {
+  sourceAssetAtom,
+  destinationAssetAtom,
+  swapDirectionAtom,
+} from "@/state/swapPage";
 import { TokenAndChainSelectorModal } from "@/modals/TokenAndChainSelectorModal/TokenAndChainSelectorModal";
 import { SwapPageSettings } from "./SwapPageSettings";
 import { SwapPageFooter } from "./SwapPageFooter";
@@ -20,22 +29,31 @@ export const SwapPage = () => {
   const [container, setContainer] = useState<HTMLDivElement>();
   const [drawerOpen, setDrawerOpen] = useState(false);
   const [sourceAsset, setSourceAsset] = useAtom(sourceAssetAtom);
+  const [destinationAsset, setDestinationAsset] = useAtom(destinationAssetAtom);
   const [{ data: assets }] = useAtom(skipAssetsAtom);
   const [{ data: chains }] = useAtom(skipChainsAtom);
-  const [destinationAsset, setDestinationAsset] = useAtom(destinationAssetAtom);
-
+  const setSwapDirection = useSetAtom(swapDirectionAtom);
+  const { isLoading: isRouteLoading } = useAtomValue(skipRouteAtom);
   const swapFlowSettings = useModal(SwapPageSettings);
   const tokenAndChainSelectorFlow = useModal(TokenAndChainSelectorModal);
 
   const chainsContainingSourceAsset = useMemo(() => {
     if (!chains || !assets || !sourceAsset?.symbol) return;
-    const result = getChainsContainingAsset(sourceAsset?.symbol, assets, chains);
+    const result = getChainsContainingAsset(
+      sourceAsset?.symbol,
+      assets,
+      chains
+    );
     return result;
   }, [assets, sourceAsset?.symbol, chains]);
 
   const chainsContainingDestinationAsset = useMemo(() => {
     if (!chains || !assets || !destinationAsset?.symbol) return;
-    const result = getChainsContainingAsset(destinationAsset?.symbol, assets, chains);
+    const result = getChainsContainingAsset(
+      destinationAsset?.symbol,
+      assets,
+      chains
+    );
     return result;
   }, [assets, destinationAsset?.symbol, chains]);
 
@@ -132,23 +150,26 @@ export const SwapPage = () => {
             selectedAssetDenom={sourceAsset?.denom}
             handleChangeAsset={handleChangeSourceAsset}
             handleChangeChain={handleChangeSourceChain}
-            value={sourceAsset?.amount ?? "0"}
-            onChangeValue={(newValue) =>
-              setSourceAsset((old) => ({ ...old, amount: newValue }))
-            }
+            value={sourceAsset?.amount}
+            onChangeValue={(newValue) => {
+              setSourceAsset((old) => ({ ...old, amount: newValue }));
+              setSwapDirection("swap-in");
+            }}
           />
           <SwapPageBridge />
           <AssetChainInput
             selectedAssetDenom={destinationAsset?.denom}
             handleChangeAsset={handleChangeDestinationAsset}
             handleChangeChain={handleChangeDestinationChain}
-            value={destinationAsset?.amount ?? "0"}
-            onChangeValue={(newValue) =>
-              setDestinationAsset((old) => ({ ...old, amount: newValue }))
-            }
+            value={destinationAsset?.amount}
+            onChangeValue={(newValue) => {
+              setDestinationAsset((old) => ({ ...old, amount: newValue }));
+              setSwapDirection("swap-out");
+            }}
           />
         </Column>
-        <MainButton label="Connect Wallet" icon={ICONS.plus} />
+        {!isRouteLoading && <MainButton label="Connect Wallet" icon={ICONS.plus} />}
+        {isRouteLoading && <MainButton label="Finding Best Route..." loading={true} />}
 
         <SwapPageFooter
           showRouteInfo
diff --git a/packages/widget-v2/src/state/skipClient.ts b/packages/widget-v2/src/state/skipClient.ts
index 779ff03c4..a24557bd8 100644
--- a/packages/widget-v2/src/state/skipClient.ts
+++ b/packages/widget-v2/src/state/skipClient.ts
@@ -8,6 +8,8 @@ import {
 } from "@skip-go/client";
 import { atomWithQuery } from "jotai-tanstack-query";
 import { apiURL, endpointOptions } from "@/constants/skipClientDefault";
+import { destinationAssetAtom, routeAmountEffect, sourceAssetAtom, swapDirectionAtom } from "./swapPage";
+import { getAmountWei } from "@/utils/number";
 
 export const skipClientConfigAtom = atom<SkipClientOptions>({
   apiURL,
@@ -93,11 +95,30 @@ export const skipSwapVenuesAtom = atomWithQuery((get) => {
   };
 });
 
-export const skipRouteRequestAtom = atom<RouteRequest>();
+export const skipRouteRequestAtom = atom<RouteRequest | undefined>((get) => {
+  const sourceAsset = get(sourceAssetAtom);
+  const destinationAsset = get(destinationAssetAtom);
+  const direction = get(swapDirectionAtom);
+  if (!sourceAsset?.chainID || !sourceAsset.denom || !destinationAsset?.chainID || !destinationAsset.denom) {
+    return undefined;
+  }
+  const amount = direction === "swap-in"
+    ? { amountIn: getAmountWei(sourceAsset.amount, sourceAsset.decimals) || "0" }
+    : { amountOut: getAmountWei(destinationAsset.amount, destinationAsset.decimals) || "0" };
+
+  return {
+    ...amount,
+    sourceAssetChainID: sourceAsset.chainID,
+    sourceAssetDenom: sourceAsset.denom,
+    destAssetChainID: destinationAsset.chainID,
+    destAssetDenom: destinationAsset.denom,
+  };
+});
 
 export const skipRouteAtom = atomWithQuery((get) => {
   const skip = get(skipClient);
   const params = get(skipRouteRequestAtom);
+  get(routeAmountEffect)
   return {
     queryKey: ["skipRoute", params],
     queryFn: async () => {
@@ -117,6 +138,7 @@ export const skipRouteAtom = atomWithQuery((get) => {
       });
     },
     enabled: !!params,
+    refetchInterval: 1000 * 10,
   };
 });
 
diff --git a/packages/widget-v2/src/state/swapPage.ts b/packages/widget-v2/src/state/swapPage.ts
index 7be1f1330..c3d3463d1 100644
--- a/packages/widget-v2/src/state/swapPage.ts
+++ b/packages/widget-v2/src/state/swapPage.ts
@@ -1,6 +1,8 @@
 import { atom } from "jotai";
-import { ClientAsset } from "./skipClient";
+import { ClientAsset, skipRouteAtom } from "./skipClient";
 import { Wallet } from "@/components/RenderWalletList";
+import { atomEffect } from "jotai-effect";
+import { parseAmountWei } from "@/utils/number";
 
 export type AssetAtom = Partial<ClientAsset> & {
   amount?: string;
@@ -10,6 +12,35 @@ export const sourceAssetAtom = atom<AssetAtom>();
 
 export const destinationAssetAtom = atom<AssetAtom>();
 
+export const swapDirectionAtom = atom<"swap-in" | "swap-out">("swap-in");
+
 export const connectedWalletAtom = atom<Wallet>();
 
 export const destinationWalletAtom = atom<Wallet>();
+
+
+export const routeAmountEffect = atomEffect((get, set) => {
+  const route = get(skipRouteAtom)
+  const direction = get(swapDirectionAtom)
+  const sourceAsset = get(sourceAssetAtom)
+  const destinationAsset = get(destinationAssetAtom)
+
+  const isSwapIn = direction === "swap-in";
+
+  if (!route.data || !sourceAsset || !destinationAsset) return
+
+  if (isSwapIn) {
+    const amount = parseAmountWei(route.data.amountOut, destinationAsset.decimals)
+    set(destinationAssetAtom, (old) => ({
+      ...old,
+      amount,
+    }))
+  }
+  else {
+    const amount = parseAmountWei(route.data.amountIn, sourceAsset.decimals)
+    set(sourceAssetAtom, (old) => ({
+      ...old,
+      amount,
+    }))
+  }
+})
diff --git a/packages/widget-v2/src/utils/number.ts b/packages/widget-v2/src/utils/number.ts
new file mode 100644
index 000000000..b8c67f575
--- /dev/null
+++ b/packages/widget-v2/src/utils/number.ts
@@ -0,0 +1,30 @@
+import { BigNumber } from "bignumber.js";
+import { formatUnits } from "viem";
+
+export function formatNumberWithCommas(str: string | number) {
+  const parts = str.toString().split(".");
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  return parts.join(".");
+}
+
+export function formatNumberWithoutCommas(str: string | number) {
+  return str.toString().replace(/,/g, "");
+}
+
+export function getAmountWei(amount?: string, decimals = 6) {
+  if (!amount || !amount) return "0";
+  try {
+    return new BigNumber(formatNumberWithoutCommas(amount)).shiftedBy(decimals ?? 6).toFixed(0);
+  } catch (_err) {
+    return "0";
+  }
+}
+
+export function parseAmountWei(amount?: string, decimals = 6) {
+  if (!amount) return "0";
+  try {
+    return formatUnits(BigInt(amount.replace(/,/g, "")), decimals ?? 6);
+  } catch (_err) {
+    return "0";
+  }
+}
diff --git a/packages/widget/src/ui/AssetInput.tsx b/packages/widget/src/ui/AssetInput.tsx
index 2e2552aea..ae57ea008 100644
--- a/packages/widget/src/ui/AssetInput.tsx
+++ b/packages/widget/src/ui/AssetInput.tsx
@@ -108,7 +108,7 @@ function AssetInput({
         'focus-within:border-neutral-300 focus-within:shadow-sm',
         'hover:border-neutral-300 hover:shadow-sm',
         !!isError &&
-          'border-red-400 focus-within:border-red-500 hover:border-red-500'
+        'border-red-400 focus-within:border-red-500 hover:border-red-500'
       )}
     >
       <div className="mb-4 grid grid-cols-1 gap-2 sm:grid-cols-2 sm:gap-4">
@@ -212,9 +212,9 @@ function AssetInput({
             {amountUSD && Number(amountUSD) > 0 ? formatUSD(amountUSD) : null}
           </p>
           {amountUSD !== undefined &&
-          Number(amountUSD) > 0 &&
-          diffPercentage !== 0 &&
-          context === 'destination' ? (
+            Number(amountUSD) > 0 &&
+            diffPercentage !== 0 &&
+            context === 'destination' ? (
             <p
               className={cn(
                 'text-sm tabular-nums',
@@ -232,9 +232,8 @@ function AssetInput({
                 <SpinnerIcon className="mr-2 h-4 w-4 animate-spin" />
               ) : (
                 <SimpleTooltip
-                  label={`${parseFloat(selectedAssetBalance).toString()} ${
-                    asset.recommendedSymbol
-                  }`}
+                  label={`${parseFloat(selectedAssetBalance).toString()} ${asset.recommendedSymbol
+                    }`}
                 >
                   <div
                     className={cn(
@@ -273,4 +272,4 @@ function AssetInput({
   );
 }
 
-export default AssetInput;
+export default AssetInput;
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index ebe88b91d..800c7e667 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21672,6 +21672,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jotai-effect@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "jotai-effect@npm:1.0.2"
+  peerDependencies:
+    jotai: ">=2.5.0"
+  checksum: 10674c03fa62c7aa74d37b67076436ad611e06e5660d8c15442f61c50ffa110a03deae18c42b351d8b28eeb08b8bc2e5f4fb1a34a1bead335b2b4b75ccfe4163
+  languageName: node
+  linkType: hard
+
 "jotai-tanstack-query@npm:^0.8.6":
   version: 0.8.6
   resolution: "jotai-tanstack-query@npm:0.8.6"
@@ -30481,6 +30490,7 @@ __metadata:
     eslint: ^9.9.0
     eslint-plugin-react-hooks: ^4.6.2
     jotai: ^2.9.1
+    jotai-effect: ^1.0.2
     jotai-tanstack-query: ^0.8.6
     lodash.debounce: ^4.0.8
     match-sorter: ^6.3.4