merge conflicts

src/app/BridgeSwap/ApproveToken.tsx

@@ -20,19 +20,24 @@ import CustomTooltip, {
   CustomTooltipWithQuestion,
 } from "@/components/tooltip/CustomTooltip";
 import QuestionIcon from "assets/icons/question.svg";
+import { useInOutNetwork } from "@/hooks/network";
+import { BRIDGE_VERSION } from "@/staging/constants/legacyTitan";
+import { LegacyTitanBridgeVersionEnum } from "@/staging/types/legacyTitan";
 
 export default function ApproveToken() {
   const { inToken } = useInOutTokens();
   const { isApproved, callApprove, isLoading, isRevokeForUSDT } = useApprove();
   const { isNotSupportForBridge } = useBridgeSupport();
   const { isTONatPair } = useIsTon();
   const { mode } = useGetMode();
+  const { inNetwork, outNetwork } = useInOutNetwork();
   const { isConnected } = useAccount();
   const { isBalanceOver, isInputZero } = useInputBalanceCheck();
   const { confirmedApproveTransaction, confirmedRevokeTransaction } =
     useTransaction();
   const [, setIsDrawerOpen] = useRecoilState(accountDrawerStatus);
-
+  const isL2 = inNetwork?.layer === "L2" || outNetwork?.layer === "L2";
+  if (isL2 && BRIDGE_VERSION === LegacyTitanBridgeVersionEnum.V10) return null;
   if (
     (isApproved ||
       isNotSupportForBridge ||

src/app/BridgeSwap/TransactionDetail.tsx

@@ -32,6 +32,8 @@ import { useAccount } from "wagmi";
 import useMediaView from "@/hooks/mediaView/useMediaView";
 import useIsTon from "@/hooks/token/useIsTon";
 import { useGetMarketPrice } from "@/hooks/price/useGetMarketPrice";
+import { LegacyTitanBridgeVersionEnum } from "@/staging/types/legacyTitan";
+import { BRIDGE_VERSION } from "@/staging/constants/legacyTitan";
 
 const DivisionLine = () => {
   return <Box w={"100%"} h={"1px"} bgColor={"#2E313A"} my={"14px"}></Box>;
@@ -584,6 +586,8 @@ export default function TransactionDetail(props: {
   isOnConfirm?: boolean;
   isMobile?: boolean;
 }) {
+  const { inNetwork, outNetwork } = useInOutNetwork();
+  const isL2 = inNetwork?.layer === "L2" || outNetwork?.layer === "L2";
   const { isOnConfirm, isMobile } = props;
   const { isOpen } = useConfirm();
 
@@ -607,7 +611,7 @@ export default function TransactionDetail(props: {
     mode === "Unwrap" ||
     mode === "ETH-Wrap" ||
     mode === "ETH-Unwrap";
-
+  if (isL2 && BRIDGE_VERSION === LegacyTitanBridgeVersionEnum.V10) return null;
   if (
     !isReady ||
     isNotSupportForSwap ||

src/types/token/supportedToken.ts

@@ -41,10 +41,10 @@ export const supportedTokens: SupportedTokens_T = [
     tokenSymbol: "ETH",
     address: {
       MAINNET: "",
-      TITAN: TOKAMAK_CONTRACTS.WETH_ADDRESS,
+      TITAN: TOKAMAK_CONTRACTS.OVM_ETH,
       SEPOLIA: "",
       THANOS_SEPOLIA: THANOS_SEPOLIA_CONTRACTS.ETH_ADDRESS,
-      TITAN_SEPOLIA: TITAN_SEPOLIA_CONTRACTS.WETH_ADDRESS,
+      TITAN_SEPOLIA: TITAN_SEPOLIA_CONTRACTS.OVM_ETH,
     },
     decimals: 18,
     isNativeCurrency: [