From ed5b7d64441dfb941a1ec14c1e2c8a5ff84835c7 Mon Sep 17 00:00:00 2001
From: songwongtp <16089160+songwongtp@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:37:53 +0700
Subject: [PATCH 1/3] feat: evm proxy contract and checksum

---
 CHANGELOG.md                                  |   1 +
 src/lib/hooks/useFormatAddresses.ts           |  32 +++--
 .../components/nfts/NftsSectionSequencer.tsx  |   9 +-
 .../hooks/useAccountRedirect.ts               |   9 +-
 .../components/ContractTop.tsx                |   6 +-
 .../components/EvmContractDetailsTop.tsx      |  55 +++++++--
 .../OverviewProxyTargetInfo.tsx               |  43 +++++++
 .../OverviewVerifiedCmds.tsx                  | 115 ++++++------------
 .../OverviewVerifiedProxyTargetCmds.tsx       |  63 ++++++++++
 .../evm-contract-details-overview/index.tsx   |   8 +-
 .../interact-evm-contract/index.tsx           |  25 ++--
 src/lib/pages/evm-contract-details/index.tsx  |  26 ++--
 src/lib/services/evm/json-rpc/proxy/utils.ts  |   3 +-
 src/lib/services/move/module/index.ts         |  21 ++--
 src/lib/services/move/resource/index.ts       |  14 +--
 src/lib/services/searchService.ts             |  13 +-
 src/lib/services/types/tx.ts                  |  87 +++++++------
 src/lib/utils/address.ts                      |  14 +--
 src/lib/utils/evm.ts                          |  10 +-
 19 files changed, 356 insertions(+), 198 deletions(-)
 create mode 100644 src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewProxyTargetInfo.tsx
 create mode 100644 src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedProxyTargetCmds.tsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13f886667..bca1b5d82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
+- [#1242](https://github.com/alleslabs/celatone-frontend/pull/1242) Fix EVM proxy contract details and checksum address
 - [#1236](https://github.com/alleslabs/celatone-frontend/pull/1236) Remove unnecessary configs for users in custom network configs
 - [#1228](https://github.com/alleslabs/celatone-frontend/pull/1228) Refactor EVM verification form path and form type location
 - [#1215](https://github.com/alleslabs/celatone-frontend/pull/1215) Bump react wallet widget package to support http endpoints
diff --git a/src/lib/hooks/useFormatAddresses.ts b/src/lib/hooks/useFormatAddresses.ts
index a223019d4..b08c4a602 100644
--- a/src/lib/hooks/useFormatAddresses.ts
+++ b/src/lib/hooks/useFormatAddresses.ts
@@ -1,35 +1,49 @@
 import { useCallback } from "react";
 
-import { useConvertHexAddress } from "lib/app-provider";
-import type { BechAddr, HexAddr } from "lib/types";
+import { useCelatoneApp, useConvertHexAddress } from "lib/app-provider";
+import { type HexAddr, zBechAddr, zHexAddr } from "lib/types";
 import {
   bech32AddressToHex,
   isHexModuleAddress,
   isHexWalletAddress,
+  toChecksumAddress,
   unpadHexAddress,
 } from "lib/utils";
 
 export const useFormatAddresses = () => {
+  const {
+    chainConfig: {
+      features: { move },
+    },
+  } = useCelatoneApp();
   const { convertHexWalletAddress, convertHexModuleAddress } =
     useConvertHexAddress();
 
+  const formatHexAddress = useCallback(
+    (address: HexAddr) => {
+      if (move.enabled) return unpadHexAddress(address);
+      return toChecksumAddress(address);
+    },
+    [move.enabled]
+  );
+
   return useCallback(
     (address: string) => {
       if (isHexWalletAddress(address))
         return {
-          address: convertHexWalletAddress(address as HexAddr),
-          hex: unpadHexAddress(address as HexAddr),
+          address: convertHexWalletAddress(zHexAddr.parse(address)),
+          hex: formatHexAddress(zHexAddr.parse(address)),
         };
       if (isHexModuleAddress(address))
         return {
-          address: convertHexModuleAddress(address as HexAddr),
-          hex: unpadHexAddress(address as HexAddr),
+          address: convertHexModuleAddress(zHexAddr.parse(address)),
+          hex: formatHexAddress(zHexAddr.parse(address)),
         };
       return {
-        address: address as BechAddr,
-        hex: unpadHexAddress(bech32AddressToHex(address as BechAddr)),
+        address: zBechAddr.parse(address),
+        hex: formatHexAddress(bech32AddressToHex(zBechAddr.parse(address))),
       };
     },
-    [convertHexModuleAddress, convertHexWalletAddress]
+    [convertHexModuleAddress, convertHexWalletAddress, formatHexAddress]
   );
 };
diff --git a/src/lib/pages/account-details/components/nfts/NftsSectionSequencer.tsx b/src/lib/pages/account-details/components/nfts/NftsSectionSequencer.tsx
index 9b6ff5236..b746318da 100644
--- a/src/lib/pages/account-details/components/nfts/NftsSectionSequencer.tsx
+++ b/src/lib/pages/account-details/components/nfts/NftsSectionSequencer.tsx
@@ -6,7 +6,12 @@ import { useMobile } from "lib/app-provider";
 import { Loading } from "lib/components/Loading";
 import { EmptyState, ErrorFetching } from "lib/components/state";
 import { useNftsByAccountByCollectionSequencer } from "lib/services/nft";
-import type { HexAddr, HexAddr32, Option } from "lib/types";
+import {
+  type HexAddr,
+  type HexAddr32,
+  type Option,
+  zHexAddr32,
+} from "lib/types";
 
 import { FilterItem } from "./FilterItem";
 import { NftsByCollectionSequencer } from "./NftsByCollectionSequencer";
@@ -72,7 +77,7 @@ export const NftsSectionSequencer = ({
               collectionName={nfts[0].collectionName}
               onClick={() =>
                 handleOnClick({
-                  collectionAddress: collectionAddress as HexAddr32,
+                  collectionAddress: zHexAddr32.parse(collectionAddress),
                   nftsCount: nfts.length,
                 })
               }
diff --git a/src/lib/pages/account-details/hooks/useAccountRedirect.ts b/src/lib/pages/account-details/hooks/useAccountRedirect.ts
index 993697661..3711d1061 100644
--- a/src/lib/pages/account-details/hooks/useAccountRedirect.ts
+++ b/src/lib/pages/account-details/hooks/useAccountRedirect.ts
@@ -6,7 +6,12 @@ import {
 } from "lib/app-provider";
 import { useEvmCodesByAddress } from "lib/services/evm";
 import { useContractData } from "lib/services/wasm/contract";
-import type { BechAddr, BechAddr32, HexAddr, HexAddr20 } from "lib/types";
+import {
+  type BechAddr,
+  type BechAddr32,
+  type HexAddr,
+  zHexAddr20,
+} from "lib/types";
 import { isHexWalletAddress } from "lib/utils";
 
 export const useAccountRedirect = (bechAddr: BechAddr, hexAddr: HexAddr) => {
@@ -24,7 +29,7 @@ export const useAccountRedirect = (bechAddr: BechAddr, hexAddr: HexAddr) => {
 
   const { data: evmCodes, isFetching: isEvmCodesFetching } =
     useEvmCodesByAddress(
-      hexAddr as HexAddr20,
+      zHexAddr20.parse(hexAddr),
       evm.enabled && isHexWalletAddress(hexAddr)
     );
 
diff --git a/src/lib/pages/contract-details/components/ContractTop.tsx b/src/lib/pages/contract-details/components/ContractTop.tsx
index 0e0856175..fe39e39cd 100644
--- a/src/lib/pages/contract-details/components/ContractTop.tsx
+++ b/src/lib/pages/contract-details/components/ContractTop.tsx
@@ -177,7 +177,7 @@ export const ContractTop = ({
                 fontWeight={500}
                 whiteSpace="nowrap"
               >
-                Contract Address
+                Contract Address:
               </Text>
               <CopyLink
                 value={contractAddress}
@@ -195,7 +195,7 @@ export const ContractTop = ({
                 variant="body2"
                 fontWeight={500}
               >
-                Label
+                Label:
               </Text>
               <Text variant="body2" wordBreak="break-word">
                 {contract.label}
@@ -212,7 +212,7 @@ export const ContractTop = ({
                   variant="body2"
                   fontWeight={500}
                 >
-                  Public Name
+                  Public Name:
                 </Text>
                 <Text variant="body2" className="ellipsis">
                   {publicInfo.name}
diff --git a/src/lib/pages/evm-contract-details/components/EvmContractDetailsTop.tsx b/src/lib/pages/evm-contract-details/components/EvmContractDetailsTop.tsx
index 34267eda2..f43dd37dd 100644
--- a/src/lib/pages/evm-contract-details/components/EvmContractDetailsTop.tsx
+++ b/src/lib/pages/evm-contract-details/components/EvmContractDetailsTop.tsx
@@ -4,18 +4,22 @@ import { useConvertHexAddress, useInternalNavigate } from "lib/app-provider";
 import { CopyLink } from "lib/components/CopyLink";
 import { CustomIcon } from "lib/components/icon";
 import { TotalValue } from "lib/components/TotalValue";
-import type { HexAddr20 } from "lib/types";
+import type { EvmVerifyInfo, HexAddr20, Option } from "lib/types";
 import { TabIndex } from "../types";
 import { getInteractTabsIndex } from "../utils";
 
 interface EvmContractDetailsTopProps {
   contractAddress: HexAddr20;
-  isVerified: boolean;
+  evmVerifyInfo: Option<EvmVerifyInfo>;
+  proxyTargetAddress: Option<HexAddr20>;
+  proxyTargetEvmVerifyInfo: Option<EvmVerifyInfo>;
 }
 
 export const EvmContractDetailsTop = ({
   contractAddress,
-  isVerified,
+  evmVerifyInfo,
+  proxyTargetAddress,
+  proxyTargetEvmVerifyInfo,
 }: EvmContractDetailsTopProps) => {
   const navigate = useInternalNavigate();
   const { convertHexWalletAddress } = useConvertHexAddress();
@@ -26,8 +30,8 @@ export const EvmContractDetailsTop = ({
       justifyContent="space-between"
       gap={4}
     >
-      <Stack gap={4}>
-        <Flex gap={2} align="center">
+      <Stack gap={1}>
+        <Flex gap={2} marginBottom={3} align="center">
           <CustomIcon
             name="contract-address"
             boxSize={5}
@@ -37,7 +41,7 @@ export const EvmContractDetailsTop = ({
             Contract Details
           </Heading>
         </Flex>
-        <Flex columnGap={2} flexDirection={{ md: "row", base: "column" }}>
+        <Flex columnGap={2} flexDirection={{ base: "column", md: "row" }}>
           <Text variant="body2" fontWeight={500} color="text.dark">
             Contract Address:
           </Text>
@@ -47,7 +51,7 @@ export const EvmContractDetailsTop = ({
               amptrackSection="contract_top"
               type="contract_address"
             />
-            {isVerified && (
+            {!!evmVerifyInfo?.isVerified && (
               <CustomIcon
                 name="verification-solid"
                 boxSize={4}
@@ -56,9 +60,44 @@ export const EvmContractDetailsTop = ({
             )}
           </Flex>
         </Flex>
+        {!!evmVerifyInfo?.isVerified && evmVerifyInfo.contractName && (
+          <Flex
+            columnGap={2}
+            flexDirection={{ md: "row", base: "column" }}
+            minHeight={6}
+          >
+            <Text variant="body2" fontWeight={500} color="text.dark">
+              Contract Name:
+            </Text>
+            <Text variant="body2" className="ellipsis">
+              {evmVerifyInfo.contractName}
+            </Text>
+          </Flex>
+        )}
+        {proxyTargetAddress && (
+          <Flex columnGap={2} flexDirection={{ md: "row", base: "column" }}>
+            <Text variant="body2" fontWeight={500} color="text.dark">
+              Implementation Address:
+            </Text>
+            <Flex alignItems="center">
+              <CopyLink
+                value={proxyTargetAddress}
+                amptrackSection="contract_top"
+                type="contract_address"
+              />
+              {!!proxyTargetEvmVerifyInfo?.isVerified && (
+                <CustomIcon
+                  name="verification-solid"
+                  boxSize={4}
+                  color="secondary.main"
+                />
+              )}
+            </Flex>
+          </Flex>
+        )}
       </Stack>
       <Stack gap={4}>
-        {isVerified && (
+        {!!evmVerifyInfo?.isVerified && (
           <Grid gap={2} templateColumns={{ md: "repeat(2, 1fr)", base: "1fr" }}>
             <Button
               variant="outline-primary"
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewProxyTargetInfo.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewProxyTargetInfo.tsx
new file mode 100644
index 000000000..128180ad6
--- /dev/null
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewProxyTargetInfo.tsx
@@ -0,0 +1,43 @@
+import { Heading, HStack, Stack, Text } from "@chakra-ui/react";
+import { useMobile } from "lib/app-provider";
+import { ExplorerLink } from "lib/components/ExplorerLink";
+import { CustomIcon } from "lib/components/icon";
+import { EvmVerifyInfo, HexAddr20, Option } from "lib/types";
+
+interface OverviewProxyTargetInfoProps {
+  proxyTargetAddressHex: HexAddr20;
+  proxyTargetEvmVerifyInfo: Option<EvmVerifyInfo>;
+}
+
+export const OverviewProxyTargetInfo = ({
+  proxyTargetAddressHex,
+  proxyTargetEvmVerifyInfo,
+}: OverviewProxyTargetInfoProps) => {
+  const isMobile = useMobile();
+
+  return (
+    <Stack spacing={1}>
+      <Heading as="h6" variant="h6">
+        Proxy target contract
+      </Heading>
+      <HStack spacing={2} alignItems="center">
+        <Text variant="body2" color="text.dark">
+          Implementation Address:
+        </Text>
+        <ExplorerLink
+          type="evm_contract_address"
+          value={proxyTargetAddressHex}
+          textFormat={isMobile ? "truncate" : "normal"}
+          showCopyOnHover
+        />
+        {proxyTargetEvmVerifyInfo?.isVerified && (
+          <CustomIcon
+            name="verification-solid"
+            boxSize={4}
+            color="secondary.main"
+          />
+        )}
+      </HStack>
+    </Stack>
+  );
+};
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedCmds.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedCmds.tsx
index f22c680fc..2f2f52227 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedCmds.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedCmds.tsx
@@ -1,97 +1,52 @@
-import { Flex, Heading, HStack, Stack, Text, VStack } from "@chakra-ui/react";
-import { useMobile } from "lib/app-provider";
-import { EvmVerifyInfo } from "lib/types";
-import { HexAddr20, Option } from "lib/types";
-import { EvmContractCmdGroup } from "./EvmContractCmdGroup";
+import { Flex, Heading, VStack } from "@chakra-ui/react";
+import { CustomIcon } from "lib/components/icon";
+import { EvmVerifyInfo, HexAddr20 } from "lib/types";
 import { InteractTabsIndex } from "../../types";
-import { ExplorerLink } from "lib/components/ExplorerLink";
 import { categorizeAbi } from "../interact-evm-contract/utils";
-import { CustomIcon } from "lib/components/icon";
+import { EvmContractCmdGroup } from "./EvmContractCmdGroup";
 
 interface OverviewVerifiedCmdsProps {
   contractAddress: HexAddr20;
   evmVerifyInfo: EvmVerifyInfo;
-  proxyTargetEvmVerifyInfo: Option<EvmVerifyInfo>;
 }
 
 export const OverviewVerifiedCmds = ({
   contractAddress,
   evmVerifyInfo,
-  proxyTargetEvmVerifyInfo,
 }: OverviewVerifiedCmdsProps) => {
-  const isMobile = useMobile();
-
   const { read: abiRead, write: abiWrite } = categorizeAbi(evmVerifyInfo.abi);
-  const { read: proxyTargetAbiRead, write: proxyTargetAbiWrite } =
-    categorizeAbi(proxyTargetEvmVerifyInfo?.abi ?? []);
 
   return (
-    <>
-      <VStack spacing={4} alignItems="flex-start">
-        <Flex gap={1} alignItems="center">
-          <Heading as="h6" variant="h6">
-            Verified command shortcuts
-          </Heading>
-          <CustomIcon
-            name="verification-solid"
-            boxSize={4}
-            color="secondary.main"
-          />
-        </Flex>
-        <Flex
-          gap={4}
-          width="full"
-          flexDirection={{
-            base: "column",
-            md: "row",
-          }}
-        >
-          <EvmContractCmdGroup
-            contractAddress={contractAddress}
-            abiSections={abiRead}
-            interactTab={InteractTabsIndex.Read}
-          />
-          <EvmContractCmdGroup
-            contractAddress={contractAddress}
-            abiSections={abiWrite}
-            interactTab={InteractTabsIndex.Write}
-          />
-        </Flex>
-      </VStack>
-      {proxyTargetEvmVerifyInfo && (
-        <VStack spacing={4} alignItems="flex-start">
-          <Stack spacing={1}>
-            <Heading as="h6" variant="h6">
-              Proxy target contract
-            </Heading>
-            <HStack spacing={2} alignItems="center">
-              <Text variant="body2" color="text.dark">
-                Implementation Address:
-              </Text>
-              <ExplorerLink
-                type="evm_contract_address"
-                value={proxyTargetEvmVerifyInfo.address}
-                textFormat={isMobile ? "truncate" : "normal"}
-                showCopyOnHover
-              />
-            </HStack>
-          </Stack>
-          <Flex gap={4} width="full">
-            <EvmContractCmdGroup
-              contractAddress={contractAddress}
-              abiSections={proxyTargetAbiRead}
-              interactTab={InteractTabsIndex.ReadProxy}
-            />
-            {!isMobile && (
-              <EvmContractCmdGroup
-                contractAddress={contractAddress}
-                abiSections={proxyTargetAbiWrite}
-                interactTab={InteractTabsIndex.WriteProxy}
-              />
-            )}
-          </Flex>
-        </VStack>
-      )}
-    </>
+    <VStack spacing={4} alignItems="flex-start">
+      <Flex gap={1} alignItems="center">
+        <Heading as="h6" variant="h6">
+          Verified command shortcuts
+        </Heading>
+        <CustomIcon
+          name="verification-solid"
+          boxSize={4}
+          color="secondary.main"
+        />
+      </Flex>
+      <Flex
+        gap={4}
+        width="full"
+        flexDirection={{
+          base: "column",
+          md: "row",
+        }}
+      >
+        <EvmContractCmdGroup
+          contractAddress={contractAddress}
+          abiSections={abiRead}
+          interactTab={InteractTabsIndex.Read}
+        />
+        <EvmContractCmdGroup
+          contractAddress={contractAddress}
+          abiSections={abiWrite}
+          interactTab={InteractTabsIndex.Write}
+        />
+      </Flex>
+    </VStack>
   );
 };
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedProxyTargetCmds.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedProxyTargetCmds.tsx
new file mode 100644
index 000000000..cab7c74ef
--- /dev/null
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedProxyTargetCmds.tsx
@@ -0,0 +1,63 @@
+import { Flex, Heading, HStack, Stack, Text, VStack } from "@chakra-ui/react";
+import { useMobile } from "lib/app-provider";
+import { ExplorerLink } from "lib/components/ExplorerLink";
+import { CustomIcon } from "lib/components/icon";
+import { EvmVerifyInfo, HexAddr20 } from "lib/types";
+import { InteractTabsIndex } from "../../types";
+import { categorizeAbi } from "../interact-evm-contract/utils";
+import { EvmContractCmdGroup } from "./EvmContractCmdGroup";
+
+interface OverviewVerifiedProxyTargetCmdsProps {
+  contractAddress: HexAddr20;
+  proxyTargetEvmVerifyInfo: EvmVerifyInfo;
+}
+
+export const OverviewVerifiedProxyTargetCmds = ({
+  contractAddress,
+  proxyTargetEvmVerifyInfo,
+}: OverviewVerifiedProxyTargetCmdsProps) => {
+  const isMobile = useMobile();
+
+  const { read: proxyTargetAbiRead, write: proxyTargetAbiWrite } =
+    categorizeAbi(proxyTargetEvmVerifyInfo?.abi ?? []);
+
+  return (
+    <VStack spacing={4} alignItems="flex-start">
+      <Stack spacing={1}>
+        <Heading as="h6" variant="h6">
+          Proxy target contract
+        </Heading>
+        <HStack spacing={2} alignItems="center">
+          <Text variant="body2" color="text.dark">
+            Implementation Address:
+          </Text>
+          <ExplorerLink
+            type="evm_contract_address"
+            value={proxyTargetEvmVerifyInfo.address}
+            textFormat={isMobile ? "truncate" : "normal"}
+            showCopyOnHover
+          />
+          {proxyTargetEvmVerifyInfo?.isVerified && (
+            <CustomIcon
+              name="verification-solid"
+              boxSize={4}
+              color="secondary.main"
+            />
+          )}
+        </HStack>
+      </Stack>
+      <Flex gap={4} width="full">
+        <EvmContractCmdGroup
+          contractAddress={contractAddress}
+          abiSections={proxyTargetAbiRead}
+          interactTab={InteractTabsIndex.ReadProxy}
+        />
+        <EvmContractCmdGroup
+          contractAddress={contractAddress}
+          abiSections={proxyTargetAbiWrite}
+          interactTab={InteractTabsIndex.WriteProxy}
+        />
+      </Flex>
+    </VStack>
+  );
+};
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/index.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/index.tsx
index 621f4d0d5..ecd1b2ada 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/index.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/index.tsx
@@ -16,6 +16,7 @@ import { OverviewInfo } from "./OverviewInfo";
 import { OverviewVerifiedInfo } from "./OverviewVerifiedInfo";
 import { EvmVerifyInfo } from "lib/types";
 import { OverviewVerifiedCmds } from "./OverviewVerifiedCmds";
+import { OverviewVerifiedProxyTargetCmds } from "./OverviewVerifiedProxyTargetCmds";
 
 interface EvmContractDetailsOverviewProps {
   contractAddressBech: BechAddr20;
@@ -66,10 +67,15 @@ export const EvmContractDetailsOverview = ({
         <OverviewVerifiedCmds
           contractAddress={contractAddressHex}
           evmVerifyInfo={evmVerifyInfo}
-          proxyTargetEvmVerifyInfo={proxyTargetEvmVerifyInfo}
         />
       </>
     )}
+    {proxyTargetEvmVerifyInfo?.isVerified && (
+      <OverviewVerifiedProxyTargetCmds
+        contractAddress={contractAddressHex}
+        proxyTargetEvmVerifyInfo={proxyTargetEvmVerifyInfo}
+      />
+    )}
     <AssetsSection
       address={contractAddressBech}
       onViewMore={onViewMoreAssets}
diff --git a/src/lib/pages/evm-contract-details/components/interact-evm-contract/index.tsx b/src/lib/pages/evm-contract-details/components/interact-evm-contract/index.tsx
index 607873671..e8ac90d34 100644
--- a/src/lib/pages/evm-contract-details/components/interact-evm-contract/index.tsx
+++ b/src/lib/pages/evm-contract-details/components/interact-evm-contract/index.tsx
@@ -1,5 +1,4 @@
 import { Box, Flex, Heading, Stack, Switch, Text } from "@chakra-ui/react";
-import { JsonFragment } from "ethers";
 import { useInternalNavigate, useMobile } from "lib/app-provider";
 import { TypeSwitch } from "lib/components/TypeSwitch";
 import { EvmVerifyInfo, HexAddr20, Option } from "lib/types";
@@ -22,18 +21,18 @@ enum InteractType {
 
 interface InteractEvmContractProps {
   contractAddress: HexAddr20;
-  contractAbi: JsonFragment[];
+  evmVerifyInfo: Option<EvmVerifyInfo>;
+  proxyTargetEvmVerifyInfo: Option<EvmVerifyInfo>;
   selectedType: InteractTabsIndex;
   selectedFn?: string;
-  proxyTargetEvmVerifyInfo: Option<EvmVerifyInfo>;
 }
 
 export const InteractEvmContract = ({
   contractAddress,
-  contractAbi,
+  evmVerifyInfo,
+  proxyTargetEvmVerifyInfo,
   selectedType,
   selectedFn,
-  proxyTargetEvmVerifyInfo,
 }: InteractEvmContractProps) => {
   const isMobile = useMobile();
   const navigate = useInternalNavigate();
@@ -43,12 +42,14 @@ export const InteractEvmContract = ({
       ? InteractType.Read
       : InteractType.Write;
   const isAsProxy =
-    !isUndefined(proxyTargetEvmVerifyInfo?.abi) &&
-    selectedType.endsWith("proxy");
+    !evmVerifyInfo?.isVerified ||
+    (!!proxyTargetEvmVerifyInfo?.isVerified && selectedType.endsWith("proxy"));
 
   const [initialSelectedFn, setInitialSelectedFn] = useState<Option<string>>();
 
-  const { read: abiRead, write: abiWrite } = categorizeAbi(contractAbi);
+  const { read: abiRead, write: abiWrite } = categorizeAbi(
+    evmVerifyInfo?.abi ?? []
+  );
   const { read: abiReadProxy, write: abiWriteProxy } = categorizeAbi(
     proxyTargetEvmVerifyInfo?.abi ?? []
   );
@@ -110,10 +111,14 @@ export const InteractEvmContract = ({
           />
         )}
       </Flex>
-      {!isUndefined(proxyTargetEvmVerifyInfo) && (
+      {!!proxyTargetEvmVerifyInfo?.isVerified && (
         <Stack gap={1} mb={8}>
           <Flex gap={2} align="center">
-            <Switch isChecked={isAsProxy} onChange={handleSetIsAsProxy} />
+            <Switch
+              isChecked={isAsProxy}
+              onChange={handleSetIsAsProxy}
+              isDisabled={!evmVerifyInfo?.isVerified}
+            />
             <Text variant="body2">Read/Write as Proxy Contract</Text>
           </Flex>
           <Flex gap={2}>
diff --git a/src/lib/pages/evm-contract-details/index.tsx b/src/lib/pages/evm-contract-details/index.tsx
index 1a96f9884..d71c2b6a5 100644
--- a/src/lib/pages/evm-contract-details/index.tsx
+++ b/src/lib/pages/evm-contract-details/index.tsx
@@ -24,7 +24,7 @@ import {
 } from "lib/services/evm";
 import { useEvmTxHashByCosmosTxHash } from "lib/services/tx";
 import type { HexAddr20 } from "lib/types";
-import { isHexWalletAddress, truncate } from "lib/utils";
+import { isHexWalletAddress, toChecksumAddress, truncate } from "lib/utils";
 
 import { EvmContractDetailsContractInfo } from "./components/evm-contract-details-contract-info";
 import { EvmContractDetailsOverview } from "./components/evm-contract-details-overview";
@@ -65,7 +65,7 @@ const EvmContractDetailsBody = ({
     useEvmCodesByAddress(contractAddress);
   const { data: evmContractInfoData, isLoading: isEvmContractInfoLoading } =
     useEvmContractInfoSequencer(contractAddress);
-  const { data: evmVerifyInfo, isLoading: isEvmVerifyInfoLoading } =
+  const { data: evmVerifyInfo, isFetching: isEvmVerifyInfoFetching } =
     useEvmVerifyInfo(contractAddress);
   const { data: proxyTarget, isLoading: isProxyTargetLoading } =
     useGetEvmProxyTarget(contractAddress);
@@ -74,8 +74,6 @@ const EvmContractDetailsBody = ({
     isFetching: isProxyTargetEvmVerifyInfoFetching,
   } = useEvmVerifyInfo(proxyTarget?.target);
 
-  const isVerified = evmVerifyInfo?.isVerified;
-
   const { data: evmHash } = useEvmTxHashByCosmosTxHash(
     evmContractInfoData?.hash
   );
@@ -112,7 +110,7 @@ const EvmContractDetailsBody = ({
 
   if (
     isEvmCodesByAddressLoading ||
-    isEvmVerifyInfoLoading ||
+    isEvmVerifyInfoFetching ||
     isProxyTargetLoading ||
     isProxyTargetEvmVerifyInfoFetching
   )
@@ -127,7 +125,9 @@ const EvmContractDetailsBody = ({
       <Stack gap={6}>
         <EvmContractDetailsTop
           contractAddress={contractAddress}
-          isVerified={!!isVerified}
+          evmVerifyInfo={evmVerifyInfo}
+          proxyTargetAddress={proxyTarget?.target ?? undefined}
+          proxyTargetEvmVerifyInfo={proxyTargetEvmVerifyInfo}
         />
         <Tabs
           index={Object.values(TabIndex).indexOf(tab)}
@@ -148,7 +148,10 @@ const EvmContractDetailsBody = ({
             </CustomTab>
             <CustomTab
               onClick={handleTabChange(TabIndex.ReadWrite)}
-              hidden={!isVerified}
+              hidden={
+                !evmVerifyInfo?.isVerified &&
+                !proxyTargetEvmVerifyInfo?.isVerified
+              }
             >
               {isMobile ? "Read" : "Read/Write"}
             </CustomTab>
@@ -192,10 +195,10 @@ const EvmContractDetailsBody = ({
             <TabPanel p={0} pt={8}>
               <InteractEvmContract
                 contractAddress={contractAddress}
-                contractAbi={evmVerifyInfo?.abi ?? []}
+                evmVerifyInfo={evmVerifyInfo}
+                proxyTargetEvmVerifyInfo={proxyTargetEvmVerifyInfo}
                 selectedType={selectedType}
                 selectedFn={selectedFn}
-                proxyTargetEvmVerifyInfo={proxyTargetEvmVerifyInfo}
               />
             </TabPanel>
             <TabPanel p={0}>
@@ -233,7 +236,10 @@ export const EvmContractDetails = () => {
       !isHexWalletAddress(validated.data.contractAddress) ? (
         <InvalidContract />
       ) : (
-        <EvmContractDetailsBody {...validated.data} />
+        <EvmContractDetailsBody
+          {...validated.data}
+          contractAddress={toChecksumAddress(validated.data.contractAddress)}
+        />
       )}
     </PageContainer>
   );
diff --git a/src/lib/services/evm/json-rpc/proxy/utils.ts b/src/lib/services/evm/json-rpc/proxy/utils.ts
index 6065069bc..a4ce59483 100644
--- a/src/lib/services/evm/json-rpc/proxy/utils.ts
+++ b/src/lib/services/evm/json-rpc/proxy/utils.ts
@@ -1,4 +1,5 @@
 import { Hex, zHex, zHexAddr20 } from "lib/types";
+import { toChecksumAddress } from "lib/utils";
 
 const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 
@@ -16,7 +17,7 @@ export const readAddress = (value: unknown) => {
     throw new Error("Empty address");
   }
 
-  return zHexAddr20.parse(address);
+  return toChecksumAddress(zHexAddr20.parse(address));
 };
 
 const EIP_1167_BYTECODE_PREFIX = "0x363d3d373d3d3d363d";
diff --git a/src/lib/services/move/module/index.ts b/src/lib/services/move/module/index.ts
index 8074e7ebf..53ed0124c 100644
--- a/src/lib/services/move/module/index.ts
+++ b/src/lib/services/move/module/index.ts
@@ -23,15 +23,16 @@ import type {
   ModuleTableCountsResponse,
   ModuleTxsResponse,
 } from "lib/services/types";
-import type {
-  AbiFormData,
-  Addr,
-  ExposedFunction,
-  HexAddr,
-  IndexedModule,
-  ModulePublishInfo,
-  Option,
-  RpcQueryError,
+import {
+  type AbiFormData,
+  type Addr,
+  type ExposedFunction,
+  type HexAddr,
+  type IndexedModule,
+  type ModulePublishInfo,
+  type Option,
+  type RpcQueryError,
+  zHexAddr,
 } from "lib/types";
 import { truncate } from "lib/utils";
 
@@ -165,7 +166,7 @@ export const useDecodeModule = ({
 
     const currentPolicy = await getModuleByAddressLcd(
       lcdEndpoint,
-      abi.address as HexAddr,
+      zHexAddr.parse(abi.address),
       abi.name
     )
       .then((data) => data.upgradePolicy)
diff --git a/src/lib/services/move/resource/index.ts b/src/lib/services/move/resource/index.ts
index fafda944c..26ad3a753 100644
--- a/src/lib/services/move/resource/index.ts
+++ b/src/lib/services/move/resource/index.ts
@@ -6,12 +6,8 @@ import {
   useCelatoneApp,
   useMoveConfig,
 } from "lib/app-provider";
-import type {
-  Addr,
-  HexAddr,
-  ResourceGroup,
-  ResourceGroupByAccount,
-} from "lib/types";
+import type { Addr, ResourceGroup, ResourceGroupByAccount } from "lib/types";
+import { zHexAddr } from "lib/types";
 import { truncate } from "lib/utils";
 
 import { getAccountResourcesLcd } from "./lcd";
@@ -44,7 +40,7 @@ export const useResourcesByAddressLcd = (
         if (groupResourcesIndex === -1)
           ownerResources.push({
             group: groupName,
-            account: ownerName as HexAddr,
+            account: zHexAddr.parse(ownerName),
             displayName: `${truncate(ownerName)}::${groupName}`,
             items: [resource],
           });
@@ -53,7 +49,7 @@ export const useResourcesByAddressLcd = (
         return {
           ...acc,
           [ownerName]: {
-            owner: ownerName as HexAddr,
+            owner: zHexAddr.parse(ownerName),
             resources: ownerResources,
           },
         };
@@ -73,7 +69,7 @@ export const useResourcesByAddressLcd = (
           ...acc,
           [resourceKey]: {
             displayName: `${truncate(accountName)}::${groupName}`,
-            account: accountName as HexAddr,
+            account: zHexAddr.parse(accountName),
             group: groupName,
             items,
           },
diff --git a/src/lib/services/searchService.ts b/src/lib/services/searchService.ts
index ad56351eb..14d188a96 100644
--- a/src/lib/services/searchService.ts
+++ b/src/lib/services/searchService.ts
@@ -9,16 +9,18 @@ import {
   useValidateAddress,
 } from "lib/app-provider";
 import type { Addr, BechAddr, HexAddr32 } from "lib/types";
-import { zBechAddr32, zHexAddr20, zValidatorAddr } from "lib/types";
+import { zBechAddr32, zHexAddr20, zHexAddr32, zValidatorAddr } from "lib/types";
 import type { IcnsNamesByAddress } from "lib/types/name";
 import {
   isHex,
+  isHex20Bytes,
   isHexModuleAddress,
   isHexWalletAddress,
   isId,
   isMovePrefixHexModuleAddress,
   isPosDecimal,
   splitModulePath,
+  toChecksumAddress,
 } from "lib/utils";
 
 import { useBlockData, useBlockDataLcd } from "./block";
@@ -149,13 +151,13 @@ export const useSearchHandler = (
   /// /////////////////////////////////////////////////////
 
   const { data: nftData, isFetching: nftFetching } = useNftByNftAddressLcd(
-    debouncedKeyword as HexAddr32,
+    zHexAddr32.parse(debouncedKeyword),
     isNft && isHexModuleAddress(debouncedKeyword) && !isLiteTier
   );
 
   const { data: nftCollectionData, isFetching: nftCollectionFetching } =
     useNftCollectionByCollectionAddress(
-      debouncedKeyword as HexAddr32,
+      zHexAddr32.parse(debouncedKeyword),
       isNft && isHexModuleAddress(debouncedKeyword) && !isLiteTier
     );
 
@@ -355,7 +357,10 @@ export const useSearchHandler = (
 
   if (isAddr)
     results.push({
-      value: debouncedKeyword,
+      value:
+        isEvm && isHex20Bytes(debouncedKeyword)
+          ? toChecksumAddress(debouncedKeyword)
+          : debouncedKeyword,
       type:
         // eslint-disable-next-line sonarjs/no-duplicate-string
         contractData || evmCodes?.code ? "Contract Address" : "Account Address",
diff --git a/src/lib/services/types/tx.ts b/src/lib/services/types/tx.ts
index 19f2b4ddf..7021af9e1 100644
--- a/src/lib/services/types/tx.ts
+++ b/src/lib/services/types/tx.ts
@@ -30,6 +30,7 @@ import {
   getTxBadges,
   parseTxHash,
   snakeToCamel,
+  toChecksumAddress,
 } from "lib/utils";
 
 import { zAny } from "./protobuf";
@@ -434,44 +435,56 @@ export const zEvmTxHashesByCosmosTxHashesJsonRpc = z.array(
   zEvmTxHashByCosmosTxHashJsonRpc
 );
 
-export const zTxJsonRpc = z.object({
-  blockHash: z.string(),
-  blockNumber: zHexBig,
-  from: zHexAddr20,
-  gas: zHexBig,
-  gasPrice: zHexBig,
-  maxFeePerGas: zHexBig,
-  maxPriorityFeePerGas: zHexBig,
-  hash: z.string(),
-  input: z.string(),
-  nonce: zHexBig,
-  to: zHexAddr20.nullable(),
-  transactionIndex: zHexBig,
-  value: zHexBig,
-  type: z.string(), // TODO: convert to enum later
-  chainId: zHexBig,
-  v: z.string(),
-  r: z.string(),
-  s: z.string(),
-  yParity: z.string().optional(),
-});
+export const zTxJsonRpc = z
+  .object({
+    blockHash: z.string(),
+    blockNumber: zHexBig,
+    from: zHexAddr20,
+    gas: zHexBig,
+    gasPrice: zHexBig,
+    maxFeePerGas: zHexBig,
+    maxPriorityFeePerGas: zHexBig,
+    hash: z.string(),
+    input: z.string(),
+    nonce: zHexBig,
+    to: zHexAddr20.nullable(),
+    transactionIndex: zHexBig,
+    value: zHexBig,
+    type: z.string(), // TODO: convert to enum later
+    chainId: zHexBig,
+    v: z.string(),
+    r: z.string(),
+    s: z.string(),
+    yParity: z.string().optional(),
+  })
+  .transform(({ from, to, ...val }) => ({
+    from: toChecksumAddress(from),
+    to: to ? toChecksumAddress(to) : null,
+    ...val,
+  }));
 
-export const zTxReceiptJsonRpc = z.object({
-  blockHash: z.string(),
-  blockNumber: zHexBig,
-  contractAddress: zHexAddr20.nullable(),
-  cumulativeGasUsed: zHexBig,
-  effectiveGasPrice: zHexBig,
-  from: zHexAddr20,
-  gasUsed: zHexBig,
-  logs: z.object({}).passthrough().array(),
-  logsBloom: zHex,
-  status: zHexBool,
-  to: zHexAddr20.nullable(),
-  transactionHash: z.string(),
-  transactionIndex: zHexBig,
-  type: z.string(), // TODO: convert to enum later
-});
+export const zTxReceiptJsonRpc = z
+  .object({
+    blockHash: z.string(),
+    blockNumber: zHexBig,
+    contractAddress: zHexAddr20.nullable(),
+    cumulativeGasUsed: zHexBig,
+    effectiveGasPrice: zHexBig,
+    from: zHexAddr20,
+    gasUsed: zHexBig,
+    logs: z.object({}).passthrough().array(),
+    logsBloom: zHex,
+    status: zHexBool,
+    to: zHexAddr20.nullable(),
+    transactionHash: z.string(),
+    transactionIndex: zHexBig,
+    type: z.string(), // TODO: convert to enum later
+  })
+  .transform(({ from, to, ...val }) => ({
+    from: toChecksumAddress(from),
+    to: to ? toChecksumAddress(to) : null,
+    ...val,
+  }));
 export type TxReceiptJsonRpc = z.infer<typeof zTxReceiptJsonRpc>;
 
 export const zTxDataJsonRpc = z
diff --git a/src/lib/utils/address.ts b/src/lib/utils/address.ts
index aea76c894..5d20ccec9 100644
--- a/src/lib/utils/address.ts
+++ b/src/lib/utils/address.ts
@@ -9,7 +9,7 @@ import {
 
 import type { AddressReturnType } from "lib/app-provider";
 import type { BechAddr, HexAddr, Option, Pubkey } from "lib/types";
-import { zBechAddr20 } from "lib/types";
+import { zBechAddr20, zHexAddr } from "lib/types";
 
 import { utf8ToBytes } from "./base64";
 import { uint8ArrayToHexString } from "./hex";
@@ -35,13 +35,13 @@ export const getAddressTypeText = (addressType: AddressReturnType) => {
 };
 
 export const bech32AddressToHex = (addr: BechAddr): HexAddr =>
-  "0x".concat(toHex(fromBech32(addr).data)) as HexAddr;
+  zHexAddr.parse("0x".concat(toHex(fromBech32(addr).data)));
 
 export const padHexAddress = (hexAddr: HexAddr, length: number): HexAddr =>
-  `0x${hexAddr.slice(2).padStart(length, "0")}` as HexAddr;
+  zHexAddr.parse(`0x${hexAddr.slice(2).padStart(length, "0")}`);
 
 export const unpadHexAddress = (hexAddr: HexAddr) =>
-  `0x${hexAddr.slice(2).replace(/^0+/, "")}` as HexAddr;
+  zHexAddr.parse(`0x${hexAddr.slice(2).replace(/^0+/, "")}`);
 
 export const hexToBech32Address = (
   prefix: string,
@@ -83,7 +83,7 @@ export const convertAccountPubkeyToAccountAddress = (
   return zBechAddr20.parse("");
 };
 
-export const toChecksumAddress = (address: HexAddr): string => {
+export const toChecksumAddress = <T extends string>(address: T): T => {
   const lowerCaseAddress = address.toLowerCase().replace(/^0x/i, "");
 
   const hash = `0x${uint8ArrayToHexString(
@@ -96,7 +96,7 @@ export const toChecksumAddress = (address: HexAddr): string => {
     hash ===
     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
   )
-    return "";
+    return "" as T;
 
   let checksumAddress = "0x";
   const addressHash = hash.replace(/^0x/i, "");
@@ -109,5 +109,5 @@ export const toChecksumAddress = (address: HexAddr): string => {
       checksumAddress += lowerCaseAddress[i];
     }
   }
-  return checksumAddress;
+  return checksumAddress as T;
 };
diff --git a/src/lib/utils/evm.ts b/src/lib/utils/evm.ts
index d71a9ab77..1e98db5ed 100644
--- a/src/lib/utils/evm.ts
+++ b/src/lib/utils/evm.ts
@@ -1,6 +1,6 @@
 import type { TxDataJsonRpc } from "lib/services/types";
 import type { Coin, HexAddr20, Option } from "lib/types";
-import { big, EvmMethodId, EvmMethodName } from "lib/types";
+import { big, EvmMethodId, EvmMethodName, zHexAddr20 } from "lib/types";
 
 import { keccak256 } from "@initia/initia.js";
 import { Interface, JsonFragment } from "ethers";
@@ -36,7 +36,7 @@ export const getEvmToAddress = (
 
   if (method === EvmMethodName.TransferErc20) {
     return {
-      address: `0x${input.slice(34, 74)}` as HexAddr20,
+      address: toChecksumAddress(zHexAddr20.parse(`0x${input.slice(34, 74)}`)),
       type: "user_address",
       isCreatedContract: false,
     };
@@ -46,7 +46,7 @@ export const getEvmToAddress = (
     const { contractAddress } = evmTxData.txReceipt;
     if (!contractAddress) return undefined;
     return {
-      address: contractAddress,
+      address: toChecksumAddress(contractAddress),
       type: "evm_contract_address",
       isCreatedContract: true,
     };
@@ -57,7 +57,7 @@ export const getEvmToAddress = (
     const contractAddress = logs[0]?.address;
     if (!contractAddress) return undefined;
     return {
-      address: contractAddress as HexAddr20,
+      address: toChecksumAddress(zHexAddr20.parse(contractAddress)),
       type: "evm_contract_address",
       isCreatedContract: true,
     };
@@ -65,7 +65,7 @@ export const getEvmToAddress = (
 
   if (to) {
     return {
-      address: to,
+      address: toChecksumAddress(to),
       type: "user_address",
       isCreatedContract: false,
     };

From aac0fe000f7bc373f870b1596b9fa1f71a0d450b Mon Sep 17 00:00:00 2001
From: songwongtp <16089160+songwongtp@users.noreply.github.com>
Date: Thu, 20 Feb 2025 16:47:03 +0700
Subject: [PATCH 2/3] fix: import

---
 .eslintrc.json                                       |  8 ++++++++
 src/config/theme/index.ts                            |  2 +-
 src/lib/app-fns/tx/common/postEvm.tsx                |  2 +-
 src/lib/app-fns/tx/common/sendingEvm.tsx             |  2 +-
 src/lib/app-fns/tx/evm/requestEvm.tsx                |  2 +-
 src/lib/app-provider/hooks/useSignAndBroadcastEvm.ts |  4 ++--
 src/lib/app-provider/tx/evm/requestEvm.ts            |  2 +-
 src/lib/components/ContractCmdButton.tsx             |  2 +-
 src/lib/components/EstimatedFeeEvmRender.tsx         |  4 ++--
 src/lib/components/UserDocsLink.tsx                  |  2 +-
 src/lib/components/editor/EditorFileBody.tsx         |  5 +++--
 src/lib/components/editor/EditorSidebar.tsx          |  4 ++--
 src/lib/components/editor/EditorTop.tsx              |  4 ++--
 src/lib/components/editor/FullEditor.tsx             | 10 ++++------
 .../components/editor/FullEditorSidebarMobile.tsx    |  3 ++-
 src/lib/components/editor/helpers.ts                 |  3 ++-
 src/lib/components/editor/types.ts                   |  2 +-
 src/lib/components/evm-abi/EvmAbiForm.tsx            |  4 ++--
 src/lib/components/evm-abi/fields/BaseField.tsx      |  5 +++--
 src/lib/components/evm-abi/fields/BoolField.tsx      |  8 +++++---
 src/lib/components/evm-abi/fields/Field.tsx          |  4 ++--
 src/lib/components/evm-abi/fields/FieldTemplate.tsx  |  7 ++++---
 src/lib/components/evm-abi/fields/TupleField.tsx     |  7 ++++---
 src/lib/components/evm-abi/fields/index.tsx          |  4 ++--
 src/lib/components/evm-abi/fields/types.ts           |  4 ++--
 src/lib/components/evm-abi/fields/utils.ts           |  2 +-
 src/lib/components/evm-abi/utils.ts                  |  4 ++--
 .../components/evm-verify-section/FailedDetails.tsx  |  2 +-
 .../evm-verify-section/InProgressDetails.tsx         |  2 +-
 src/lib/components/evm-verify-section/index.tsx      |  2 +-
 .../modal/evm-verify-status/EvmVerifyProcess.tsx     |  2 +-
 .../modal/evm-verify-status/EvmVerifyRequestInfo.tsx |  5 +++--
 src/lib/components/modal/evm-verify-status/index.tsx |  2 +-
 src/lib/components/modal/evm-verify-status/utils.ts  |  3 +--
 .../ContractAbi.tsx                                  |  2 +-
 .../ContractByteCode.tsx                             |  2 +-
 .../ContractCode.tsx                                 |  7 +++++--
 .../ContractLibraryList.tsx                          |  2 +-
 .../evm-contract-details-contract-info/index.tsx     |  7 ++++---
 .../EvmContractCmdGroup.tsx                          |  4 ++--
 .../evm-contract-details-overview/Optimizer.tsx      |  2 +-
 .../evm-contract-details-overview/OverviewInfo.tsx   |  2 +-
 .../OverviewProxyTargetInfo.tsx                      |  2 +-
 .../OverviewVerifiedCmds.tsx                         |  2 +-
 .../OverviewVerifiedInfo.tsx                         |  2 +-
 .../OverviewVerifiedProxyTargetCmds.tsx              |  2 +-
 .../evm-contract-details-overview/index.tsx          |  2 +-
 .../interact-evm-contract/abi-read/ReadBox.tsx       |  5 +++--
 .../interact-evm-contract/abi-read/index.tsx         |  4 ++--
 .../interact-evm-contract/abi-write/WriteBox.tsx     |  4 ++--
 .../interact-evm-contract/abi-write/index.tsx        |  4 ++--
 .../components/interact-evm-contract/index.tsx       |  8 +++++---
 .../components/interact-evm-contract/utils.ts        |  2 +-
 src/lib/pages/evm-contract-details/index.tsx         |  8 ++------
 .../components/ConstructorArgs.tsx                   |  9 ++-------
 .../components/ContractLibraries.tsx                 |  5 ++---
 .../components/ContractLibrary.tsx                   |  8 ++------
 .../components/EvmContractVerifyForms.tsx            | 10 ++++------
 .../components/EvmContractVerifyOptions.tsx          | 10 ++++------
 .../components/EvmVersionToTarget.tsx                | 12 ++++--------
 .../components/OptimizerConfiguration.tsx            |  9 ++-------
 .../EvmContractVerifyModalBody.tsx                   |  2 +-
 .../EvmContractVerifySuccessModal.tsx                |  2 +-
 .../components/evm-contract-verify-modal/index.tsx   |  2 +-
 .../EvmContractVerifySolidityContractCode.tsx        |  5 +++--
 .../solidity/EvmContractVerifySolidityFoundry.tsx    |  5 +++--
 .../solidity/EvmContractVerifySolidityHardhat.tsx    |  5 +++--
 .../solidity/EvmContractVerifySolidityJsonInput.tsx  |  5 +++--
 .../EvmContractVerifySolidityUploadFiles.tsx         |  5 +++--
 .../vyper/EvmContractVerifyVyperContractCode.tsx     |  5 +++--
 .../vyper/EvmContractVerifyVyperJsonInput.tsx        |  5 +++--
 .../vyper/EvmContractVerifyVyperUploadFile.tsx       |  5 +++--
 src/lib/pages/evm-contract-verify/helpers.ts         | 10 ++++------
 src/lib/pages/evm-contract-verify/index.tsx          |  5 ++---
 src/lib/pages/tx-details/components/TxInfo.tsx       |  2 +-
 src/lib/pages/tx-details/components/TxInfoMobile.tsx |  2 +-
 src/lib/services/chain-config/api.ts                 |  3 ++-
 src/lib/services/chain-config/index.ts               |  2 +-
 src/lib/services/evm/index.ts                        |  8 +++++---
 src/lib/services/evm/json-rpc/eth.ts                 |  3 ++-
 src/lib/services/evm/json-rpc/proxy/index.ts         |  5 +++--
 src/lib/services/evm/json-rpc/proxy/types.ts         |  2 +-
 src/lib/services/evm/json-rpc/proxy/utils.ts         |  3 ++-
 src/lib/services/tx/jsonRpc.ts                       |  2 +-
 src/lib/services/tx/simulateFeeEvm.ts                |  2 +-
 src/lib/services/types/verification/evm.ts           |  2 +-
 src/lib/services/verification/evm/api.ts             | 10 +++-------
 src/lib/services/verification/evm/index.ts           |  2 +-
 src/lib/services/verification/evm/utils.ts           |  3 ++-
 src/lib/types/evm.ts                                 |  2 +-
 src/lib/utils/evm.ts                                 |  3 ++-
 91 files changed, 192 insertions(+), 189 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 505550138..bb2a15dab 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -26,6 +26,14 @@
     "eqeqeq": "error",
     "semi": "error",
 
+    "@typescript-eslint/consistent-type-imports": [
+      "error",
+      {
+        "disallowTypeAnnotations": true,
+        "fixStyle": "separate-type-imports",
+        "prefer": "type-imports"
+      }
+    ],
     "@typescript-eslint/no-empty-object-type": "off",
     "sonarjs/no-duplicate-string": ["error", { "threshold": 3 }],
     "sonarjs/cognitive-complexity": ["error", 27],
diff --git a/src/config/theme/index.ts b/src/config/theme/index.ts
index 49e6d6f71..33e74cf08 100644
--- a/src/config/theme/index.ts
+++ b/src/config/theme/index.ts
@@ -2,7 +2,7 @@ import { CHAIN } from "env";
 import { DEFAULT_THEME } from "./default";
 import { INITIA_THEME } from "./initia";
 import { SEI_THEME } from "./sei";
-import { Option } from "lib/types";
+import type { Option } from "lib/types";
 
 export const getTheme = (chain: Option<string>) => {
   switch (chain) {
diff --git a/src/lib/app-fns/tx/common/postEvm.tsx b/src/lib/app-fns/tx/common/postEvm.tsx
index b3c7cb301..0135af667 100644
--- a/src/lib/app-fns/tx/common/postEvm.tsx
+++ b/src/lib/app-fns/tx/common/postEvm.tsx
@@ -1,6 +1,6 @@
 import { EstimatedFeeEvmRender } from "lib/components/EstimatedFeeEvmRender";
 import { ExplorerLink } from "lib/components/ExplorerLink";
-import { TxReceiptJsonRpc } from "lib/services/types";
+import type { TxReceiptJsonRpc } from "lib/services/types";
 import type { TxResultRendering } from "lib/types";
 import { TxStreamPhase } from "lib/types";
 
diff --git a/src/lib/app-fns/tx/common/sendingEvm.tsx b/src/lib/app-fns/tx/common/sendingEvm.tsx
index 827b92b15..2ad246f5b 100644
--- a/src/lib/app-fns/tx/common/sendingEvm.tsx
+++ b/src/lib/app-fns/tx/common/sendingEvm.tsx
@@ -1,7 +1,7 @@
 import { Spinner } from "@chakra-ui/react";
 import { EstimatedFeeEvmRender } from "lib/components/EstimatedFeeEvmRender";
 
-import { SimulatedFeeEvm } from "lib/services/types";
+import type { SimulatedFeeEvm } from "lib/services/types";
 import type { TxResultRendering } from "lib/types";
 import { TxStreamPhase } from "lib/types";
 
diff --git a/src/lib/app-fns/tx/evm/requestEvm.tsx b/src/lib/app-fns/tx/evm/requestEvm.tsx
index b4ff222ab..be2a83fe5 100644
--- a/src/lib/app-fns/tx/evm/requestEvm.tsx
+++ b/src/lib/app-fns/tx/evm/requestEvm.tsx
@@ -5,7 +5,7 @@ import type { SignAndBroadcastEvm } from "lib/app-provider/hooks";
 import { EstimatedFeeEvmRender } from "lib/components/EstimatedFeeEvmRender";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import { CustomIcon } from "lib/components/icon";
-import { SimulatedFeeEvm, TxReceiptJsonRpc } from "lib/services/types";
+import type { SimulatedFeeEvm, TxReceiptJsonRpc } from "lib/services/types";
 import type { HexAddr, TxResultRendering } from "lib/types";
 import { TxStreamPhase } from "lib/types";
 import { catchTxError, postEvmTx } from "../common";
diff --git a/src/lib/app-provider/hooks/useSignAndBroadcastEvm.ts b/src/lib/app-provider/hooks/useSignAndBroadcastEvm.ts
index 7c9e3c81c..9ca01b36f 100644
--- a/src/lib/app-provider/hooks/useSignAndBroadcastEvm.ts
+++ b/src/lib/app-provider/hooks/useSignAndBroadcastEvm.ts
@@ -1,8 +1,8 @@
 import { useCallback } from "react";
 
-import { TransactionRequest } from "ethers";
+import type { TransactionRequest } from "ethers";
 import { getEthGetTransactionReceipt } from "lib/services/evm/json-rpc";
-import { TxReceiptJsonRpc } from "lib/services/types";
+import type { TxReceiptJsonRpc } from "lib/services/types";
 import { convertCosmosChainIdToEvmChainId, sleep } from "lib/utils";
 import { useCelatoneApp } from "../contexts";
 import { useCurrentChain } from "./useCurrentChain";
diff --git a/src/lib/app-provider/tx/evm/requestEvm.ts b/src/lib/app-provider/tx/evm/requestEvm.ts
index f683e0ff7..9c074eabf 100644
--- a/src/lib/app-provider/tx/evm/requestEvm.ts
+++ b/src/lib/app-provider/tx/evm/requestEvm.ts
@@ -3,7 +3,7 @@ import { useCallback } from "react";
 import { trackTxSucceed } from "lib/amplitude";
 import { requestEvmTx } from "lib/app-fns/tx/evm/requestEvm";
 import { useSignAndBroadcastEvm } from "lib/app-provider/hooks";
-import { SimulatedFeeEvm } from "lib/services/types";
+import type { SimulatedFeeEvm } from "lib/services/types";
 import type { HexAddr20 } from "lib/types";
 
 export interface RequestEvmStreamParams {
diff --git a/src/lib/components/ContractCmdButton.tsx b/src/lib/components/ContractCmdButton.tsx
index 117c5c1ef..b53c6aab5 100644
--- a/src/lib/components/ContractCmdButton.tsx
+++ b/src/lib/components/ContractCmdButton.tsx
@@ -1,5 +1,5 @@
 import { Button } from "@chakra-ui/react";
-import { Option } from "lib/types";
+import type { Option } from "lib/types";
 
 interface ContractCmdButtonProps {
   cmd: Option<string>;
diff --git a/src/lib/components/EstimatedFeeEvmRender.tsx b/src/lib/components/EstimatedFeeEvmRender.tsx
index 86e2c7135..6d1508a2d 100644
--- a/src/lib/components/EstimatedFeeEvmRender.tsx
+++ b/src/lib/components/EstimatedFeeEvmRender.tsx
@@ -1,9 +1,9 @@
 import { Spinner } from "@chakra-ui/react";
-import Big from "big.js";
+import type Big from "big.js";
 
 import { useAssetInfos } from "lib/services/assetService";
 import { useEvmParams } from "lib/services/evm";
-import { Option } from "lib/types";
+import type { Option } from "lib/types";
 import { coinToTokenWithValue, formatTokenWithValue } from "lib/utils";
 
 export const EstimatedFeeEvmRender = ({
diff --git a/src/lib/components/UserDocsLink.tsx b/src/lib/components/UserDocsLink.tsx
index 1a21a2b62..6be31ac11 100644
--- a/src/lib/components/UserDocsLink.tsx
+++ b/src/lib/components/UserDocsLink.tsx
@@ -5,7 +5,7 @@ import { trackWebsite } from "lib/amplitude";
 import { DEVELOPER_TOOL_DOCS_LINK, USER_GUIDE_DOCS_LINK } from "lib/data";
 
 import { CustomIcon } from "./icon";
-import { Option } from "lib/types";
+import type { Option } from "lib/types";
 
 const handleLink = (
   href: Option<string> = "",
diff --git a/src/lib/components/editor/EditorFileBody.tsx b/src/lib/components/editor/EditorFileBody.tsx
index 70d57c116..89802c14e 100644
--- a/src/lib/components/editor/EditorFileBody.tsx
+++ b/src/lib/components/editor/EditorFileBody.tsx
@@ -1,5 +1,6 @@
-import { Flex, FlexProps, Text } from "@chakra-ui/react";
-import { SourceTreeNode } from "./types";
+import type { FlexProps } from "@chakra-ui/react";
+import { Flex, Text } from "@chakra-ui/react";
+import type { SourceTreeNode } from "./types";
 import { CustomIcon } from "../icon";
 import { Tooltip } from "../Tooltip";
 
diff --git a/src/lib/components/editor/EditorSidebar.tsx b/src/lib/components/editor/EditorSidebar.tsx
index beab290e1..3d1437860 100644
--- a/src/lib/components/editor/EditorSidebar.tsx
+++ b/src/lib/components/editor/EditorSidebar.tsx
@@ -1,8 +1,8 @@
 import { useState } from "react";
-import { SourceTreeNode } from "./types";
+import type { SourceTreeNode } from "./types";
 import { Box, Flex } from "@chakra-ui/react";
 import { EditorFileBody } from "./EditorFileBody";
-import { Nullable } from "lib/types";
+import type { Nullable } from "lib/types";
 
 export interface EditorSidebarProps {
   sourceTreeNode: SourceTreeNode[];
diff --git a/src/lib/components/editor/EditorTop.tsx b/src/lib/components/editor/EditorTop.tsx
index f0f331fc8..d11da9c8a 100644
--- a/src/lib/components/editor/EditorTop.tsx
+++ b/src/lib/components/editor/EditorTop.tsx
@@ -1,8 +1,8 @@
 import { Box, Flex, Text } from "@chakra-ui/react";
-import { SourceTreeNode } from "./types";
+import type { SourceTreeNode } from "./types";
 import { EditorFileBody } from "./EditorFileBody";
 import { CustomIcon } from "../icon";
-import { Nullable } from "lib/types";
+import type { Nullable } from "lib/types";
 import { Fragment } from "react";
 
 interface EditorTopProps {
diff --git a/src/lib/components/editor/FullEditor.tsx b/src/lib/components/editor/FullEditor.tsx
index c50f1cd3d..0e36970de 100644
--- a/src/lib/components/editor/FullEditor.tsx
+++ b/src/lib/components/editor/FullEditor.tsx
@@ -1,16 +1,14 @@
 import { Box, Grid, Stack, Text } from "@chakra-ui/react";
 import { generateSourceTree } from "./helpers";
-import { FilePath, SourceTreeNode } from "./types";
+import type { FilePath, SourceTreeNode } from "./types";
 import { EditorSidebar } from "./EditorSidebar";
 import { useEffect, useState } from "react";
 import { EditorTop } from "./EditorTop";
-import { Nullable } from "lib/types";
+import type { Nullable } from "lib/types";
 import { Editor } from "./Editor";
 import { useMobile } from "lib/app-provider";
-import {
-  FullEditorSidebarMobile,
-  FullEditorSidebarMobileProps,
-} from "./FullEditorSidebarMobile";
+import type { FullEditorSidebarMobileProps } from "./FullEditorSidebarMobile";
+import { FullEditorSidebarMobile } from "./FullEditorSidebarMobile";
 
 interface FullEditorProps
   extends Pick<FullEditorSidebarMobileProps, "isOpen" | "onClose"> {
diff --git a/src/lib/components/editor/FullEditorSidebarMobile.tsx b/src/lib/components/editor/FullEditorSidebarMobile.tsx
index a85cf2b7c..9fe14c609 100644
--- a/src/lib/components/editor/FullEditorSidebarMobile.tsx
+++ b/src/lib/components/editor/FullEditorSidebarMobile.tsx
@@ -8,7 +8,8 @@ import {
   DrawerOverlay,
   Heading,
 } from "@chakra-ui/react";
-import { EditorSidebar, EditorSidebarProps } from "./EditorSidebar";
+import type { EditorSidebarProps } from "./EditorSidebar";
+import { EditorSidebar } from "./EditorSidebar";
 
 export interface FullEditorSidebarMobileProps extends EditorSidebarProps {
   isOpen: boolean;
diff --git a/src/lib/components/editor/helpers.ts b/src/lib/components/editor/helpers.ts
index 9e58ef331..3dfbba4f2 100644
--- a/src/lib/components/editor/helpers.ts
+++ b/src/lib/components/editor/helpers.ts
@@ -1,5 +1,6 @@
 import { last, split } from "lodash";
-import { EXTENSION_LIB, FilePath, SourceTreeNode } from "./types";
+import type { FilePath, SourceTreeNode } from "./types";
+import { EXTENSION_LIB } from "./types";
 
 export const generateSourceTree = (
   filesPath: FilePath[],
diff --git a/src/lib/components/editor/types.ts b/src/lib/components/editor/types.ts
index d9488f130..eca138427 100644
--- a/src/lib/components/editor/types.ts
+++ b/src/lib/components/editor/types.ts
@@ -1,4 +1,4 @@
-import { Option } from "lib/types";
+import type { Option } from "lib/types";
 
 export const EXTENSION_LIB = ["sol", "vy"];
 
diff --git a/src/lib/components/evm-abi/EvmAbiForm.tsx b/src/lib/components/evm-abi/EvmAbiForm.tsx
index eeffe067f..1a1275a70 100644
--- a/src/lib/components/evm-abi/EvmAbiForm.tsx
+++ b/src/lib/components/evm-abi/EvmAbiForm.tsx
@@ -1,5 +1,5 @@
-import { JsonFragmentType } from "ethers";
-import { JsonDataType } from "lib/types";
+import type { JsonFragmentType } from "ethers";
+import type { JsonDataType } from "lib/types";
 import { useEffect, useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { FormFields } from "./fields";
diff --git a/src/lib/components/evm-abi/fields/BaseField.tsx b/src/lib/components/evm-abi/fields/BaseField.tsx
index 9590c8059..0b4ae3a33 100644
--- a/src/lib/components/evm-abi/fields/BaseField.tsx
+++ b/src/lib/components/evm-abi/fields/BaseField.tsx
@@ -1,5 +1,6 @@
-import { FieldProps } from "./types";
-import { FieldValues, useController } from "react-hook-form";
+import type { FieldProps } from "./types";
+import type { FieldValues } from "react-hook-form";
+import { useController } from "react-hook-form";
 import { FormControl, FormErrorMessage, Input } from "@chakra-ui/react";
 import { getRules } from "./utils";
 
diff --git a/src/lib/components/evm-abi/fields/BoolField.tsx b/src/lib/components/evm-abi/fields/BoolField.tsx
index 22fcb90b8..af778cc6d 100644
--- a/src/lib/components/evm-abi/fields/BoolField.tsx
+++ b/src/lib/components/evm-abi/fields/BoolField.tsx
@@ -1,6 +1,8 @@
-import { SelectInput, SelectInputOption } from "lib/components/forms";
-import { FieldValues, useController } from "react-hook-form";
-import { FieldProps } from "./types";
+import type { SelectInputOption } from "lib/components/forms";
+import { SelectInput } from "lib/components/forms";
+import type { FieldValues } from "react-hook-form";
+import { useController } from "react-hook-form";
+import type { FieldProps } from "./types";
 
 const BOOL_FIELD_OPTIONS: SelectInputOption<string>[] = [
   {
diff --git a/src/lib/components/evm-abi/fields/Field.tsx b/src/lib/components/evm-abi/fields/Field.tsx
index 081b4bc78..dc2e975ac 100644
--- a/src/lib/components/evm-abi/fields/Field.tsx
+++ b/src/lib/components/evm-abi/fields/Field.tsx
@@ -1,8 +1,8 @@
-import { FieldValues } from "react-hook-form";
+import type { FieldValues } from "react-hook-form";
 import { BaseField } from "./BaseField";
 import { BoolField } from "./BoolField";
 import { TupleField } from "./TupleField";
-import { FieldProps } from "./types";
+import type { FieldProps } from "./types";
 
 export const Field = <T extends FieldValues>({
   type,
diff --git a/src/lib/components/evm-abi/fields/FieldTemplate.tsx b/src/lib/components/evm-abi/fields/FieldTemplate.tsx
index 62ae77eb6..dd4ca75dd 100644
--- a/src/lib/components/evm-abi/fields/FieldTemplate.tsx
+++ b/src/lib/components/evm-abi/fields/FieldTemplate.tsx
@@ -1,10 +1,11 @@
 import { Button, Flex, Text } from "@chakra-ui/react";
 import { CustomIcon } from "lib/components/icon";
-import { Option } from "lib/types";
-import { FieldPath, FieldValues, useController } from "react-hook-form";
+import type { Option } from "lib/types";
+import type { FieldPath, FieldValues } from "react-hook-form";
+import { useController } from "react-hook-form";
 import { getDefaultValueFromDimensions } from "../utils";
 import { Field } from "./Field";
-import { FieldProps } from "./types";
+import type { FieldProps } from "./types";
 
 interface FieldTemplateProps<T extends FieldValues> extends FieldProps<T> {
   dimensions?: Option<number>[];
diff --git a/src/lib/components/evm-abi/fields/TupleField.tsx b/src/lib/components/evm-abi/fields/TupleField.tsx
index a60ffae5d..7c17c0504 100644
--- a/src/lib/components/evm-abi/fields/TupleField.tsx
+++ b/src/lib/components/evm-abi/fields/TupleField.tsx
@@ -1,10 +1,11 @@
 import { Flex } from "@chakra-ui/react";
-import { JsonFragmentType } from "ethers";
-import { FieldPath, FieldValues, useWatch } from "react-hook-form";
+import type { JsonFragmentType } from "ethers";
+import type { FieldPath, FieldValues } from "react-hook-form";
+import { useWatch } from "react-hook-form";
 import { getTypeDimensions } from "../utils";
 import { FieldTemplate } from "./FieldTemplate";
 import { TypeLabel } from "./TypeLabel";
-import { FieldProps } from "./types";
+import type { FieldProps } from "./types";
 
 interface TupleFieldProps<T extends FieldValues> extends FieldProps<T> {
   components: ReadonlyArray<JsonFragmentType>;
diff --git a/src/lib/components/evm-abi/fields/index.tsx b/src/lib/components/evm-abi/fields/index.tsx
index 51a8f0301..4c7aa95a5 100644
--- a/src/lib/components/evm-abi/fields/index.tsx
+++ b/src/lib/components/evm-abi/fields/index.tsx
@@ -1,6 +1,6 @@
-import { Control, FieldValues, Path } from "react-hook-form";
+import type { Control, FieldValues, Path } from "react-hook-form";
 import { TupleField } from "./TupleField";
-import { JsonFragmentType } from "ethers";
+import type { JsonFragmentType } from "ethers";
 import { BaseField } from "./BaseField";
 import { TypeLabel } from "./TypeLabel";
 import { useEvmParams } from "lib/services/evm";
diff --git a/src/lib/components/evm-abi/fields/types.ts b/src/lib/components/evm-abi/fields/types.ts
index f6c550307..989e70a53 100644
--- a/src/lib/components/evm-abi/fields/types.ts
+++ b/src/lib/components/evm-abi/fields/types.ts
@@ -1,5 +1,5 @@
-import { JsonFragmentType } from "ethers";
-import { Control, FieldPath, FieldValues } from "react-hook-form";
+import type { JsonFragmentType } from "ethers";
+import type { Control, FieldPath, FieldValues } from "react-hook-form";
 
 export interface FieldProps<T extends FieldValues>
   extends Omit<JsonFragmentType, "name"> {
diff --git a/src/lib/components/evm-abi/fields/utils.ts b/src/lib/components/evm-abi/fields/utils.ts
index ec0a75d62..9e31ba61c 100644
--- a/src/lib/components/evm-abi/fields/utils.ts
+++ b/src/lib/components/evm-abi/fields/utils.ts
@@ -1,6 +1,6 @@
 import { big } from "lib/types";
 import { is0x, isHex, isHex20Bytes, isHexFixedBytes } from "lib/utils";
-import { FieldValues, UseControllerProps } from "react-hook-form";
+import type { FieldValues, UseControllerProps } from "react-hook-form";
 
 const validateAddress = (v: string) =>
   isHex20Bytes(v) ? undefined : "Invalid address";
diff --git a/src/lib/components/evm-abi/utils.ts b/src/lib/components/evm-abi/utils.ts
index 8342cfe41..98fb89bf0 100644
--- a/src/lib/components/evm-abi/utils.ts
+++ b/src/lib/components/evm-abi/utils.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-use-before-define */
-import { JsonFragmentType } from "ethers";
-import { JsonDataType, Option } from "lib/types";
+import type { JsonFragmentType } from "ethers";
+import type { JsonDataType, Option } from "lib/types";
 import { isPositiveInt } from "lib/utils";
 
 export const getTypeDimensions = (type = "") => {
diff --git a/src/lib/components/evm-verify-section/FailedDetails.tsx b/src/lib/components/evm-verify-section/FailedDetails.tsx
index 55968444e..560763f06 100644
--- a/src/lib/components/evm-verify-section/FailedDetails.tsx
+++ b/src/lib/components/evm-verify-section/FailedDetails.tsx
@@ -1,7 +1,7 @@
 import { Button, HStack, Text } from "@chakra-ui/react";
 
 import { useInternalNavigate, useMobile } from "lib/app-provider";
-import { EvmVerifyInfo } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
 import type { HexAddr20 } from "lib/types";
 import { formatUTC } from "lib/utils";
 import { EvmVerifyStatusModalWithTrigger } from "../modal/evm-verify-status";
diff --git a/src/lib/components/evm-verify-section/InProgressDetails.tsx b/src/lib/components/evm-verify-section/InProgressDetails.tsx
index f4b339c87..d97638b85 100644
--- a/src/lib/components/evm-verify-section/InProgressDetails.tsx
+++ b/src/lib/components/evm-verify-section/InProgressDetails.tsx
@@ -1,7 +1,7 @@
 import { Button, Text } from "@chakra-ui/react";
 
 import type { HexAddr20 } from "lib/types";
-import { EvmVerifyInfo } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
 import { EvmVerifyStatusModalWithTrigger } from "../modal/evm-verify-status";
 
 interface InProgressDetailsProps {
diff --git a/src/lib/components/evm-verify-section/index.tsx b/src/lib/components/evm-verify-section/index.tsx
index 39d777549..231596551 100644
--- a/src/lib/components/evm-verify-section/index.tsx
+++ b/src/lib/components/evm-verify-section/index.tsx
@@ -3,7 +3,7 @@ import { Flex } from "@chakra-ui/react";
 import type { HexAddr20, Option } from "lib/types";
 
 import { NotVerifiedDetails } from "./NotVerifiedDetails";
-import { EvmVerifyInfo } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
 import { useMobile } from "lib/app-provider";
 import { VerifiedDetails } from "./VerifiedDetails";
 import { FailedDetails } from "./FailedDetails";
diff --git a/src/lib/components/modal/evm-verify-status/EvmVerifyProcess.tsx b/src/lib/components/modal/evm-verify-status/EvmVerifyProcess.tsx
index 6629ed85f..80e6f3eff 100644
--- a/src/lib/components/modal/evm-verify-status/EvmVerifyProcess.tsx
+++ b/src/lib/components/modal/evm-verify-status/EvmVerifyProcess.tsx
@@ -1,6 +1,6 @@
 import { Box, Flex, Text } from "@chakra-ui/react";
 import { useMobile } from "lib/app-provider";
-import { EvmVerifyInfo } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
 import { getProcessSteps } from "./utils";
 import { formatUTC } from "lib/utils";
 import { EvmVerifyProcessStepIcon } from "./EvmVerifyProcessStepIcon";
diff --git a/src/lib/components/modal/evm-verify-status/EvmVerifyRequestInfo.tsx b/src/lib/components/modal/evm-verify-status/EvmVerifyRequestInfo.tsx
index 32d72236f..766beecab 100644
--- a/src/lib/components/modal/evm-verify-status/EvmVerifyRequestInfo.tsx
+++ b/src/lib/components/modal/evm-verify-status/EvmVerifyRequestInfo.tsx
@@ -1,7 +1,8 @@
 import type { HexAddr20, Option } from "lib/types";
-import { EvmVerifyInfo } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
 import { Flex, HStack } from "@chakra-ui/react";
-import { Divider, Text, TextProps } from "@chakra-ui/react";
+import type { TextProps } from "@chakra-ui/react";
+import { Divider, Text } from "@chakra-ui/react";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import { formatUTC, getLicenseTypeLabel } from "lib/utils";
 import { useMobile } from "lib/app-provider";
diff --git a/src/lib/components/modal/evm-verify-status/index.tsx b/src/lib/components/modal/evm-verify-status/index.tsx
index 83ed0312b..160a9cc03 100644
--- a/src/lib/components/modal/evm-verify-status/index.tsx
+++ b/src/lib/components/modal/evm-verify-status/index.tsx
@@ -15,7 +15,7 @@ import type { ReactNode } from "react";
 
 import { CustomIcon } from "../../icon";
 import type { HexAddr20, Option } from "lib/types";
-import { EvmVerifyInfo } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
 import { EvmVerifyRequestInfo } from "./EvmVerifyRequestInfo";
 import { EvmVerifyAlert } from "./EvmVerifyAlert";
 import { EvmVerifyProcess } from "./EvmVerifyProcess";
diff --git a/src/lib/components/modal/evm-verify-status/utils.ts b/src/lib/components/modal/evm-verify-status/utils.ts
index b742acd60..eaa5c59d4 100644
--- a/src/lib/components/modal/evm-verify-status/utils.ts
+++ b/src/lib/components/modal/evm-verify-status/utils.ts
@@ -1,5 +1,4 @@
-import { EvmVerifyInfo } from "lib/types";
-import type { Option } from "lib/types";
+import type { EvmVerifyInfo, Option } from "lib/types";
 
 enum ProcessStepState {
   PENDING = "Pending",
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractAbi.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractAbi.tsx
index 89acb55ee..b65fe6632 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractAbi.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractAbi.tsx
@@ -1,5 +1,5 @@
 import { Heading, Stack } from "@chakra-ui/react";
-import { JsonFragment } from "ethers";
+import type { JsonFragment } from "ethers";
 import JsonReadOnly from "lib/components/json/JsonReadOnly";
 
 interface ContractAbiProps {
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractByteCode.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractByteCode.tsx
index cfef46bd8..23fdf2c69 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractByteCode.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractByteCode.tsx
@@ -1,6 +1,6 @@
 import { Heading, Stack, Text } from "@chakra-ui/react";
 import { TextReadOnly } from "lib/components/json/TextReadOnly";
-import { Option } from "lib/types";
+import type { Option } from "lib/types";
 
 export interface ContractByteCodeProps {
   byteCode: Option<string>;
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractCode.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractCode.tsx
index bd7492d02..77f009aae 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractCode.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractCode.tsx
@@ -8,10 +8,13 @@ import {
   Text,
   useDisclosure,
 } from "@chakra-ui/react";
-import { JsonFragment } from "ethers";
+import type { JsonFragment } from "ethers";
 import { FullEditor } from "lib/components/editor/FullEditor";
 import { TextReadOnly } from "lib/components/json/TextReadOnly";
-import { EvmVerifyInfoLibraries, EvmVerifyInfoSourceFile } from "lib/types";
+import type {
+  EvmVerifyInfoLibraries,
+  EvmVerifyInfoSourceFile,
+} from "lib/types";
 import { findAndDecodeEvmConstructorArgs } from "lib/utils";
 import { ContractLibraryList } from "./ContractLibraryList";
 
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractLibraryList.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractLibraryList.tsx
index b986cab76..83763876f 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractLibraryList.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/ContractLibraryList.tsx
@@ -1,4 +1,4 @@
-import { EvmVerifyInfoLibraries } from "lib/types";
+import type { EvmVerifyInfoLibraries } from "lib/types";
 import { Box, Divider, Grid, GridItem, Text } from "@chakra-ui/react";
 import { Fragment } from "react";
 import { ExplorerLink } from "lib/components/ExplorerLink";
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/index.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/index.tsx
index edb237c1f..f94fb9224 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/index.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-contract-info/index.tsx
@@ -1,12 +1,13 @@
 import { Flex, Stack } from "@chakra-ui/react";
 import { EvmVerifySection } from "lib/components/evm-verify-section";
 import { TypeSwitch } from "lib/components/TypeSwitch";
-import { EvmVerifyInfo } from "lib/types";
-import { HexAddr20, Option } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
+import type { HexAddr20, Option } from "lib/types";
 import { useState } from "react";
 import { EvmContractDetailsContractInfoTabs } from "../../types";
 import { ContractAbi } from "./ContractAbi";
-import { ContractByteCode, ContractByteCodeProps } from "./ContractByteCode";
+import type { ContractByteCodeProps } from "./ContractByteCode";
+import { ContractByteCode } from "./ContractByteCode";
 import { ContractCompiler } from "./ContractCompiler";
 import { ContractCode } from "./ContractCode";
 
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/EvmContractCmdGroup.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/EvmContractCmdGroup.tsx
index 9984170a6..c12269096 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/EvmContractCmdGroup.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/EvmContractCmdGroup.tsx
@@ -1,8 +1,8 @@
 import { ButtonGroup, Flex, Text } from "@chakra-ui/react";
-import { JsonFragment } from "ethers";
+import type { JsonFragment } from "ethers";
 import { useInternalNavigate } from "lib/app-provider";
 import { ContractCmdButton } from "lib/components/ContractCmdButton";
-import { HexAddr20 } from "lib/types";
+import type { HexAddr20 } from "lib/types";
 import { InteractTabsIndex, TabIndex } from "../../types";
 import { getInteractTabsIndex } from "../../utils";
 
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/Optimizer.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/Optimizer.tsx
index 3facff421..6b50dbb2f 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/Optimizer.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/Optimizer.tsx
@@ -1,5 +1,5 @@
 import { LabelText } from "lib/components/LabelText";
-import { EvmVerifyInfo } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
 
 interface OptimizerProps {
   evmVerifyInfo: EvmVerifyInfo;
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewInfo.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewInfo.tsx
index 074375045..702593451 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewInfo.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewInfo.tsx
@@ -3,7 +3,7 @@ import { useCelatoneApp, useMobile } from "lib/app-provider";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import { LabelText } from "lib/components/LabelText";
 import { useFormatAddresses } from "lib/hooks/useFormatAddresses";
-import { BechAddr, Nullish, Option } from "lib/types";
+import type { BechAddr, Nullish, Option } from "lib/types";
 import { dateFromNow, formatEvmTxHash, formatUTC } from "lib/utils";
 
 interface OverviewInfoProps {
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewProxyTargetInfo.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewProxyTargetInfo.tsx
index 128180ad6..65623ab99 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewProxyTargetInfo.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewProxyTargetInfo.tsx
@@ -2,7 +2,7 @@ import { Heading, HStack, Stack, Text } from "@chakra-ui/react";
 import { useMobile } from "lib/app-provider";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import { CustomIcon } from "lib/components/icon";
-import { EvmVerifyInfo, HexAddr20, Option } from "lib/types";
+import type { EvmVerifyInfo, HexAddr20, Option } from "lib/types";
 
 interface OverviewProxyTargetInfoProps {
   proxyTargetAddressHex: HexAddr20;
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedCmds.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedCmds.tsx
index 2f2f52227..dcef6e37e 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedCmds.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedCmds.tsx
@@ -1,6 +1,6 @@
 import { Flex, Heading, VStack } from "@chakra-ui/react";
 import { CustomIcon } from "lib/components/icon";
-import { EvmVerifyInfo, HexAddr20 } from "lib/types";
+import type { EvmVerifyInfo, HexAddr20 } from "lib/types";
 import { InteractTabsIndex } from "../../types";
 import { categorizeAbi } from "../interact-evm-contract/utils";
 import { EvmContractCmdGroup } from "./EvmContractCmdGroup";
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedInfo.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedInfo.tsx
index 8837af48d..febe3dbf8 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedInfo.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedInfo.tsx
@@ -1,6 +1,6 @@
 import { Grid, Heading, VStack } from "@chakra-ui/react";
 import { LabelText } from "lib/components/LabelText";
-import { EvmVerifyInfo } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
 import { getLicenseTypeLabel } from "lib/utils";
 import { capitalize } from "lodash";
 import { Optimizer } from "./Optimizer";
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedProxyTargetCmds.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedProxyTargetCmds.tsx
index cab7c74ef..d4f9104ca 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedProxyTargetCmds.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/OverviewVerifiedProxyTargetCmds.tsx
@@ -2,7 +2,7 @@ import { Flex, Heading, HStack, Stack, Text, VStack } from "@chakra-ui/react";
 import { useMobile } from "lib/app-provider";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import { CustomIcon } from "lib/components/icon";
-import { EvmVerifyInfo, HexAddr20 } from "lib/types";
+import type { EvmVerifyInfo, HexAddr20 } from "lib/types";
 import { InteractTabsIndex } from "../../types";
 import { categorizeAbi } from "../interact-evm-contract/utils";
 import { EvmContractCmdGroup } from "./EvmContractCmdGroup";
diff --git a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/index.tsx b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/index.tsx
index ecd1b2ada..b7c2205c5 100644
--- a/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/index.tsx
+++ b/src/lib/pages/evm-contract-details/components/evm-contract-details-overview/index.tsx
@@ -14,7 +14,7 @@ import type { TxsTabIndex } from "../../types";
 import { EvmContractDetailsTxs } from "../EvmContractDetailsTxs";
 import { OverviewInfo } from "./OverviewInfo";
 import { OverviewVerifiedInfo } from "./OverviewVerifiedInfo";
-import { EvmVerifyInfo } from "lib/types";
+import type { EvmVerifyInfo } from "lib/types";
 import { OverviewVerifiedCmds } from "./OverviewVerifiedCmds";
 import { OverviewVerifiedProxyTargetCmds } from "./OverviewVerifiedProxyTargetCmds";
 
diff --git a/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-read/ReadBox.tsx b/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-read/ReadBox.tsx
index 4dc7e84a4..78a9f38b9 100644
--- a/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-read/ReadBox.tsx
+++ b/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-read/ReadBox.tsx
@@ -14,13 +14,14 @@ import {
 import dynamic from "next/dynamic";
 import { memo, useCallback, useEffect, useMemo, useState } from "react";
 
-import { JsonFragment } from "ethers";
+import type { JsonFragment } from "ethers";
 import { AmpEvent, track } from "lib/amplitude";
 import { CopyButton } from "lib/components/copy";
 import { EvmAbiForm } from "lib/components/evm-abi";
 import { CustomIcon } from "lib/components/icon";
 import { useEthCall } from "lib/services/evm";
-import { type HexAddr20, type JsonDataType, Option } from "lib/types";
+import type { Option } from "lib/types";
+import { type HexAddr20, type JsonDataType } from "lib/types";
 import {
   dateFromNow,
   decodeEvmFunctionResult,
diff --git a/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-read/index.tsx b/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-read/index.tsx
index fa52ffa95..5031d46c9 100644
--- a/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-read/index.tsx
+++ b/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-read/index.tsx
@@ -3,8 +3,8 @@ import { useEffect, useMemo, useRef, useState } from "react";
 
 import { EmptyState } from "lib/components/state";
 
-import { JsonFragment } from "ethers";
-import { HexAddr20 } from "lib/types";
+import type { JsonFragment } from "ethers";
+import type { HexAddr20 } from "lib/types";
 import { ReadBox } from "./ReadBox";
 import { isUndefined } from "lodash";
 import { CustomIcon } from "lib/components/icon";
diff --git a/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-write/WriteBox.tsx b/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-write/WriteBox.tsx
index 42b8d7c2e..ffa0a7b2c 100644
--- a/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-write/WriteBox.tsx
+++ b/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-write/WriteBox.tsx
@@ -12,7 +12,7 @@ import {
 import dynamic from "next/dynamic";
 import { useCallback, useEffect, useMemo, useState } from "react";
 
-import { JsonFragment } from "ethers";
+import type { JsonFragment } from "ethers";
 import { AmpEvent, track } from "lib/amplitude";
 import { useRequestEvmTx } from "lib/app-provider";
 import { EstimatedFeeEvmRender } from "lib/components/EstimatedFeeEvmRender";
@@ -20,7 +20,7 @@ import { EvmAbiForm } from "lib/components/evm-abi";
 import { CustomIcon } from "lib/components/icon";
 import { useTxBroadcast } from "lib/hooks";
 import { useSimulateFeeEvmQuery } from "lib/services/tx";
-import { SimulatedFeeEvm } from "lib/services/types";
+import type { SimulatedFeeEvm } from "lib/services/types";
 import type { HexAddr20, JsonDataType } from "lib/types";
 import { encodeEvmFunctionData } from "lib/utils";
 import { isUndefined } from "lodash";
diff --git a/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-write/index.tsx b/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-write/index.tsx
index a62f2fe4f..edcc66d5e 100644
--- a/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-write/index.tsx
+++ b/src/lib/pages/evm-contract-details/components/interact-evm-contract/abi-write/index.tsx
@@ -3,8 +3,8 @@ import { useEffect, useMemo, useRef, useState } from "react";
 
 import { EmptyState } from "lib/components/state";
 
-import { JsonFragment } from "ethers";
-import { HexAddr20 } from "lib/types";
+import type { JsonFragment } from "ethers";
+import type { HexAddr20 } from "lib/types";
 import { isUndefined } from "lodash";
 import { WriteBox } from "./WriteBox";
 import InputWithIcon from "lib/components/InputWithIcon";
diff --git a/src/lib/pages/evm-contract-details/components/interact-evm-contract/index.tsx b/src/lib/pages/evm-contract-details/components/interact-evm-contract/index.tsx
index e8ac90d34..1e8236358 100644
--- a/src/lib/pages/evm-contract-details/components/interact-evm-contract/index.tsx
+++ b/src/lib/pages/evm-contract-details/components/interact-evm-contract/index.tsx
@@ -1,10 +1,12 @@
 import { Box, Flex, Heading, Stack, Switch, Text } from "@chakra-ui/react";
 import { useInternalNavigate, useMobile } from "lib/app-provider";
 import { TypeSwitch } from "lib/components/TypeSwitch";
-import { EvmVerifyInfo, HexAddr20, Option } from "lib/types";
+import type { EvmVerifyInfo, HexAddr20, Option } from "lib/types";
 import { isUndefined } from "lodash";
-import { ChangeEvent, useCallback, useEffect, useState } from "react";
-import { InteractTabsIndex, TabIndex } from "../../types";
+import type { ChangeEvent } from "react";
+import { useCallback, useEffect, useState } from "react";
+import type { InteractTabsIndex } from "../../types";
+import { TabIndex } from "../../types";
 import { getInteractTabsIndex } from "../../utils";
 import { AbiRead } from "./abi-read";
 import { AbiWrite } from "./abi-write";
diff --git a/src/lib/pages/evm-contract-details/components/interact-evm-contract/utils.ts b/src/lib/pages/evm-contract-details/components/interact-evm-contract/utils.ts
index adf02f27d..44bbc7e01 100644
--- a/src/lib/pages/evm-contract-details/components/interact-evm-contract/utils.ts
+++ b/src/lib/pages/evm-contract-details/components/interact-evm-contract/utils.ts
@@ -1,4 +1,4 @@
-import { JsonFragment } from "ethers";
+import type { JsonFragment } from "ethers";
 
 export const categorizeAbi = (abi: JsonFragment[]) => {
   const read: JsonFragment[] = [];
diff --git a/src/lib/pages/evm-contract-details/index.tsx b/src/lib/pages/evm-contract-details/index.tsx
index d71c2b6a5..08700dd5f 100644
--- a/src/lib/pages/evm-contract-details/index.tsx
+++ b/src/lib/pages/evm-contract-details/index.tsx
@@ -30,12 +30,8 @@ import { EvmContractDetailsContractInfo } from "./components/evm-contract-detail
 import { EvmContractDetailsOverview } from "./components/evm-contract-details-overview";
 import { EvmContractDetailsTop } from "./components/EvmContractDetailsTop";
 import { EvmContractDetailsTxs } from "./components/EvmContractDetailsTxs";
-import {
-  InteractTabsIndex,
-  TabIndex,
-  TxsTabIndex,
-  zEvmContractDetailsQueryParams,
-} from "./types";
+import type { InteractTabsIndex } from "./types";
+import { TabIndex, TxsTabIndex, zEvmContractDetailsQueryParams } from "./types";
 import { InteractEvmContract } from "./components/interact-evm-contract";
 import { useEvmVerifyInfo } from "lib/services/verification/evm";
 
diff --git a/src/lib/pages/evm-contract-verify/components/ConstructorArgs.tsx b/src/lib/pages/evm-contract-verify/components/ConstructorArgs.tsx
index dac9ec778..f06fc1f02 100644
--- a/src/lib/pages/evm-contract-verify/components/ConstructorArgs.tsx
+++ b/src/lib/pages/evm-contract-verify/components/ConstructorArgs.tsx
@@ -1,11 +1,6 @@
 import { Box, Checkbox, Heading, Stack, Text } from "@chakra-ui/react";
-import {
-  Control,
-  FieldPath,
-  FieldValues,
-  useController,
-  useWatch,
-} from "react-hook-form";
+import type { Control, FieldPath, FieldValues } from "react-hook-form";
+import { useController, useWatch } from "react-hook-form";
 import { ControllerTextarea } from "lib/components/forms";
 
 interface ConstructorArgsProps<T extends FieldValues> {
diff --git a/src/lib/pages/evm-contract-verify/components/ContractLibraries.tsx b/src/lib/pages/evm-contract-verify/components/ContractLibraries.tsx
index 28cc539ec..78f55cc92 100644
--- a/src/lib/pages/evm-contract-verify/components/ContractLibraries.tsx
+++ b/src/lib/pages/evm-contract-verify/components/ContractLibraries.tsx
@@ -1,14 +1,13 @@
 import { Button, Checkbox, Grid, Heading, Stack, Text } from "@chakra-ui/react";
 import { CustomIcon } from "lib/components/icon";
-import {
+import type {
   Control,
   FieldArray,
   FieldArrayPath,
   FieldPath,
   FieldValues,
-  useController,
-  useFieldArray,
 } from "react-hook-form";
+import { useController, useFieldArray } from "react-hook-form";
 import { ContractLibrary } from "./ContractLibrary";
 
 interface ContractLibrariesProps<T extends FieldValues> {
diff --git a/src/lib/pages/evm-contract-verify/components/ContractLibrary.tsx b/src/lib/pages/evm-contract-verify/components/ContractLibrary.tsx
index 04cc43b0c..ce1d65e07 100644
--- a/src/lib/pages/evm-contract-verify/components/ContractLibrary.tsx
+++ b/src/lib/pages/evm-contract-verify/components/ContractLibrary.tsx
@@ -1,12 +1,8 @@
 import { useExampleAddresses } from "lib/app-provider";
 import { ControllerInput } from "lib/components/forms";
 import { bech32AddressToHex, truncate } from "lib/utils";
-import {
-  Control,
-  FieldPath,
-  FieldValues,
-  useController,
-} from "react-hook-form";
+import type { Control, FieldPath, FieldValues } from "react-hook-form";
+import { useController } from "react-hook-form";
 
 interface ContractLibraryProps<T extends FieldValues> {
   control: Control<T>;
diff --git a/src/lib/pages/evm-contract-verify/components/EvmContractVerifyForms.tsx b/src/lib/pages/evm-contract-verify/components/EvmContractVerifyForms.tsx
index 985c18f1f..995c160e8 100644
--- a/src/lib/pages/evm-contract-verify/components/EvmContractVerifyForms.tsx
+++ b/src/lib/pages/evm-contract-verify/components/EvmContractVerifyForms.tsx
@@ -1,4 +1,5 @@
-import { Control, useWatch } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { useWatch } from "react-hook-form";
 import {
   EvmContractVerifyVyperContractCode,
   EvmContractVerifyVyperJsonInput,
@@ -11,11 +12,8 @@ import {
   EvmContractVerifySolidityJsonInput,
   EvmContractVerifySolidityUploadFiles,
 } from "./solidity";
-import {
-  EvmContractVerifyForm,
-  EvmVerifyConfig,
-  EvmVerifyOptions,
-} from "lib/types";
+import type { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
+import { EvmVerifyOptions } from "lib/types";
 
 interface EvmContractVerifyFormsProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/components/EvmContractVerifyOptions.tsx b/src/lib/pages/evm-contract-verify/components/EvmContractVerifyOptions.tsx
index 80e1c3626..52be29eb3 100644
--- a/src/lib/pages/evm-contract-verify/components/EvmContractVerifyOptions.tsx
+++ b/src/lib/pages/evm-contract-verify/components/EvmContractVerifyOptions.tsx
@@ -1,10 +1,8 @@
 import { Grid, Heading, Radio, RadioGroup, Stack } from "@chakra-ui/react";
-import { Control, useController, useWatch } from "react-hook-form";
-import {
-  EvmContractVerifyForm,
-  EvmProgrammingLanguage,
-  EvmVerifyOptions,
-} from "lib/types";
+import type { Control } from "react-hook-form";
+import { useController, useWatch } from "react-hook-form";
+import type { EvmContractVerifyForm } from "lib/types";
+import { EvmProgrammingLanguage, EvmVerifyOptions } from "lib/types";
 
 interface EvmContractVerifyVyperProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/components/EvmVersionToTarget.tsx b/src/lib/pages/evm-contract-verify/components/EvmVersionToTarget.tsx
index a9b925e39..0c2f5ecc1 100644
--- a/src/lib/pages/evm-contract-verify/components/EvmVersionToTarget.tsx
+++ b/src/lib/pages/evm-contract-verify/components/EvmVersionToTarget.tsx
@@ -1,14 +1,10 @@
 import { Grid, Heading, Stack, Text } from "@chakra-ui/react";
 import { SelectInput } from "lib/components/forms";
-import { EvmProgrammingLanguage, EvmVerifyConfig } from "lib/types";
+import type { EvmVerifyConfig } from "lib/types";
+import { EvmProgrammingLanguage } from "lib/types";
 import { useMemo } from "react";
-import {
-  Control,
-  FieldPath,
-  FieldValues,
-  useController,
-  useWatch,
-} from "react-hook-form";
+import type { Control, FieldPath, FieldValues } from "react-hook-form";
+import { useController, useWatch } from "react-hook-form";
 import { formatEvmOptions } from "../helpers";
 
 interface EvmVersionToTargetProps<T extends FieldValues> {
diff --git a/src/lib/pages/evm-contract-verify/components/OptimizerConfiguration.tsx b/src/lib/pages/evm-contract-verify/components/OptimizerConfiguration.tsx
index c3643268f..69ae7ed84 100644
--- a/src/lib/pages/evm-contract-verify/components/OptimizerConfiguration.tsx
+++ b/src/lib/pages/evm-contract-verify/components/OptimizerConfiguration.tsx
@@ -1,11 +1,6 @@
 import { Checkbox, Flex, Heading, Stack, Text } from "@chakra-ui/react";
-import {
-  Control,
-  FieldPath,
-  FieldValues,
-  useController,
-  useWatch,
-} from "react-hook-form";
+import type { Control, FieldPath, FieldValues } from "react-hook-form";
+import { useController, useWatch } from "react-hook-form";
 import { ControllerInput } from "lib/components/forms";
 
 interface OptimizerConfigurationProps<T extends FieldValues> {
diff --git a/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/EvmContractVerifyModalBody.tsx b/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/EvmContractVerifyModalBody.tsx
index 6ae2e4ada..6231780b6 100644
--- a/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/EvmContractVerifyModalBody.tsx
+++ b/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/EvmContractVerifyModalBody.tsx
@@ -4,7 +4,7 @@ import type { Control } from "react-hook-form";
 import { EvmContractVerifyFailedModal } from "./EvmContractVerifyFailedModal";
 import { EvmContractVerifyLoadingModal } from "./EvmContractVerifyLoadingModal";
 import { EvmContractVerifySuccessModal } from "./EvmContractVerifySuccessModal";
-import { EvmContractVerifyForm } from "lib/types";
+import type { EvmContractVerifyForm } from "lib/types";
 
 interface EvmContractVerifyModalBodyProps {
   isError: boolean;
diff --git a/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/EvmContractVerifySuccessModal.tsx b/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/EvmContractVerifySuccessModal.tsx
index bb33e7ebc..a77e1768c 100644
--- a/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/EvmContractVerifySuccessModal.tsx
+++ b/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/EvmContractVerifySuccessModal.tsx
@@ -16,7 +16,7 @@ import { useCelatoneApp } from "lib/app-provider";
 import { AppLink } from "lib/components/AppLink";
 import { CustomIcon } from "lib/components/icon";
 import { ExplorerLink } from "lib/components/ExplorerLink";
-import { EvmContractVerifyForm } from "lib/types";
+import type { EvmContractVerifyForm } from "lib/types";
 import { useRouter } from "next/router";
 
 interface EvmContractVerifySuccessModalProps {
diff --git a/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/index.tsx b/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/index.tsx
index a970404bc..676f153f7 100644
--- a/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/index.tsx
+++ b/src/lib/pages/evm-contract-verify/components/evm-contract-verify-modal/index.tsx
@@ -1,7 +1,7 @@
 import { Modal, ModalContent, ModalOverlay } from "@chakra-ui/react";
 import { EvmContractVerifyModalBody } from "./EvmContractVerifyModalBody";
 import type { Control } from "react-hook-form";
-import { EvmContractVerifyForm } from "lib/types";
+import type { EvmContractVerifyForm } from "lib/types";
 
 interface EvmContractVerifyModalProps {
   isOpen: boolean;
diff --git a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityContractCode.tsx b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityContractCode.tsx
index 6e7db3b93..b2c34362b 100644
--- a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityContractCode.tsx
+++ b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityContractCode.tsx
@@ -1,11 +1,12 @@
-import { Control, useController } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { useController } from "react-hook-form";
 import { Heading, Stack } from "@chakra-ui/react";
 import { ControllerTextarea } from "lib/components/forms";
 import { ConstructorArgs } from "../ConstructorArgs";
 import { EvmVersionToTarget } from "../EvmVersionToTarget";
 import { OptimizerConfiguration } from "../OptimizerConfiguration";
 import { ContractLibraries } from "../ContractLibraries";
-import { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
+import type { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
 
 interface EvmContractVerifySolidityContractCodeProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityFoundry.tsx b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityFoundry.tsx
index 05380b5ce..51730e37b 100644
--- a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityFoundry.tsx
+++ b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityFoundry.tsx
@@ -3,9 +3,10 @@ import { useCelatoneApp, useEvmConfig } from "lib/app-provider";
 import { TextReadOnly } from "lib/components/json/TextReadOnly";
 import { useMemo } from "react";
 
-import { Control, useWatch } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { useWatch } from "react-hook-form";
 import { CELATONE_VERIFICATION_API } from "env";
-import { EvmContractVerifyForm } from "lib/types";
+import type { EvmContractVerifyForm } from "lib/types";
 
 interface EvmContractVerifySolidityFoundryProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityHardhat.tsx b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityHardhat.tsx
index 2adb67380..3d1005b06 100644
--- a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityHardhat.tsx
+++ b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityHardhat.tsx
@@ -3,10 +3,11 @@ import { useCelatoneApp, useEvmConfig } from "lib/app-provider";
 import { TextReadOnly } from "lib/components/json/TextReadOnly";
 import { useMemo } from "react";
 
-import { Control, useWatch } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { useWatch } from "react-hook-form";
 import { convertCosmosChainIdToEvmChainId } from "lib/utils/evm";
 import { CELATONE_VERIFICATION_API } from "env";
-import { EvmContractVerifyForm } from "lib/types";
+import type { EvmContractVerifyForm } from "lib/types";
 
 interface EvmContractVerifySolidityHardhatProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityJsonInput.tsx b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityJsonInput.tsx
index bf3a76f87..a3bebe99c 100644
--- a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityJsonInput.tsx
+++ b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityJsonInput.tsx
@@ -1,9 +1,10 @@
-import { Control, useController } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { useController } from "react-hook-form";
 import { Heading, Stack } from "@chakra-ui/react";
 import { DropZone } from "lib/components/dropzone";
 import { UploadCard } from "lib/components/upload";
 import { ConstructorArgs } from "../ConstructorArgs";
-import { EvmContractVerifyForm } from "lib/types";
+import type { EvmContractVerifyForm } from "lib/types";
 
 interface EvmContractVerifySolidityJsonInputProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityUploadFiles.tsx b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityUploadFiles.tsx
index 8d64670ef..18b03b3ca 100644
--- a/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityUploadFiles.tsx
+++ b/src/lib/pages/evm-contract-verify/components/solidity/EvmContractVerifySolidityUploadFiles.tsx
@@ -1,5 +1,6 @@
 import { Heading, Stack } from "@chakra-ui/react";
-import { Control, useFieldArray } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { useFieldArray } from "react-hook-form";
 import { ConstructorArgs } from "../ConstructorArgs";
 import { EvmVersionToTarget } from "../EvmVersionToTarget";
 import { OptimizerConfiguration } from "../OptimizerConfiguration";
@@ -7,7 +8,7 @@ import { ContractLibraries } from "../ContractLibraries";
 import { DropZone } from "lib/components/dropzone";
 import { UploadCard } from "lib/components/upload";
 import { Fragment } from "react";
-import { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
+import type { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
 
 interface EvmContractVerifySolidityUploadFilesProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperContractCode.tsx b/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperContractCode.tsx
index 0d8b52144..a1fd8d610 100644
--- a/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperContractCode.tsx
+++ b/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperContractCode.tsx
@@ -1,9 +1,10 @@
-import { Control, useController } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { useController } from "react-hook-form";
 import { Heading, Stack } from "@chakra-ui/react";
 import { ConstructorArgs } from "../ConstructorArgs";
 import { EvmVersionToTarget } from "../EvmVersionToTarget";
 import { ControllerInput, ControllerTextarea } from "lib/components/forms";
-import { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
+import type { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
 
 interface EvmContractVerifyVyperContractCodeProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperJsonInput.tsx b/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperJsonInput.tsx
index f8c302105..faa72baf3 100644
--- a/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperJsonInput.tsx
+++ b/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperJsonInput.tsx
@@ -1,9 +1,10 @@
-import { Control, useController } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { useController } from "react-hook-form";
 import { Heading, Stack } from "@chakra-ui/react";
 import { UploadCard } from "lib/components/upload";
 import { DropZone } from "lib/components/dropzone";
 import { ConstructorArgs } from "../ConstructorArgs";
-import { EvmContractVerifyForm } from "lib/types";
+import type { EvmContractVerifyForm } from "lib/types";
 
 interface EvmContractVerifyVyperJsonInputProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperUploadFile.tsx b/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperUploadFile.tsx
index e7c25a349..f35bc1d67 100644
--- a/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperUploadFile.tsx
+++ b/src/lib/pages/evm-contract-verify/components/vyper/EvmContractVerifyVyperUploadFile.tsx
@@ -1,10 +1,11 @@
-import { Control, useController } from "react-hook-form";
+import type { Control } from "react-hook-form";
+import { useController } from "react-hook-form";
 import { Heading, Stack } from "@chakra-ui/react";
 import { DropZone } from "lib/components/dropzone";
 import { UploadCard } from "lib/components/upload";
 import { ConstructorArgs } from "../ConstructorArgs";
 import { EvmVersionToTarget } from "../EvmVersionToTarget";
-import { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
+import type { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
 
 interface EvmContractVerifyVyperUploadFileProps {
   control: Control<EvmContractVerifyForm>;
diff --git a/src/lib/pages/evm-contract-verify/helpers.ts b/src/lib/pages/evm-contract-verify/helpers.ts
index c9acf74a9..fedaacb9c 100644
--- a/src/lib/pages/evm-contract-verify/helpers.ts
+++ b/src/lib/pages/evm-contract-verify/helpers.ts
@@ -1,9 +1,7 @@
-import { HexAddr20, Option, zHexAddr20 } from "lib/types";
-import {
-  EvmContractVerifyForm,
-  EvmProgrammingLanguage,
-  EvmVerifyConfig,
-} from "lib/types";
+import type { HexAddr20, Option } from "lib/types";
+import { zHexAddr20 } from "lib/types";
+import type { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
+import { EvmProgrammingLanguage } from "lib/types";
 import { getLicenseTypeLabel } from "lib/utils";
 
 const CONSTRUCTOR_ARGS_DEFAULT_VALUE = {
diff --git a/src/lib/pages/evm-contract-verify/index.tsx b/src/lib/pages/evm-contract-verify/index.tsx
index e4fd64224..d361be4ef 100644
--- a/src/lib/pages/evm-contract-verify/index.tsx
+++ b/src/lib/pages/evm-contract-verify/index.tsx
@@ -25,10 +25,9 @@ import { EvmVerifyStatusModal } from "lib/components/modal/evm-verify-status";
 import PageContainer from "lib/components/PageContainer";
 import { CelatoneSeo } from "lib/components/Seo";
 import { ErrorFetching, InvalidState } from "lib/components/state";
+import type { EvmContractVerifyForm, EvmVerifyConfig } from "lib/types";
 import {
-  EvmContractVerifyForm,
   EvmProgrammingLanguage,
-  EvmVerifyConfig,
   EvmVerifyOptions,
   zEvmContractVerifyBase,
   zEvmContractVerifyForm,
@@ -44,7 +43,7 @@ import {
   useEvmVerifyInfo,
   useSubmitEvmVerify,
 } from "lib/services/verification/evm";
-import { HexAddr20, Option } from "lib/types";
+import type { HexAddr20, Option } from "lib/types";
 import { bech32AddressToHex, isHex20Bytes, truncate } from "lib/utils";
 import { useRouter } from "next/router";
 import { useEffect, useMemo } from "react";
diff --git a/src/lib/pages/tx-details/components/TxInfo.tsx b/src/lib/pages/tx-details/components/TxInfo.tsx
index 41fa985db..273c08290 100644
--- a/src/lib/pages/tx-details/components/TxInfo.tsx
+++ b/src/lib/pages/tx-details/components/TxInfo.tsx
@@ -7,7 +7,7 @@ import { UserDocsLink } from "lib/components/UserDocsLink";
 import { useAssetInfos } from "lib/services/assetService";
 import { useMovePoolInfos } from "lib/services/move/poolService";
 import type { TxData } from "lib/services/types";
-import { Option, Ratio } from "lib/types";
+import type { Option, Ratio } from "lib/types";
 import {
   computeCosmosFee,
   formatInteger,
diff --git a/src/lib/pages/tx-details/components/TxInfoMobile.tsx b/src/lib/pages/tx-details/components/TxInfoMobile.tsx
index e0410a7d3..1f98985e3 100644
--- a/src/lib/pages/tx-details/components/TxInfoMobile.tsx
+++ b/src/lib/pages/tx-details/components/TxInfoMobile.tsx
@@ -6,7 +6,7 @@ import { LabelText } from "lib/components/LabelText";
 import { useAssetInfos } from "lib/services/assetService";
 import { useMovePoolInfos } from "lib/services/move/poolService";
 import type { TxData } from "lib/services/types";
-import { Option, Ratio } from "lib/types";
+import type { Option, Ratio } from "lib/types";
 import {
   computeCosmosFee,
   formatInteger,
diff --git a/src/lib/services/chain-config/api.ts b/src/lib/services/chain-config/api.ts
index dbb4ffa77..86315490e 100644
--- a/src/lib/services/chain-config/api.ts
+++ b/src/lib/services/chain-config/api.ts
@@ -1,7 +1,8 @@
 import axios from "axios";
 
 import { CELATONE_API_OVERRIDE } from "env";
-import { Option, zChainConfig } from "lib/types";
+import type { Option } from "lib/types";
+import { zChainConfig } from "lib/types";
 import { parseWithError } from "lib/utils";
 
 export const getApiChainConfigs = async (
diff --git a/src/lib/services/chain-config/index.ts b/src/lib/services/chain-config/index.ts
index b24a92b9f..071616638 100644
--- a/src/lib/services/chain-config/index.ts
+++ b/src/lib/services/chain-config/index.ts
@@ -5,7 +5,7 @@ import { CELATONE_QUERY_KEYS } from "lib/app-provider/env";
 import { isUrl } from "lib/utils";
 
 import { getApiChainConfigs } from "./api";
-import { Option } from "lib/types";
+import type { Option } from "lib/types";
 
 export const useApiChainConfigs = (
   networkTypes: string[],
diff --git a/src/lib/services/evm/index.ts b/src/lib/services/evm/index.ts
index 616de2ddc..da41f72f0 100644
--- a/src/lib/services/evm/index.ts
+++ b/src/lib/services/evm/index.ts
@@ -1,4 +1,5 @@
-import { useQuery, UseQueryOptions } from "@tanstack/react-query";
+import type { UseQueryOptions } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 
 import {
   CELATONE_QUERY_KEYS,
@@ -6,7 +7,8 @@ import {
   useCurrentChain,
   useEvmConfig,
 } from "lib/app-provider";
-import { type HexAddr20, Nullable, zHexAddr20 } from "lib/types";
+import type { Nullable } from "lib/types";
+import { type HexAddr20, zHexAddr20 } from "lib/types";
 import { bech32AddressToHex, isHexWalletAddress } from "lib/utils";
 
 import {
@@ -15,7 +17,7 @@ import {
   getEvmParams,
 } from "./lcd";
 import { getEthCall, getEvmProxyTarget } from "./json-rpc";
-import { ProxyResult } from "./json-rpc/proxy/types";
+import type { ProxyResult } from "./json-rpc/proxy/types";
 
 export const useEvmParams = () => {
   const {
diff --git a/src/lib/services/evm/json-rpc/eth.ts b/src/lib/services/evm/json-rpc/eth.ts
index b33822bb0..c49718e47 100644
--- a/src/lib/services/evm/json-rpc/eth.ts
+++ b/src/lib/services/evm/json-rpc/eth.ts
@@ -1,5 +1,6 @@
 import { zTxReceiptJsonRpc } from "lib/services/types";
-import { HexAddr20, Nullable, zHex } from "lib/types";
+import type { HexAddr20, Nullable } from "lib/types";
+import { zHex } from "lib/types";
 import { parseWithError } from "lib/utils";
 import { requestJsonRpc } from ".";
 
diff --git a/src/lib/services/evm/json-rpc/proxy/index.ts b/src/lib/services/evm/json-rpc/proxy/index.ts
index 238205aac..cb00048dd 100644
--- a/src/lib/services/evm/json-rpc/proxy/index.ts
+++ b/src/lib/services/evm/json-rpc/proxy/index.ts
@@ -1,6 +1,7 @@
-import { HexAddr20, Nullable } from "lib/types";
+import type { HexAddr20, Nullable } from "lib/types";
 import { getEthCall, getEthGetCode, getEthGetStorageAt } from "../eth";
-import { ProxyResult, ProxyType } from "./types";
+import type { ProxyResult } from "./types";
+import { ProxyType } from "./types";
 import { parse1167Bytecode, readAddress } from "./utils";
 
 // obtained as bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)
diff --git a/src/lib/services/evm/json-rpc/proxy/types.ts b/src/lib/services/evm/json-rpc/proxy/types.ts
index e893d66c9..b0966d808 100644
--- a/src/lib/services/evm/json-rpc/proxy/types.ts
+++ b/src/lib/services/evm/json-rpc/proxy/types.ts
@@ -1,4 +1,4 @@
-import { HexAddr20 } from "lib/types";
+import type { HexAddr20 } from "lib/types";
 
 export enum ProxyType {
   Eip1167 = "Eip1167",
diff --git a/src/lib/services/evm/json-rpc/proxy/utils.ts b/src/lib/services/evm/json-rpc/proxy/utils.ts
index a4ce59483..fdc288a2e 100644
--- a/src/lib/services/evm/json-rpc/proxy/utils.ts
+++ b/src/lib/services/evm/json-rpc/proxy/utils.ts
@@ -1,4 +1,5 @@
-import { Hex, zHex, zHexAddr20 } from "lib/types";
+import type { Hex } from "lib/types";
+import { zHex, zHexAddr20 } from "lib/types";
 import { toChecksumAddress } from "lib/utils";
 
 const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
diff --git a/src/lib/services/tx/jsonRpc.ts b/src/lib/services/tx/jsonRpc.ts
index f4d356dac..daea4377c 100644
--- a/src/lib/services/tx/jsonRpc.ts
+++ b/src/lib/services/tx/jsonRpc.ts
@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { TransactionRequest } from "ethers";
+import type { TransactionRequest } from "ethers";
 import { parseWithError } from "lib/utils";
 import type { JsonRpcParams } from "../evm/json-rpc";
 import { requestBatchJsonRpc, requestJsonRpc } from "../evm/json-rpc";
diff --git a/src/lib/services/tx/simulateFeeEvm.ts b/src/lib/services/tx/simulateFeeEvm.ts
index b3ec212d5..d20899e52 100644
--- a/src/lib/services/tx/simulateFeeEvm.ts
+++ b/src/lib/services/tx/simulateFeeEvm.ts
@@ -7,7 +7,7 @@ import { CELATONE_QUERY_KEYS } from "lib/app-provider/env";
 import { useCurrentChain } from "lib/app-provider/hooks";
 import { type HexAddr20, type Option } from "lib/types";
 import { bech32AddressToHex } from "lib/utils";
-import { SimulatedFeeEvm } from "../types";
+import type { SimulatedFeeEvm } from "../types";
 import { getSimulateFeeEvm } from "./jsonRpc";
 
 interface SimulateQueryEvmParams {
diff --git a/src/lib/services/types/verification/evm.ts b/src/lib/services/types/verification/evm.ts
index 4c2ee8285..96dd4c1f7 100644
--- a/src/lib/services/types/verification/evm.ts
+++ b/src/lib/services/types/verification/evm.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   EvmContractVerifyForm,
   EvmVerifyLicenseType,
   EvmVerifyOptions,
diff --git a/src/lib/services/verification/evm/api.ts b/src/lib/services/verification/evm/api.ts
index bf7016bde..a1f3275c3 100644
--- a/src/lib/services/verification/evm/api.ts
+++ b/src/lib/services/verification/evm/api.ts
@@ -1,6 +1,6 @@
 import axios from "axios";
 import { CELATONE_VERIFICATION_API } from "env";
-import {
+import type {
   SubmitEvmVerifyArgs,
   SubmitEvmVerifySolidityContractCodeArgs,
   SubmitEvmVerifySolidityJsonInputArgs,
@@ -9,12 +9,8 @@ import {
   SubmitEvmVerifyVyperJsonInputArgs,
   SubmitEvmVerifyVyperUploadFilesArgs,
 } from "lib/services/types";
-import {
-  EvmVerifyOptions,
-  HexAddr20,
-  zEvmVerifyConfig,
-  zEvmVerifyInfo,
-} from "lib/types";
+import type { HexAddr20 } from "lib/types";
+import { EvmVerifyOptions, zEvmVerifyConfig, zEvmVerifyInfo } from "lib/types";
 import {
   BYTECODE_TYPE,
   formatContractLibraries,
diff --git a/src/lib/services/verification/evm/index.ts b/src/lib/services/verification/evm/index.ts
index 73d585c80..d28f2307b 100644
--- a/src/lib/services/verification/evm/index.ts
+++ b/src/lib/services/verification/evm/index.ts
@@ -1,7 +1,7 @@
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { CELATONE_QUERY_KEYS } from "lib/app-provider/env";
 import { getEvmVerifyConfig, getEvmVerifyInfo, submitEvmVerify } from "./api";
-import { HexAddr20, Option } from "lib/types";
+import type { HexAddr20, Option } from "lib/types";
 import { useCurrentChain } from "lib/app-provider";
 import { isHex20Bytes } from "lib/utils/validate";
 
diff --git a/src/lib/services/verification/evm/utils.ts b/src/lib/services/verification/evm/utils.ts
index 4d5385c10..974a43c36 100644
--- a/src/lib/services/verification/evm/utils.ts
+++ b/src/lib/services/verification/evm/utils.ts
@@ -1,5 +1,6 @@
 import { CELATONE_VERIFICATION_API } from "env";
-import { ContractLibraries, EvmVerifyOptions } from "lib/types";
+import type { ContractLibraries } from "lib/types";
+import { EvmVerifyOptions } from "lib/types";
 import { isHex20Bytes } from "lib/utils/validate";
 
 export const getVerifierUrl = (option: EvmVerifyOptions) => {
diff --git a/src/lib/types/evm.ts b/src/lib/types/evm.ts
index e51b19dd5..48fd9edce 100644
--- a/src/lib/types/evm.ts
+++ b/src/lib/types/evm.ts
@@ -1,4 +1,4 @@
-import { JsonFragment } from "ethers";
+import type { JsonFragment } from "ethers";
 import { z, ZodIssueCode } from "zod";
 import { snakeToCamel } from "lib/utils/formatter/snakeToCamel";
 import { isHex20Bytes } from "lib/utils/validate";
diff --git a/src/lib/utils/evm.ts b/src/lib/utils/evm.ts
index 1e98db5ed..bd9deb566 100644
--- a/src/lib/utils/evm.ts
+++ b/src/lib/utils/evm.ts
@@ -3,7 +3,8 @@ import type { Coin, HexAddr20, Option } from "lib/types";
 import { big, EvmMethodId, EvmMethodName, zHexAddr20 } from "lib/types";
 
 import { keccak256 } from "@initia/initia.js";
-import { Interface, JsonFragment } from "ethers";
+import type { JsonFragment } from "ethers";
+import { Interface } from "ethers";
 import { toChecksumAddress } from "./address";
 import { hexToBig } from "./number";
 

From eb745f3a2c77e3993feb9eb23ee101b7abbcaa19 Mon Sep 17 00:00:00 2001
From: songwongtp <16089160+songwongtp@users.noreply.github.com>
Date: Thu, 20 Feb 2025 16:52:36 +0700
Subject: [PATCH 3/3] fix: comment

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2e9b6c35..98f78caa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,7 +80,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
-- [#1242](https://github.com/alleslabs/celatone-frontend/pull/1242) Fix EVM proxy contract details and checksum address
+- [#1242](https://github.com/alleslabs/celatone-frontend/pull/1242) Improve EVM proxy contract details and checksum address
 - [#1236](https://github.com/alleslabs/celatone-frontend/pull/1236) Remove unnecessary configs for users in custom network configs
 - [#1228](https://github.com/alleslabs/celatone-frontend/pull/1228) Refactor EVM verification form path and form type location
 - [#1215](https://github.com/alleslabs/celatone-frontend/pull/1215) Bump react wallet widget package to support http endpoints