diff --git a/packages/plugins/Trader/package.json b/packages/plugins/Trader/package.json
index 25c1ffad2f34..bde87d5cdad6 100644
--- a/packages/plugins/Trader/package.json
+++ b/packages/plugins/Trader/package.json
@@ -17,6 +17,7 @@
   },
   "dependencies": {
     "@ethersproject/providers": "^5.7.2",
+    "@hookform/resolvers": "^3.6.0",
     "@masknet/icons": "workspace:^",
     "@masknet/plugin-infra": "workspace:^",
     "@masknet/plugin-transak": "workspace:^",
@@ -36,11 +37,13 @@
     "date-fns": "^2.30.0",
     "fuse.js": "^7.0.0",
     "immer": "^10.1.1",
+    "react-hook-form": "^7.53.0",
     "react-router-dom": "^6.24.0",
     "react-use": "^17.4.0",
     "urlcat": "^3.1.0",
     "use-subscription": "^1.8.0",
-    "web3-core": "1.10.4"
+    "web3-core": "1.10.4",
+    "zod": "^3.23.8"
   },
   "lingui": {
     "catalogs": [
diff --git a/packages/plugins/Trader/src/SiteAdaptor/constants.ts b/packages/plugins/Trader/src/SiteAdaptor/constants.ts
index f81255ac89ff..2dd73bed489e 100644
--- a/packages/plugins/Trader/src/SiteAdaptor/constants.ts
+++ b/packages/plugins/Trader/src/SiteAdaptor/constants.ts
@@ -16,6 +16,7 @@ export const enum RoutePaths {
 export const DEFAULT_SLIPPAGE = '0.5'
 
 export const QUOTE_STALE_DURATION = 20_000
+export const REFETCH_INTERVAL = 20_000
 
 export const bridges = [
     {
@@ -33,7 +34,7 @@ export const bridges = [
     {
         id: 315,
         name: 'Across',
-        logoUrl: new URL('../assets/accross.svg', import.meta.url).href,
+        logoUrl: new URL('../assets/across.svg', import.meta.url).href,
     },
     {
         id: 211,
@@ -77,4 +78,9 @@ export const bridges = [
         logoUrl:
             'https://static.okx.com/cdn/explorer/dex/logo/dex_Circle.png.png?x-oss-process=image/format,webp/ignore-error,1',
     },
+    {
+        id: 476,
+        name: 'Bungee Refuel',
+        logoUrl: 'https://www.okx.com/cdn/web3/dex/logo/b53506a1-fc2b-439d-9696-8eaea55167ca.png',
+    },
 ]
diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/Routes.tsx b/packages/plugins/Trader/src/SiteAdaptor/trader/Routes.tsx
index b690ec30009c..e69ff092a18a 100644
--- a/packages/plugins/Trader/src/SiteAdaptor/trader/Routes.tsx
+++ b/packages/plugins/Trader/src/SiteAdaptor/trader/Routes.tsx
@@ -4,7 +4,7 @@ import { BridgeConfirm } from './views/BridgeConfirm.js'
 import { BridgeQuoteRoute } from './views/BridgeQuoteRoute.js'
 import { Confirm } from './views/Confirm.js'
 import { HistoryView } from './views/History.js'
-import { NetworkFee } from './views/NetworkFee.js'
+import { NetworkFee } from './views/NetworkFee/index.js'
 import { QuoteRoute } from './views/QuoteRoute.js'
 import { SelectLiquidity } from './views/SelectLiquidity.js'
 import { Slippage } from './views/Slippage.js'
diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useBridgeQuotes.ts b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useBridgeQuotes.ts
index feb0410cb7fb..41349ee89c28 100644
--- a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useBridgeQuotes.ts
+++ b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useBridgeQuotes.ts
@@ -1,7 +1,7 @@
 import { OKX } from '@masknet/web3-providers'
 import type { GetBridgeQuoteOptions } from '@masknet/web3-providers/types'
 import { useQuery } from '@tanstack/react-query'
-import { QUOTE_STALE_DURATION } from '../../constants.js'
+import { QUOTE_STALE_DURATION, REFETCH_INTERVAL } from '../../constants.js'
 
 export function useBridgeQuotes(options: Partial<GetBridgeQuoteOptions>, enabled = true) {
     const valid =
@@ -19,5 +19,6 @@ export function useBridgeQuotes(options: Partial<GetBridgeQuoteOptions>, enabled
         queryKey: ['okx-bridge', 'get-quotes', options],
         queryFn: () => OKX.getBridgeQuote(options as GetBridgeQuoteOptions),
         staleTime: QUOTE_STALE_DURATION,
+        refetchInterval: REFETCH_INTERVAL,
     })
 }
diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useLiquidityResources.ts b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useLiquidityResources.ts
index 13e1bf706ce7..eb4a811a4feb 100644
--- a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useLiquidityResources.ts
+++ b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useLiquidityResources.ts
@@ -1,6 +1,7 @@
 import { OKX } from '@masknet/web3-providers'
 import type { ChainId } from '@masknet/web3-shared-evm'
 import { skipToken, useQuery } from '@tanstack/react-query'
+import { REFETCH_INTERVAL } from '../../constants.js'
 
 export function useLiquidityResources(chainId: ChainId, enabled = true) {
     return useQuery({
@@ -13,5 +14,6 @@ export function useLiquidityResources(chainId: ChainId, enabled = true) {
                     return res?.code === 0 ? res.data : undefined
                 }
             :   skipToken,
+        refetchInterval: REFETCH_INTERVAL,
     })
 }
diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useQuotes.ts b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useQuotes.ts
index 463cfa2a1f8f..bf52ce3a3148 100644
--- a/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useQuotes.ts
+++ b/packages/plugins/Trader/src/SiteAdaptor/trader/hooks/useQuotes.ts
@@ -1,8 +1,8 @@
 import { OKX } from '@masknet/web3-providers'
 import type { GetQuotesOptions } from '@masknet/web3-providers/types'
-import { useQuery } from '@tanstack/react-query'
-import { QUOTE_STALE_DURATION } from '../../constants.js'
 import { isGreaterThan } from '@masknet/web3-shared-base'
+import { useQuery } from '@tanstack/react-query'
+import { QUOTE_STALE_DURATION, REFETCH_INTERVAL } from '../../constants.js'
 
 export function useQuotes(options: Partial<GetQuotesOptions>, enabled = true) {
     const valid =
@@ -12,5 +12,6 @@ export function useQuotes(options: Partial<GetQuotesOptions>, enabled = true) {
         queryKey: ['okx-swap', 'get-quotes', options],
         queryFn: () => OKX.getQuotes(options as GetQuotesOptions),
         staleTime: QUOTE_STALE_DURATION,
+        refetchInterval: REFETCH_INTERVAL,
     })
 }
diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/views/NetworkFee.tsx b/packages/plugins/Trader/src/SiteAdaptor/trader/views/NetworkFee/index.tsx
similarity index 69%
rename from packages/plugins/Trader/src/SiteAdaptor/trader/views/NetworkFee.tsx
rename to packages/plugins/Trader/src/SiteAdaptor/trader/views/NetworkFee/index.tsx
index a49a44fd3b1c..00c28ac56334 100644
--- a/packages/plugins/Trader/src/SiteAdaptor/trader/views/NetworkFee.tsx
+++ b/packages/plugins/Trader/src/SiteAdaptor/trader/views/NetworkFee/index.tsx
@@ -1,3 +1,4 @@
+import { zodResolver } from '@hookform/resolvers/zod'
 import { t, Trans } from '@lingui/macro'
 import { Icons } from '@masknet/icons'
 import { ProgressiveText } from '@masknet/shared'
@@ -14,11 +15,16 @@ import {
 } from '@masknet/web3-shared-evm'
 import { Box, Button, Typography } from '@mui/material'
 import { BigNumber } from 'bignumber.js'
+import { isEmpty } from 'lodash-es'
 import { memo, useMemo, useRef, useState } from 'react'
+import { Controller, useForm } from 'react-hook-form'
 import { useNavigate } from 'react-router-dom'
-import { GasCost } from '../../components/GasCost.js'
-import { Warning } from '../../components/Warning.js'
-import { useGasManagement, useTrade } from '../contexts/index.js'
+import { type z as zod } from 'zod'
+import { GasCost } from '../../../components/GasCost.js'
+import { Warning } from '../../../components/Warning.js'
+import { useGasManagement } from '../../contexts/GasManager.js'
+import { useTrade } from '../../contexts/TradeProvider.js'
+import { useSchema } from './schema.js'
 
 const useStyles = makeStyles<void, 'active' | 'gasWarning' | 'gasOk'>()((theme, _, refs) => ({
     container: {
@@ -114,6 +120,11 @@ const useStyles = makeStyles<void, 'active' | 'gasWarning' | 'gasOk'>()((theme,
         color: theme.palette.maskColor.second,
         marginLeft: theme.spacing(1.5),
     },
+    error: {
+        color: theme.palette.maskColor.danger,
+        fontSize: 13,
+        lineHeight: '18px',
+    },
 }))
 
 function formatTimeCost(seconds: number | undefined) {
@@ -124,8 +135,8 @@ function formatTimeCost(seconds: number | undefined) {
 }
 
 const MIN_BASE_FEE = '0.01'
-const gweiToWei = (gwei: BigNumber.Value | undefined) => formatGweiToWei(gwei ?? '0').toFixed()
-const weiToGwei = (wei: BigNumber.Value | undefined) => formatWeiToGwei(wei ?? '0').toFixed()
+const gweiToWei = (gwei: BigNumber.Value | undefined) => (gwei ? formatGweiToWei(gwei).toFixed() : undefined)
+const weiToGwei = (wei: BigNumber.Value | undefined) => (wei ? formatWeiToGwei(wei).toFixed() : undefined)
 export const NetworkFee = memo(function NetworkFee() {
     const { classes, cx, theme } = useStyles()
     const { chainId } = useTrade()
@@ -152,9 +163,10 @@ export const NetworkFee = memo(function NetworkFee() {
     const [priorityFee = defaultPriorityFee, setPriorityFee] = useState<string>()
     const [gasPrice = defaultGasPrice, setGasPrice] = useState<string>()
     const customFeePrice = useMemo(
-        () => (isSupport1559 ? plus(baseFee ?? '0', priorityFee ?? '0') : new BigNumber(gasPrice ?? '0')),
+        () => (isSupport1559 ? plus(baseFee || '0', priorityFee || '0') : new BigNumber(gasPrice ?? '0')),
         [isSupport1559, baseFee, priorityFee, gasPrice],
     )
+
     const isTooHigh = isGreaterThan(customFeePrice, multipliedBy(gasOptions?.fast.suggestedMaxFeePerGas ?? '0', 2))
 
     const customBoxRef = useRef<HTMLDivElement>(null)
@@ -192,6 +204,20 @@ export const NetworkFee = memo(function NetworkFee() {
         }
     }, [gasOptions, customFeePrice])
 
+    const schema = useSchema(isSupport1559)
+
+    const {
+        control,
+        setValue,
+        formState: { errors },
+    } = useForm<zod.infer<typeof schema>>({
+        mode: 'onChange',
+        resolver: zodResolver(schema),
+        context: {
+            gasOptions,
+        },
+    })
+
     return (
         <div className={classes.container}>
             <div
@@ -324,7 +350,7 @@ export const NetworkFee = memo(function NetworkFee() {
                             <Trans>Custom</Trans>
                         </Typography>
                         <Typography className={classes.boxSubtitle} variant="h3">
-                            {formatWeiToGwei(customFeePrice ?? '0').toFixed()} Gwei
+                            {customFeePrice ? formatWeiToGwei(customFeePrice).toFixed() : '--'} Gwei
                         </Typography>
                     </div>
                     <div className={classes.boxTail}>
@@ -350,29 +376,72 @@ export const NetworkFee = memo(function NetworkFee() {
                                         <Trans>Base fee required: {MIN_BASE_FEE} Gwei</Trans>
                                     </Typography>
                                 </Box>
-                                <MaskTextField
-                                    placeholder="0.1-50"
-                                    type="number"
-                                    value={weiToGwei(baseFee)}
-                                    onChange={(e) => {
-                                        setBaseFee(gweiToWei(e.target.value))
-                                    }}
-                                    InputProps={{
-                                        endAdornment: <Typography className={classes.gwei}>Gwei</Typography>,
+                                <Controller
+                                    control={control}
+                                    name="baseFee"
+                                    render={({ field, fieldState }) => {
+                                        return (
+                                            <>
+                                                <MaskTextField
+                                                    {...field}
+                                                    placeholder="0.1-50"
+                                                    type="number"
+                                                    value={weiToGwei(baseFee)}
+                                                    onChange={(e) => {
+                                                        const value = gweiToWei(e.target.value) || ''
+                                                        setBaseFee(value)
+                                                        setValue('baseFee', value)
+                                                        field.onChange(e)
+                                                    }}
+                                                    InputProps={{
+                                                        endAdornment: (
+                                                            <Typography className={classes.gwei}>Gwei</Typography>
+                                                        ),
+                                                    }}
+                                                />
+                                                {fieldState.error ?
+                                                    <Typography className={classes.error}>
+                                                        {fieldState.error.message}
+                                                    </Typography>
+                                                :   null}
+                                            </>
+                                        )
                                     }}
                                 />
                                 <Typography className={classes.fieldName}>
                                     <Trans>Priority fee</Trans>
                                 </Typography>
-                                <MaskTextField
-                                    placeholder="0.1-50"
-                                    type="number"
-                                    value={weiToGwei(priorityFee)}
-                                    onChange={(e) => {
-                                        setPriorityFee(gweiToWei(e.target.value))
-                                    }}
-                                    InputProps={{
-                                        endAdornment: <Typography className={classes.gwei}>Gwei</Typography>,
+
+                                <Controller
+                                    control={control}
+                                    name="priorityFee"
+                                    render={({ field, fieldState }) => {
+                                        return (
+                                            <>
+                                                <MaskTextField
+                                                    {...field}
+                                                    placeholder="0.1-50"
+                                                    type="number"
+                                                    value={weiToGwei(priorityFee)}
+                                                    onChange={(e) => {
+                                                        const value = gweiToWei(e.target.value) || ''
+                                                        setPriorityFee(value)
+                                                        setValue('priorityFee', value)
+                                                        field.onChange(e)
+                                                    }}
+                                                    InputProps={{
+                                                        endAdornment: (
+                                                            <Typography className={classes.gwei}>Gwei</Typography>
+                                                        ),
+                                                    }}
+                                                />
+                                                {fieldState.error ?
+                                                    <Typography className={classes.error}>
+                                                        {fieldState.error.message}
+                                                    </Typography>
+                                                :   null}
+                                            </>
+                                        )
                                     }}
                                 />
                             </>
@@ -382,15 +451,36 @@ export const NetworkFee = memo(function NetworkFee() {
                                         <Trans>Gas Price</Trans>
                                     </Typography>
                                 </Box>
-                                <MaskTextField
-                                    placeholder="0.1-50"
-                                    type="number"
-                                    value={weiToGwei(gasPrice)}
-                                    onChange={(e) => {
-                                        setGasPrice(gweiToWei(e.target.value || '0'))
-                                    }}
-                                    InputProps={{
-                                        endAdornment: <Typography className={classes.gwei}>Gwei</Typography>,
+                                <Controller
+                                    control={control}
+                                    name="gasPrice"
+                                    render={({ field, fieldState }) => {
+                                        return (
+                                            <>
+                                                <MaskTextField
+                                                    {...field}
+                                                    placeholder="0.1-50"
+                                                    type="number"
+                                                    value={weiToGwei(gasPrice)}
+                                                    onChange={(e) => {
+                                                        const value = gweiToWei(e.target.value) || ''
+                                                        setGasPrice(value)
+                                                        setValue('gasPrice', value)
+                                                        field.onChange(e)
+                                                    }}
+                                                    InputProps={{
+                                                        endAdornment: (
+                                                            <Typography className={classes.gwei}>Gwei</Typography>
+                                                        ),
+                                                    }}
+                                                />
+                                                {fieldState.error ?
+                                                    <Typography className={classes.error}>
+                                                        {fieldState.error.message}
+                                                    </Typography>
+                                                :   null}
+                                            </>
+                                        )
                                     }}
                                 />
                             </>
@@ -407,7 +497,7 @@ export const NetworkFee = memo(function NetworkFee() {
                         <Button
                             variant="roundedContained"
                             fullWidth
-                            disabled={disabled}
+                            disabled={disabled || !isEmpty(errors)}
                             onClick={() => {
                                 if (isSupport1559) {
                                     const maxFeePerGas = plus(baseFee ?? '0', priorityFee ?? '0').toFixed()
diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/views/NetworkFee/schema.ts b/packages/plugins/Trader/src/SiteAdaptor/trader/views/NetworkFee/schema.ts
new file mode 100644
index 000000000000..c1940b32e04b
--- /dev/null
+++ b/packages/plugins/Trader/src/SiteAdaptor/trader/views/NetworkFee/schema.ts
@@ -0,0 +1,28 @@
+import { t } from '@lingui/macro'
+import { isGreaterThan, isLessThan } from '@masknet/web3-shared-base'
+import { useMemo } from 'react'
+import { z as zod } from 'zod'
+
+const gtZero = (v: string) => isGreaterThan(v, 0)
+export function useSchema(supported1559: boolean, minGasLimit = 21000) {
+    const gasLimit = zod
+        .string()
+        .min(1, t`Enter gas limit`)
+        .refine(
+            (gasLimit) => isGreaterThan(gasLimit, minGasLimit) && isLessThan(gasLimit, 150_000),
+            t`Gas limit should be between ${minGasLimit} and 15.00M`,
+        )
+    return useMemo(() => {
+        if (supported1559) {
+            return zod.object({
+                gasLimit,
+                priorityFee: zod.string().refine(gtZero, t`Max base fee should be greater than 0`),
+                baseFee: zod.string().refine(gtZero, t`Max base fee should be greater than 0`),
+            })
+        }
+        return zod.object({
+            gasLimit,
+            gasPrice: zod.string().refine(gtZero, t`Gas price should be greater than 0`),
+        })
+    }, [supported1559, minGasLimit])
+}
diff --git a/packages/plugins/Trader/src/SiteAdaptor/trader/views/Trade/index.tsx b/packages/plugins/Trader/src/SiteAdaptor/trader/views/Trade/index.tsx
index cc8d3634e9b9..b717969cfb77 100644
--- a/packages/plugins/Trader/src/SiteAdaptor/trader/views/Trade/index.tsx
+++ b/packages/plugins/Trader/src/SiteAdaptor/trader/views/Trade/index.tsx
@@ -17,6 +17,7 @@ import {
 } from '@masknet/web3-shared-base'
 import { isNativeTokenAddress, type ChainId } from '@masknet/web3-shared-evm'
 import { Box, Button, Typography } from '@mui/material'
+import { BigNumber } from 'bignumber.js'
 import { useMemo, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import urlcat from 'urlcat'
@@ -256,6 +257,7 @@ export function TradeView() {
                                     )
                                     if (picked) {
                                         setInputAmount('')
+                                        setIsMax(false)
                                         setFromToken(picked)
                                         if (toChainId !== picked.chainId && isSwap) setToToken(undefined)
                                     }
@@ -296,7 +298,9 @@ export function TradeView() {
                                             if (!fromToken?.address) return
                                             const isNative = isNativeTokenAddress(fromToken.address)
                                             const balance =
-                                                isNative ? minus(fromTokenBalance, gasFee) : fromTokenBalance
+                                                isNative ?
+                                                    BigNumber.max(minus(fromTokenBalance, gasFee), 0)
+                                                :   fromTokenBalance
                                             setInputAmount(trimZero(leftShift(balance, fromToken.decimals).toFixed()))
                                             setIsMax(true)
                                         }}>
diff --git a/packages/plugins/Trader/src/assets/accross.svg b/packages/plugins/Trader/src/assets/accross.svg
deleted file mode 100644
index f868d0af1242..000000000000
--- a/packages/plugins/Trader/src/assets/accross.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-    <g id="accross_svg__Across" clip-path="url('#accross_svg__clip0_11500_2884')">
-        <rect width="24" height="24" fill="#61F8D2" rx="12"/>
-        <path id="accross_svg__Vector" fill="#2D2E33" fill-rule="evenodd" d="m5.214 6.314 1.17-1.169 4.673 4.674a2.48 2.48 0 0 0-1.22 1.12zM9.75 13.08l-4.605 4.606 1.169 1.17 4.558-4.56A2.48 2.48 0 0 1 9.75 13.08m3.443 1.214 4.495 4.496 1.17-1.17-4.545-4.544a2.47 2.47 0 0 1-1.12 1.218m1.032-3.35 4.563-4.563-1.17-1.17-4.61 4.61a2.47 2.47 0 0 1 1.217 1.123" clip-rule="evenodd"/>
-    </g>
-    <defs>
-        <clipPath id="accross_svg__clip0_11500_2884">
-            <rect width="24" height="24" fill="#fff" rx="12"/>
-        </clipPath>
-    </defs>
-</svg>
diff --git a/packages/plugins/Trader/src/assets/across.svg b/packages/plugins/Trader/src/assets/across.svg
new file mode 100644
index 000000000000..b535e32ae984
--- /dev/null
+++ b/packages/plugins/Trader/src/assets/across.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+    <g id="across_svg__accross_svg__Across" clip-path="url('#across_svg__accross_svg__clip0_11500_2884')">
+        <rect width="24" height="24" fill="#61F8D2" rx="12"/>
+        <path id="across_svg__accross_svg__Vector" fill="#2D2E33" fill-rule="evenodd" d="m5.214 6.314 1.17-1.169 4.673 4.674a2.48 2.48 0 0 0-1.22 1.12zM9.75 13.08l-4.605 4.606 1.169 1.17 4.558-4.56A2.48 2.48 0 0 1 9.75 13.08m3.443 1.214 4.495 4.496 1.17-1.17-4.545-4.544a2.47 2.47 0 0 1-1.12 1.218m1.032-3.35 4.563-4.563-1.17-1.17-4.61 4.61a2.47 2.47 0 0 1 1.217 1.123" clip-rule="evenodd"/>
+    </g>
+    <defs>
+        <clipPath id="across_svg__accross_svg__clip0_11500_2884">
+            <rect width="24" height="24" fill="#fff" rx="12"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/packages/plugins/Trader/src/locale/en-US.json b/packages/plugins/Trader/src/locale/en-US.json
index abc92084a536..333afac7677c 100644
--- a/packages/plugins/Trader/src/locale/en-US.json
+++ b/packages/plugins/Trader/src/locale/en-US.json
@@ -37,6 +37,7 @@
         "mYGY3B": "Date",
         "ctb8Cs": ["Dex/Est received (", ["0"], ")"],
         "kPQQEW": "Enter an Amount",
+        "yNBZ3N": "Enter gas limit",
         "Citz6F": "Exchange",
         "7Bj3x9": "Failed",
         "QUBIav": "Failed to bridge",
@@ -45,7 +46,9 @@
         "pG7O41": "Fastest",
         "ejVYRQ": "From",
         "3kbpgO": "Gas Limit",
+        "rWqyF3": ["Gas limit should be between ", ["minGasLimit"], " and 15.00M"],
         "OLY2Jk": "Gas Price",
+        "t+A5fr": "Gas price should be greater than 0",
         "0caMy7": "History",
         "lqW7eD": "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\nThe actual cost may be lower\nthan estimated, and any unused funds will remain in the original address.",
         "m3pz1u": ["Insufficient ", ["symbol"], " Balance"],
@@ -54,6 +57,7 @@
         "4HtGBb": "MAX",
         "RhCL4z": "Max amount",
         "T3EPqL": "Max base fee",
+        "LiE5z4": "Max base fee should be greater than 0",
         "HTX2HV": "Minimum received",
         "D9za/8": "Missing dex contract address",
         "OR475H": "Network",
diff --git a/packages/plugins/Trader/src/locale/en-US.po b/packages/plugins/Trader/src/locale/en-US.po
index 6ccf1b4c39f3..08c7eac3704a 100644
--- a/packages/plugins/Trader/src/locale/en-US.po
+++ b/packages/plugins/Trader/src/locale/en-US.po
@@ -54,7 +54,7 @@ msgstr ""
 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:123
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:134
 msgid "{mins}min"
 msgstr ""
 
@@ -62,7 +62,7 @@ msgstr ""
 msgid "{seconds}s"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:121
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:132
 msgid "{seconds}sec"
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Approving"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:250
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:276
 msgid "Average"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:350
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:376
 msgid "Base fee required: {MIN_BASE_FEE} Gwei"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:309
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:313
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:375
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158
 #: src/SiteAdaptor/trader/views/Transaction.tsx:300
 #: src/SiteAdaptor/trader/views/Transaction.tsx:307
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Bridge"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 msgid "Bridge anyway"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Complete"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:430
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:520
 #: src/SiteAdaptor/trader/views/SelectLiquidity.tsx:236
 msgid "Confirm"
 msgstr ""
@@ -153,7 +153,7 @@ msgstr ""
 #~ msgid "Cross-chain Swap"
 #~ msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:324
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:350
 msgid "Custom"
 msgstr ""
 
@@ -175,6 +175,10 @@ msgstr ""
 msgid "Enter an Amount"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:10
+msgid "Enter gas limit"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:59
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:72
 msgid "Exchange"
@@ -193,7 +197,7 @@ msgstr ""
 msgid "Failed to get quote information"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:284
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:310
 msgid "Fast"
 msgstr ""
 
@@ -203,19 +207,27 @@ msgstr ""
 
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:408
 #: src/SiteAdaptor/trader/views/Confirm.tsx:390
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:246
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:247
 #: src/SiteAdaptor/trader/views/Transaction.tsx:414
 msgid "From"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:399
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:489
 msgid "Gas Limit"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:382
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:13
+msgid "Gas limit should be between {minGasLimit} and 15.00M"
+msgstr ""
+
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:451
 msgid "Gas Price"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:25
+msgid "Gas price should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:60
 msgid "History"
 msgstr ""
@@ -241,7 +253,7 @@ msgstr ""
 msgid "Make another Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:303
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:307
 msgid "MAX"
 msgstr ""
 
@@ -249,10 +261,15 @@ msgstr ""
 msgid "Max amount"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:347
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:373
 msgid "Max base fee"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:19
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:20
+msgid "Max base fee should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:544
 msgid "Minimum received"
 msgstr ""
@@ -281,8 +298,8 @@ msgstr ""
 msgid "OKX DEX refers to the OKX DEX aggregator, which chooses the best route to place an order through all integrated third-party DEXs (some of them are shown below).  Note that OKX DEX derives all its liquidity from third-party liquidity pools. OKX DEX does NOT conduct any transactions directly."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:277
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:360
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:279
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:364
 msgid "on {0}"
 msgstr ""
 
@@ -295,7 +312,7 @@ msgstr ""
 msgid "Powered by"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:365
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:412
 msgid "Priority fee"
 msgstr ""
 
@@ -342,7 +359,7 @@ msgstr ""
 msgid "Slippage"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:212
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:238
 msgid "Slow"
 msgstr ""
 
@@ -351,12 +368,12 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/Confirm.tsx:296
 #: src/SiteAdaptor/trader/views/Confirm.tsx:313
 #: src/SiteAdaptor/trader/views/Confirm.tsx:355
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 #: src/SiteAdaptor/trader/views/Transaction.tsx:544
 msgid "Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 msgid "Swap anyway"
 msgstr ""
 
@@ -376,7 +393,7 @@ msgstr ""
 msgid "The {0} is in progress. You can check its status in History after exiting this page."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:404
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:494
 msgid "The custom amount entered may be higher than the required network fee."
 msgstr ""
 
@@ -393,7 +410,7 @@ msgstr ""
 msgid "This is the price difference between the DEX with the highest composite price and other DEXs, which factors in the estimated received amount and network fee."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:178
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:179
 msgid "This swap isn’t supported"
 msgstr ""
 
diff --git a/packages/plugins/Trader/src/locale/ja-JP.json b/packages/plugins/Trader/src/locale/ja-JP.json
index abc92084a536..333afac7677c 100644
--- a/packages/plugins/Trader/src/locale/ja-JP.json
+++ b/packages/plugins/Trader/src/locale/ja-JP.json
@@ -37,6 +37,7 @@
         "mYGY3B": "Date",
         "ctb8Cs": ["Dex/Est received (", ["0"], ")"],
         "kPQQEW": "Enter an Amount",
+        "yNBZ3N": "Enter gas limit",
         "Citz6F": "Exchange",
         "7Bj3x9": "Failed",
         "QUBIav": "Failed to bridge",
@@ -45,7 +46,9 @@
         "pG7O41": "Fastest",
         "ejVYRQ": "From",
         "3kbpgO": "Gas Limit",
+        "rWqyF3": ["Gas limit should be between ", ["minGasLimit"], " and 15.00M"],
         "OLY2Jk": "Gas Price",
+        "t+A5fr": "Gas price should be greater than 0",
         "0caMy7": "History",
         "lqW7eD": "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\nThe actual cost may be lower\nthan estimated, and any unused funds will remain in the original address.",
         "m3pz1u": ["Insufficient ", ["symbol"], " Balance"],
@@ -54,6 +57,7 @@
         "4HtGBb": "MAX",
         "RhCL4z": "Max amount",
         "T3EPqL": "Max base fee",
+        "LiE5z4": "Max base fee should be greater than 0",
         "HTX2HV": "Minimum received",
         "D9za/8": "Missing dex contract address",
         "OR475H": "Network",
diff --git a/packages/plugins/Trader/src/locale/ja-JP.po b/packages/plugins/Trader/src/locale/ja-JP.po
index d2eb7f449cf3..b0fc92f47747 100644
--- a/packages/plugins/Trader/src/locale/ja-JP.po
+++ b/packages/plugins/Trader/src/locale/ja-JP.po
@@ -59,7 +59,7 @@ msgstr ""
 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:123
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:134
 msgid "{mins}min"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 msgid "{seconds}s"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:121
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:132
 msgid "{seconds}sec"
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Approving"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:250
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:276
 msgid "Average"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:350
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:376
 msgid "Base fee required: {MIN_BASE_FEE} Gwei"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:309
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:313
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:375
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158
 #: src/SiteAdaptor/trader/views/Transaction.tsx:300
 #: src/SiteAdaptor/trader/views/Transaction.tsx:307
@@ -106,7 +106,7 @@ msgstr ""
 msgid "Bridge"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 msgid "Bridge anyway"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr ""
 msgid "Complete"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:430
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:520
 #: src/SiteAdaptor/trader/views/SelectLiquidity.tsx:236
 msgid "Confirm"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 #~ msgid "Cross-chain Swap"
 #~ msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:324
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:350
 msgid "Custom"
 msgstr ""
 
@@ -180,6 +180,10 @@ msgstr ""
 msgid "Enter an Amount"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:10
+msgid "Enter gas limit"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:59
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:72
 msgid "Exchange"
@@ -198,7 +202,7 @@ msgstr ""
 msgid "Failed to get quote information"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:284
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:310
 msgid "Fast"
 msgstr ""
 
@@ -208,19 +212,27 @@ msgstr ""
 
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:408
 #: src/SiteAdaptor/trader/views/Confirm.tsx:390
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:246
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:247
 #: src/SiteAdaptor/trader/views/Transaction.tsx:414
 msgid "From"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:399
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:489
 msgid "Gas Limit"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:382
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:13
+msgid "Gas limit should be between {minGasLimit} and 15.00M"
+msgstr ""
+
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:451
 msgid "Gas Price"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:25
+msgid "Gas price should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:60
 msgid "History"
 msgstr ""
@@ -246,7 +258,7 @@ msgstr ""
 msgid "Make another Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:303
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:307
 msgid "MAX"
 msgstr ""
 
@@ -254,10 +266,15 @@ msgstr ""
 msgid "Max amount"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:347
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:373
 msgid "Max base fee"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:19
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:20
+msgid "Max base fee should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:544
 msgid "Minimum received"
 msgstr ""
@@ -286,8 +303,8 @@ msgstr ""
 msgid "OKX DEX refers to the OKX DEX aggregator, which chooses the best route to place an order through all integrated third-party DEXs (some of them are shown below).  Note that OKX DEX derives all its liquidity from third-party liquidity pools. OKX DEX does NOT conduct any transactions directly."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:277
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:360
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:279
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:364
 msgid "on {0}"
 msgstr ""
 
@@ -300,7 +317,7 @@ msgstr ""
 msgid "Powered by"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:365
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:412
 msgid "Priority fee"
 msgstr ""
 
@@ -347,7 +364,7 @@ msgstr ""
 msgid "Slippage"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:212
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:238
 msgid "Slow"
 msgstr ""
 
@@ -356,12 +373,12 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/Confirm.tsx:296
 #: src/SiteAdaptor/trader/views/Confirm.tsx:313
 #: src/SiteAdaptor/trader/views/Confirm.tsx:355
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 #: src/SiteAdaptor/trader/views/Transaction.tsx:544
 msgid "Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 msgid "Swap anyway"
 msgstr ""
 
@@ -381,7 +398,7 @@ msgstr ""
 msgid "The {0} is in progress. You can check its status in History after exiting this page."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:404
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:494
 msgid "The custom amount entered may be higher than the required network fee."
 msgstr ""
 
@@ -398,7 +415,7 @@ msgstr ""
 msgid "This is the price difference between the DEX with the highest composite price and other DEXs, which factors in the estimated received amount and network fee."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:178
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:179
 msgid "This swap isn’t supported"
 msgstr ""
 
diff --git a/packages/plugins/Trader/src/locale/ko-KR.json b/packages/plugins/Trader/src/locale/ko-KR.json
index abc92084a536..333afac7677c 100644
--- a/packages/plugins/Trader/src/locale/ko-KR.json
+++ b/packages/plugins/Trader/src/locale/ko-KR.json
@@ -37,6 +37,7 @@
         "mYGY3B": "Date",
         "ctb8Cs": ["Dex/Est received (", ["0"], ")"],
         "kPQQEW": "Enter an Amount",
+        "yNBZ3N": "Enter gas limit",
         "Citz6F": "Exchange",
         "7Bj3x9": "Failed",
         "QUBIav": "Failed to bridge",
@@ -45,7 +46,9 @@
         "pG7O41": "Fastest",
         "ejVYRQ": "From",
         "3kbpgO": "Gas Limit",
+        "rWqyF3": ["Gas limit should be between ", ["minGasLimit"], " and 15.00M"],
         "OLY2Jk": "Gas Price",
+        "t+A5fr": "Gas price should be greater than 0",
         "0caMy7": "History",
         "lqW7eD": "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\nThe actual cost may be lower\nthan estimated, and any unused funds will remain in the original address.",
         "m3pz1u": ["Insufficient ", ["symbol"], " Balance"],
@@ -54,6 +57,7 @@
         "4HtGBb": "MAX",
         "RhCL4z": "Max amount",
         "T3EPqL": "Max base fee",
+        "LiE5z4": "Max base fee should be greater than 0",
         "HTX2HV": "Minimum received",
         "D9za/8": "Missing dex contract address",
         "OR475H": "Network",
diff --git a/packages/plugins/Trader/src/locale/ko-KR.po b/packages/plugins/Trader/src/locale/ko-KR.po
index ce61ad1e67f3..acca7544a651 100644
--- a/packages/plugins/Trader/src/locale/ko-KR.po
+++ b/packages/plugins/Trader/src/locale/ko-KR.po
@@ -59,7 +59,7 @@ msgstr ""
 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:123
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:134
 msgid "{mins}min"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 msgid "{seconds}s"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:121
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:132
 msgid "{seconds}sec"
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Approving"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:250
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:276
 msgid "Average"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:350
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:376
 msgid "Base fee required: {MIN_BASE_FEE} Gwei"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:309
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:313
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:375
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158
 #: src/SiteAdaptor/trader/views/Transaction.tsx:300
 #: src/SiteAdaptor/trader/views/Transaction.tsx:307
@@ -106,7 +106,7 @@ msgstr ""
 msgid "Bridge"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 msgid "Bridge anyway"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr ""
 msgid "Complete"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:430
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:520
 #: src/SiteAdaptor/trader/views/SelectLiquidity.tsx:236
 msgid "Confirm"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 #~ msgid "Cross-chain Swap"
 #~ msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:324
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:350
 msgid "Custom"
 msgstr ""
 
@@ -180,6 +180,10 @@ msgstr ""
 msgid "Enter an Amount"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:10
+msgid "Enter gas limit"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:59
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:72
 msgid "Exchange"
@@ -198,7 +202,7 @@ msgstr ""
 msgid "Failed to get quote information"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:284
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:310
 msgid "Fast"
 msgstr ""
 
@@ -208,19 +212,27 @@ msgstr ""
 
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:408
 #: src/SiteAdaptor/trader/views/Confirm.tsx:390
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:246
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:247
 #: src/SiteAdaptor/trader/views/Transaction.tsx:414
 msgid "From"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:399
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:489
 msgid "Gas Limit"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:382
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:13
+msgid "Gas limit should be between {minGasLimit} and 15.00M"
+msgstr ""
+
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:451
 msgid "Gas Price"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:25
+msgid "Gas price should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:60
 msgid "History"
 msgstr ""
@@ -246,7 +258,7 @@ msgstr ""
 msgid "Make another Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:303
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:307
 msgid "MAX"
 msgstr ""
 
@@ -254,10 +266,15 @@ msgstr ""
 msgid "Max amount"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:347
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:373
 msgid "Max base fee"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:19
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:20
+msgid "Max base fee should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:544
 msgid "Minimum received"
 msgstr ""
@@ -286,8 +303,8 @@ msgstr ""
 msgid "OKX DEX refers to the OKX DEX aggregator, which chooses the best route to place an order through all integrated third-party DEXs (some of them are shown below).  Note that OKX DEX derives all its liquidity from third-party liquidity pools. OKX DEX does NOT conduct any transactions directly."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:277
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:360
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:279
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:364
 msgid "on {0}"
 msgstr ""
 
@@ -300,7 +317,7 @@ msgstr ""
 msgid "Powered by"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:365
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:412
 msgid "Priority fee"
 msgstr ""
 
@@ -347,7 +364,7 @@ msgstr ""
 msgid "Slippage"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:212
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:238
 msgid "Slow"
 msgstr ""
 
@@ -356,12 +373,12 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/Confirm.tsx:296
 #: src/SiteAdaptor/trader/views/Confirm.tsx:313
 #: src/SiteAdaptor/trader/views/Confirm.tsx:355
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 #: src/SiteAdaptor/trader/views/Transaction.tsx:544
 msgid "Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 msgid "Swap anyway"
 msgstr ""
 
@@ -381,7 +398,7 @@ msgstr ""
 msgid "The {0} is in progress. You can check its status in History after exiting this page."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:404
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:494
 msgid "The custom amount entered may be higher than the required network fee."
 msgstr ""
 
@@ -398,7 +415,7 @@ msgstr ""
 msgid "This is the price difference between the DEX with the highest composite price and other DEXs, which factors in the estimated received amount and network fee."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:178
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:179
 msgid "This swap isn’t supported"
 msgstr ""
 
diff --git a/packages/plugins/Trader/src/locale/zh-CN.json b/packages/plugins/Trader/src/locale/zh-CN.json
index abc92084a536..333afac7677c 100644
--- a/packages/plugins/Trader/src/locale/zh-CN.json
+++ b/packages/plugins/Trader/src/locale/zh-CN.json
@@ -37,6 +37,7 @@
         "mYGY3B": "Date",
         "ctb8Cs": ["Dex/Est received (", ["0"], ")"],
         "kPQQEW": "Enter an Amount",
+        "yNBZ3N": "Enter gas limit",
         "Citz6F": "Exchange",
         "7Bj3x9": "Failed",
         "QUBIav": "Failed to bridge",
@@ -45,7 +46,9 @@
         "pG7O41": "Fastest",
         "ejVYRQ": "From",
         "3kbpgO": "Gas Limit",
+        "rWqyF3": ["Gas limit should be between ", ["minGasLimit"], " and 15.00M"],
         "OLY2Jk": "Gas Price",
+        "t+A5fr": "Gas price should be greater than 0",
         "0caMy7": "History",
         "lqW7eD": "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\nThe actual cost may be lower\nthan estimated, and any unused funds will remain in the original address.",
         "m3pz1u": ["Insufficient ", ["symbol"], " Balance"],
@@ -54,6 +57,7 @@
         "4HtGBb": "MAX",
         "RhCL4z": "Max amount",
         "T3EPqL": "Max base fee",
+        "LiE5z4": "Max base fee should be greater than 0",
         "HTX2HV": "Minimum received",
         "D9za/8": "Missing dex contract address",
         "OR475H": "Network",
diff --git a/packages/plugins/Trader/src/locale/zh-CN.po b/packages/plugins/Trader/src/locale/zh-CN.po
index 30b1b57f7919..3330aefde211 100644
--- a/packages/plugins/Trader/src/locale/zh-CN.po
+++ b/packages/plugins/Trader/src/locale/zh-CN.po
@@ -59,7 +59,7 @@ msgstr ""
 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:123
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:134
 msgid "{mins}min"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 msgid "{seconds}s"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:121
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:132
 msgid "{seconds}sec"
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Approving"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:250
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:276
 msgid "Average"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:350
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:376
 msgid "Base fee required: {MIN_BASE_FEE} Gwei"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:309
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:313
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:375
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158
 #: src/SiteAdaptor/trader/views/Transaction.tsx:300
 #: src/SiteAdaptor/trader/views/Transaction.tsx:307
@@ -106,7 +106,7 @@ msgstr ""
 msgid "Bridge"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 msgid "Bridge anyway"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr ""
 msgid "Complete"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:430
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:520
 #: src/SiteAdaptor/trader/views/SelectLiquidity.tsx:236
 msgid "Confirm"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 #~ msgid "Cross-chain Swap"
 #~ msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:324
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:350
 msgid "Custom"
 msgstr ""
 
@@ -180,6 +180,10 @@ msgstr ""
 msgid "Enter an Amount"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:10
+msgid "Enter gas limit"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:59
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:72
 msgid "Exchange"
@@ -198,7 +202,7 @@ msgstr ""
 msgid "Failed to get quote information"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:284
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:310
 msgid "Fast"
 msgstr ""
 
@@ -208,19 +212,27 @@ msgstr ""
 
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:408
 #: src/SiteAdaptor/trader/views/Confirm.tsx:390
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:246
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:247
 #: src/SiteAdaptor/trader/views/Transaction.tsx:414
 msgid "From"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:399
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:489
 msgid "Gas Limit"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:382
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:13
+msgid "Gas limit should be between {minGasLimit} and 15.00M"
+msgstr ""
+
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:451
 msgid "Gas Price"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:25
+msgid "Gas price should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:60
 msgid "History"
 msgstr ""
@@ -246,7 +258,7 @@ msgstr ""
 msgid "Make another Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:303
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:307
 msgid "MAX"
 msgstr ""
 
@@ -254,10 +266,15 @@ msgstr ""
 msgid "Max amount"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:347
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:373
 msgid "Max base fee"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:19
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:20
+msgid "Max base fee should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:544
 msgid "Minimum received"
 msgstr ""
@@ -286,8 +303,8 @@ msgstr ""
 msgid "OKX DEX refers to the OKX DEX aggregator, which chooses the best route to place an order through all integrated third-party DEXs (some of them are shown below).  Note that OKX DEX derives all its liquidity from third-party liquidity pools. OKX DEX does NOT conduct any transactions directly."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:277
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:360
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:279
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:364
 msgid "on {0}"
 msgstr ""
 
@@ -300,7 +317,7 @@ msgstr ""
 msgid "Powered by"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:365
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:412
 msgid "Priority fee"
 msgstr ""
 
@@ -347,7 +364,7 @@ msgstr ""
 msgid "Slippage"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:212
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:238
 msgid "Slow"
 msgstr ""
 
@@ -356,12 +373,12 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/Confirm.tsx:296
 #: src/SiteAdaptor/trader/views/Confirm.tsx:313
 #: src/SiteAdaptor/trader/views/Confirm.tsx:355
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 #: src/SiteAdaptor/trader/views/Transaction.tsx:544
 msgid "Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 msgid "Swap anyway"
 msgstr ""
 
@@ -381,7 +398,7 @@ msgstr ""
 msgid "The {0} is in progress. You can check its status in History after exiting this page."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:404
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:494
 msgid "The custom amount entered may be higher than the required network fee."
 msgstr ""
 
@@ -398,7 +415,7 @@ msgstr ""
 msgid "This is the price difference between the DEX with the highest composite price and other DEXs, which factors in the estimated received amount and network fee."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:178
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:179
 msgid "This swap isn’t supported"
 msgstr ""
 
diff --git a/packages/plugins/Trader/src/locale/zh-TW.json b/packages/plugins/Trader/src/locale/zh-TW.json
index abc92084a536..333afac7677c 100644
--- a/packages/plugins/Trader/src/locale/zh-TW.json
+++ b/packages/plugins/Trader/src/locale/zh-TW.json
@@ -37,6 +37,7 @@
         "mYGY3B": "Date",
         "ctb8Cs": ["Dex/Est received (", ["0"], ")"],
         "kPQQEW": "Enter an Amount",
+        "yNBZ3N": "Enter gas limit",
         "Citz6F": "Exchange",
         "7Bj3x9": "Failed",
         "QUBIav": "Failed to bridge",
@@ -45,7 +46,9 @@
         "pG7O41": "Fastest",
         "ejVYRQ": "From",
         "3kbpgO": "Gas Limit",
+        "rWqyF3": ["Gas limit should be between ", ["minGasLimit"], " and 15.00M"],
         "OLY2Jk": "Gas Price",
+        "t+A5fr": "Gas price should be greater than 0",
         "0caMy7": "History",
         "lqW7eD": "In cross-chain transactions, this fee includes the estimated network fee and the cross-chain bridge's network fee which is $0.00 (0 OP_ETH). The network fees are paid to the miners and aren't charged by our platform.\nThe actual cost may be lower\nthan estimated, and any unused funds will remain in the original address.",
         "m3pz1u": ["Insufficient ", ["symbol"], " Balance"],
@@ -54,6 +57,7 @@
         "4HtGBb": "MAX",
         "RhCL4z": "Max amount",
         "T3EPqL": "Max base fee",
+        "LiE5z4": "Max base fee should be greater than 0",
         "HTX2HV": "Minimum received",
         "D9za/8": "Missing dex contract address",
         "OR475H": "Network",
diff --git a/packages/plugins/Trader/src/locale/zh-TW.po b/packages/plugins/Trader/src/locale/zh-TW.po
index acd6243f52c8..7112ee83fe52 100644
--- a/packages/plugins/Trader/src/locale/zh-TW.po
+++ b/packages/plugins/Trader/src/locale/zh-TW.po
@@ -59,7 +59,7 @@ msgstr ""
 msgid "{gasOptionType, select, slow {Slow} normal {Average} fast {Fast} custom {Custom}}"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:123
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:134
 msgid "{mins}min"
 msgstr ""
 
@@ -67,7 +67,7 @@ msgstr ""
 msgid "{seconds}s"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:121
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:132
 msgid "{seconds}sec"
 msgstr ""
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "Approving"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:250
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:276
 msgid "Average"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:350
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:376
 msgid "Base fee required: {MIN_BASE_FEE} Gwei"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:309
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:313
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:375
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 #: src/SiteAdaptor/trader/views/TradingRoute.tsx:158
 #: src/SiteAdaptor/trader/views/Transaction.tsx:300
 #: src/SiteAdaptor/trader/views/Transaction.tsx:307
@@ -106,7 +106,7 @@ msgstr ""
 msgid "Bridge"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:238
 msgid "Bridge anyway"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr ""
 msgid "Complete"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:430
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:520
 #: src/SiteAdaptor/trader/views/SelectLiquidity.tsx:236
 msgid "Confirm"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 #~ msgid "Cross-chain Swap"
 #~ msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:324
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:350
 msgid "Custom"
 msgstr ""
 
@@ -180,6 +180,10 @@ msgstr ""
 msgid "Enter an Amount"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:10
+msgid "Enter gas limit"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:59
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:72
 msgid "Exchange"
@@ -198,7 +202,7 @@ msgstr ""
 msgid "Failed to get quote information"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:284
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:310
 msgid "Fast"
 msgstr ""
 
@@ -208,19 +212,27 @@ msgstr ""
 
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:408
 #: src/SiteAdaptor/trader/views/Confirm.tsx:390
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:246
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:247
 #: src/SiteAdaptor/trader/views/Transaction.tsx:414
 msgid "From"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:399
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:489
 msgid "Gas Limit"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:382
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:13
+msgid "Gas limit should be between {minGasLimit} and 15.00M"
+msgstr ""
+
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:451
 msgid "Gas Price"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:25
+msgid "Gas price should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/ExchangeDialog.tsx:60
 msgid "History"
 msgstr ""
@@ -246,7 +258,7 @@ msgstr ""
 msgid "Make another Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:303
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:307
 msgid "MAX"
 msgstr ""
 
@@ -254,10 +266,15 @@ msgstr ""
 msgid "Max amount"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:347
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:373
 msgid "Max base fee"
 msgstr ""
 
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:19
+#: src/SiteAdaptor/trader/views/NetworkFee/schema.ts:20
+msgid "Max base fee should be greater than 0"
+msgstr ""
+
 #: src/SiteAdaptor/trader/views/BridgeConfirm.tsx:544
 msgid "Minimum received"
 msgstr ""
@@ -286,8 +303,8 @@ msgstr ""
 msgid "OKX DEX refers to the OKX DEX aggregator, which chooses the best route to place an order through all integrated third-party DEXs (some of them are shown below).  Note that OKX DEX derives all its liquidity from third-party liquidity pools. OKX DEX does NOT conduct any transactions directly."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:277
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:360
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:279
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:364
 msgid "on {0}"
 msgstr ""
 
@@ -300,7 +317,7 @@ msgstr ""
 msgid "Powered by"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:365
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:412
 msgid "Priority fee"
 msgstr ""
 
@@ -347,7 +364,7 @@ msgstr ""
 msgid "Slippage"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:212
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:238
 msgid "Slow"
 msgstr ""
 
@@ -356,12 +373,12 @@ msgstr ""
 #: src/SiteAdaptor/trader/views/Confirm.tsx:296
 #: src/SiteAdaptor/trader/views/Confirm.tsx:313
 #: src/SiteAdaptor/trader/views/Confirm.tsx:355
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 #: src/SiteAdaptor/trader/views/Transaction.tsx:544
 msgid "Swap"
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:236
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:237
 msgid "Swap anyway"
 msgstr ""
 
@@ -381,7 +398,7 @@ msgstr ""
 msgid "The {0} is in progress. You can check its status in History after exiting this page."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/NetworkFee.tsx:404
+#: src/SiteAdaptor/trader/views/NetworkFee/index.tsx:494
 msgid "The custom amount entered may be higher than the required network fee."
 msgstr ""
 
@@ -398,7 +415,7 @@ msgstr ""
 msgid "This is the price difference between the DEX with the highest composite price and other DEXs, which factors in the estimated received amount and network fee."
 msgstr ""
 
-#: src/SiteAdaptor/trader/views/Trade/index.tsx:178
+#: src/SiteAdaptor/trader/views/Trade/index.tsx:179
 msgid "This swap isn’t supported"
 msgstr ""
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d761595228f3..fb29d8017f37 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1988,6 +1988,9 @@ importers:
       '@ethersproject/providers':
         specifier: ^5.7.2
         version: 5.7.2(bufferutil@4.0.7)(utf-8-validate@5.0.10)
+      '@hookform/resolvers':
+        specifier: ^3.6.0
+        version: 3.6.0(react-hook-form@7.53.0(react@0.0.0-experimental-58af67a8f8-20240628))
       '@masknet/icons':
         specifier: workspace:^
         version: link:../../icons
@@ -2045,6 +2048,9 @@ importers:
       immer:
         specifier: ^10.1.1
         version: 10.1.1
+      react-hook-form:
+        specifier: ^7.53.0
+        version: 7.53.0(react@0.0.0-experimental-58af67a8f8-20240628)
       react-router-dom:
         specifier: ^6.24.0
         version: 6.24.0(react-dom@0.0.0-experimental-58af67a8f8-20240628(react@0.0.0-experimental-58af67a8f8-20240628))(react@0.0.0-experimental-58af67a8f8-20240628)
@@ -2060,6 +2066,9 @@ importers:
       web3-core:
         specifier: 1.10.4
         version: 1.10.4(encoding@0.1.13)
+      zod:
+        specifier: ^3.23.8
+        version: 3.23.8
     devDependencies:
       '@types/use-subscription':
         specifier: ^1.0.2
@@ -12708,6 +12717,12 @@ packages:
     peerDependencies:
       react: 0.0.0-experimental-58af67a8f8-20240628
 
+  react-hook-form@7.53.0:
+    resolution: {integrity: sha512-M1n3HhqCww6S2hxLxciEXy2oISPnAzxY7gvwVPrtlczTM/1dDadXgUxDpHMrMTblDOcm/AXtXxHwZ3jpg1mqKQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 0.0.0-experimental-58af67a8f8-20240628
+
   react-i18next@14.1.2:
     resolution: {integrity: sha512-FSIcJy6oauJbGEXfhUgVeLzvWBhIBIS+/9c6Lj4niwKZyGaGb4V4vUbATXSlsHJDXXB+ociNxqFNiFuV1gmoqg==}
     peerDependencies:
@@ -17330,6 +17345,10 @@ snapshots:
     dependencies:
       react-hook-form: 7.52.0(react@0.0.0-experimental-58af67a8f8-20240628)
 
+  '@hookform/resolvers@3.6.0(react-hook-form@7.53.0(react@0.0.0-experimental-58af67a8f8-20240628))':
+    dependencies:
+      react-hook-form: 7.53.0(react@0.0.0-experimental-58af67a8f8-20240628)
+
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.2
@@ -27814,6 +27833,10 @@ snapshots:
     dependencies:
       react: 0.0.0-experimental-58af67a8f8-20240628
 
+  react-hook-form@7.53.0(react@0.0.0-experimental-58af67a8f8-20240628):
+    dependencies:
+      react: 0.0.0-experimental-58af67a8f8-20240628
+
   react-i18next@14.1.2(i18next@23.11.5)(react-dom@0.0.0-experimental-58af67a8f8-20240628(react@0.0.0-experimental-58af67a8f8-20240628))(react@0.0.0-experimental-58af67a8f8-20240628):
     dependencies:
       '@babel/runtime': 7.24.0