Merge remote-tracking branch 'origin/feat/slippage-tune' into tmp/20250117

Author: dmy147

src/ui/views/Bridge/Component/BridgeSlippage.tsx

@@ -53,7 +53,7 @@ const SlippageItem = styled.div`
 
 const BRIDGE_SLIPPAGE = ['0.5', '1'];
 
-const SWAP_SLIPPAGE = ['0.1', '0.5'];
+export const SWAP_SLIPPAGE = ['0.5', '3'];
 
 const BRIDGE_MAX_SLIPPAGE = 10;
 
@@ -215,6 +215,16 @@ export const BridgeSlippage = memo((props: BridgeSlippageProps) => {
     [onChange, setAutoSlippage, setIsCustomSlippage]
   );
 
+  useEffect(() => {
+    if (
+      !autoSlippage &&
+      !isCustomSlippage &&
+      SLIPPAGE.findIndex((item) => item === value) === -1
+    ) {
+      setIsCustomSlippage(true);
+    }
+  }, [SLIPPAGE, autoSlippage, isCustomSlippage, setIsCustomSlippage, value]);
+
   useEffect(() => {
     if (tips) {
       setSlippageOpen(true);

src/ui/views/Swap/Component/Main.tsx

@@ -49,6 +49,7 @@ import { Header } from './Header';
 import { obj2query } from '@/ui/utils/url';
 const isTab = getUiType().isTab;
 const getContainer = isTab ? '.js-rabby-popup-container' : undefined;
+import { SWAP_SLIPPAGE } from '../../Bridge/Component/BridgeSlippage';
 
 const getDisabledTips: SelectChainItemProps['disabledTips'] = (ctx) => {
   const chainItem = findChainByServerID(ctx.chain.serverId);
@@ -418,7 +419,7 @@ export const Main = () => {
         !!payToken &&
         !!receiveToken &&
         activeProvider &&
-        Number(slippage) > 1
+        Number(slippage) >= Number(SWAP_SLIPPAGE[1])
       ) {
         setShowMoreOpen(true);
       }

src/ui/views/Swap/hooks/slippage.tsx

@@ -68,3 +68,7 @@ export const useSwapSlippage = () => {
     ...slippageStore,
   };
 };
+
+export const getSwapAutoSlippageValue = (isStableCoin: boolean) => {
+  return isStableCoin ? '0.1' : '1';
+};

src/ui/views/Swap/hooks/token.tsx

@@ -21,7 +21,7 @@ import { useAsyncInitializeChainList } from '@/ui/hooks/useChain';
 import { SWAP_SUPPORT_CHAINS } from '@/constant';
 import { findChain, findChainByEnum } from '@/utils/chain';
 import { GasLevelType } from '../Component/ReserveGasPopup';
-import { useSwapSlippage } from './slippage';
+import { getSwapAutoSlippageValue, useSwapSlippage } from './slippage';
 import { useLowCreditState } from '../Component/LowCreditModal';
 
 const useTokenInfo = ({
@@ -402,7 +402,7 @@ export const useTokenPair = (userAddress: string) => {
       setFeeRate('0');
     }
     if (slippageObj.autoSlippage) {
-      slippageObj.setSlippage(isStableCoin ? '0.1' : '0.5');
+      slippageObj.setSlippage(getSwapAutoSlippageValue(isStableCoin));
     }
   }, [slippageObj.autoSlippage, isWrapToken, isStableCoin]);