Refactor some logic to check if a chain is evm only

chainapsis · May 27, 2024 · 9a289e1 · 9a289e1
1 parent 6ba47a0
commit 9a289e1
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/apps/extension/src/components/address-book-modal/index.tsx b/apps/extension/src/components/address-book-modal/index.tsx
@@ -100,7 +100,7 @@ export const AddressBookModal: FunctionComponent<{
 
     const chainInfo = chainStore.getChain(recipientConfig.chainId);
     const isEVMChain = chainInfo.evm !== undefined;
-    const isEVMOnlyChain = chainInfo.chainId.startsWith("eip155");
+    const isEVMOnlyChain = chainStore.isEvmOnlyChain(chainInfo.chainId);
     const isERC20 = new DenomHelper(currency.coinMinimalDenom).type === "erc20";
 
     const datas: {

diff --git a/apps/extension/src/pages/main/available.tsx b/apps/extension/src/pages/main/available.tsx
@@ -284,8 +284,9 @@ export const AvailableTabView: FunctionComponent<{
                           const account = accountStore.getAccount(
                             viewToken.chainInfo.chainId
                           );
-                          const isEVMOnlyChain =
-                            viewToken.chainInfo.chainId.startsWith("eip155");
+                          const isEVMOnlyChain = chainStore.isEvmOnlyChain(
+                            viewToken.chainInfo.chainId
+                          );
 
                           return isEVMOnlyChain
                             ? account.ethereumHexAddress

diff --git a/apps/extension/src/pages/main/token-detail/address-chip/index.tsx b/apps/extension/src/pages/main/token-detail/address-chip/index.tsx
@@ -17,9 +17,9 @@ export const AddressChip: FunctionComponent<{
   // modal 안에서는 배경색을 바꿈
   inModal?: boolean;
 }> = observer(({ chainId, inModal }) => {
-  const { accountStore } = useStore();
+  const { accountStore, chainStore } = useStore();
 
-  const isEVMOnlyChain = chainId.startsWith("eip155");
+  const isEVMOnlyChain = chainStore.isEvmOnlyChain(chainId);
 
   const theme = useTheme();
 

diff --git a/apps/extension/src/pages/main/token-detail/receive-modal/index.tsx b/apps/extension/src/pages/main/token-detail/receive-modal/index.tsx
@@ -22,7 +22,7 @@ export const ReceiveModal: FunctionComponent<{
 
   const chainInfo = chainStore.getChain(chainId);
   const account = accountStore.getAccount(chainId);
-  const isEVMOnlyChain = chainId.startsWith("eip155");
+  const isEVMOnlyChain = chainStore.isEvmOnlyChain(chainId);
 
   return (
     <Box

diff --git a/apps/extension/src/pages/send/amount/index.tsx b/apps/extension/src/pages/send/amount/index.tsx
@@ -85,7 +85,7 @@ export const SendAmountPage: FunctionComponent = observer(() => {
   const chainId = initialChainId || chainStore.chainInfosInUI[0].chainId;
   const chainInfo = chainStore.getChain(chainId);
   const isEvmChain = chainStore.isEvmChain(chainId);
-  const isEVMOnlyChain = isEvmChain && chainId.split(":")[0] === "eip155";
+  const isEVMOnlyChain = chainStore.isEvmOnlyChain(chainId);
 
   const coinMinimalDenom =
     initialCoinMinimalDenom ||

diff --git a/packages/hooks/src/tx/recipient.ts b/packages/hooks/src/tx/recipient.ts
@@ -182,7 +182,7 @@ export class RecipientConfig
     }
 
     const chainInfo = this.chainInfo;
-    const isEvmChain = !!EthereumAccountBase.evmInfo(this.chainInfo);
+    const isEvmChain = !!this.chainInfo.evm;
     const hasEthereumAddress =
       chainInfo.bip44.coinType === 60 ||
       !!chainInfo.features?.includes("eth-address-gen") ||
@@ -258,7 +258,7 @@ export class RecipientConfig
     }
 
     const chainInfo = this.chainInfo;
-    const isEvmChain = !!EthereumAccountBase.evmInfo(this.chainInfo);
+    const isEvmChain = !!this.chainInfo.evm;
     const hasEthereumAddress =
       chainInfo.bip44.coinType === 60 ||
       !!chainInfo.features?.includes("eth-address-gen") ||

diff --git a/packages/stores-eth/src/account/base.ts b/packages/stores-eth/src/account/base.ts
@@ -2,7 +2,6 @@ import { simpleFetch } from "@keplr-wallet/simple-fetch";
 import { ChainGetter } from "@keplr-wallet/stores";
 import {
   AppCurrency,
-  ChainInfo,
   EthSignType,
   EthTxReceipt,
   Keplr,
@@ -31,10 +30,6 @@ export class EthereumAccountBase {
     makeObservable(this);
   }
 
-  static evmInfo(chainInfo: ChainInfo): ChainInfo["evm"] | undefined {
-    return chainInfo.evm;
-  }
-
   @action
   setIsSendingTx(value: boolean) {
     this._isSendingTx = value;
@@ -56,7 +51,7 @@ export class EthereumAccountBase {
     recipient: string;
   }) {
     const chainInfo = this.chainGetter.getChain(this.chainId);
-    const evmInfo = EthereumAccountBase.evmInfo(chainInfo);
+    const evmInfo = chainInfo.evm;
     if (!evmInfo) {
       throw new Error("No EVM chain info provided");
     }
@@ -134,7 +129,7 @@ export class EthereumAccountBase {
     maxPriorityFeePerGas: string;
   }): Promise<UnsignedTransaction> {
     const chainInfo = this.chainGetter.getChain(this.chainId);
-    const evmInfo = EthereumAccountBase.evmInfo(chainInfo);
+    const evmInfo = chainInfo.evm;
     if (!evmInfo) {
       throw new Error("No EVM chain info provided");
     }
@@ -201,7 +196,7 @@ export class EthereumAccountBase {
   ) {
     try {
       const chainInfo = this.chainGetter.getChain(this.chainId);
-      const evmInfo = EthereumAccountBase.evmInfo(chainInfo);
+      const evmInfo = chainInfo.evm;
       if (!evmInfo) {
         throw new Error("No EVM info provided");
       }

diff --git a/packages/stores/src/chain/base.ts b/packages/stores/src/chain/base.ts
@@ -594,4 +594,8 @@ export class ChainStore<C extends ChainInfo = ChainInfo>
     const chainInfo = this.getChain(chainId);
     return chainInfo.evm !== undefined;
   }
+
+  isEvmOnlyChain(chainId: string): boolean {
+    return this.isEvmChain(chainId) && chainId.split(":")[0] === "eip155";
+  }
 }