code improvement

Author: editaahn

apps/extension/src/pages/earn/confirm-usdn-estimation/index.tsx

@@ -93,12 +93,15 @@ export const EarnConfirmUsdnEstimationPage: FunctionComponent = observer(() => {
     }
     if (feeMinimalDenom && feeType) {
       const modularChainInfo = chainStore.getModularChain(NOBLE_CHAIN_ID);
-      const feeCurrency =
-        "cosmos" in modularChainInfo
-          ? modularChainInfo.cosmos.feeCurrencies.find(
-              (feeCurrency) => feeCurrency.coinMinimalDenom === feeMinimalDenom
-            )
-          : undefined;
+
+      if (!("cosmos" in modularChainInfo)) {
+        throw new Error("cosmos module is not supported on this chain");
+      }
+
+      const feeCurrency = modularChainInfo.cosmos.feeCurrencies.find(
+        (feeCurrency) => feeCurrency.coinMinimalDenom === feeMinimalDenom
+      );
+
       if (feeCurrency) {
         nobleEarnAmountConfig.feeConfig.setFee({
           type: feeType as FeeType,

apps/extension/src/pages/main/components/deposit-modal/qr-code.tsx

@@ -309,8 +309,7 @@ const AddressDisplay = ({
   const account = accountStore.getAccount(chainId);
   const theme = useTheme();
 
-  const isEVMOnlyChain =
-    "evm" in modularChainInfo && chainStore.isEvmOnlyChain(chainId);
+  const isEVMOnlyChain = chainStore.isEvmOnlyChain(chainId);
 
   const displayAddress = useMemo<DisplayAddress>(() => {
     const LENGTH_OF_FIRST_PART = 10;

apps/extension/src/pages/main/token-detail/address-chip/index.tsx

@@ -20,12 +20,7 @@ export const AddressChip: FunctionComponent<{
   const { accountStore, chainStore } = useStore();
 
   const modularChainInfo = chainStore.getModularChain(chainId);
-  const isEVMOnlyChain = (() => {
-    if (!("cosmos" in modularChainInfo) && "evm" in modularChainInfo) {
-      return true;
-    }
-    return false;
-  })();
+  const isEVMOnlyChain = chainStore.isEvmOnlyChain(chainId);
 
   const theme = useTheme();
 

apps/extension/src/pages/main/token-detail/receive-modal/index.tsx

@@ -30,9 +30,7 @@ export const ReceiveModal: FunctionComponent<{
   const isStarknetChain =
     "starknet" in modularChainInfo && modularChainInfo.starknet != null;
   const isEVMOnlyChain =
-    "evm" in modularChainInfo &&
-    modularChainInfo.evm != null &&
-    chainStore.isEvmOnlyChain(chainId);
+    "evm" in modularChainInfo && chainStore.isEvmOnlyChain(chainId);
   const isBitcoin =
     "bitcoin" in modularChainInfo && modularChainInfo.bitcoin != null;
 
@@ -43,7 +41,7 @@ export const ReceiveModal: FunctionComponent<{
     }
 
     if (isEVMOnlyChain) {
-      const hex = `0x${modularChainInfo.evm?.chainId.toString(16)}`;
+      const hex = `0x${modularChainInfo.evm.chainId.toString(16)}`;
       return `ethereum:${account.ethereumHexAddress}@${hex}`;
     }
 

apps/extension/src/pages/setting/token/add/index.tsx

@@ -153,10 +153,7 @@ export const SettingTokenAddPage: FunctionComponent = observer(() => {
   const isSecretWasm = chainStore
     .getModularChainInfoImpl(chainId)
     .hasFeature("secretwasm");
-  const isEvmChain =
-    "evm" in modularChainInfo &&
-    modularChainInfo?.evm &&
-    chainStore.isEvmChain(modularChainInfo.chainId);
+  const isEvmChain = chainStore.isEvmChain(modularChainInfo.chainId);
   const isStarknet =
     modularChainInfo != null &&
     "starknet" in modularChainInfo &&

apps/extension/src/stores/ui-config/manage-view-asset-token.ts

@@ -109,50 +109,11 @@ export class ManageViewAssetTokenConfig {
         return true;
       }
 
-      if ("cosmos" in modularChainInfo) {
-        for (const coinMinimalDenom of coinMinimaldenomSet.values()) {
-          const currency = modularChainInfoImpl.findCurrency(coinMinimalDenom);
-          if (currency) {
-            if (currency.coinDenom.toLowerCase().includes(searchLower)) {
-              return true;
-            }
-          }
-        }
-      }
-      if ("evm" in modularChainInfo) {
-        for (const coinMinimalDenom of coinMinimaldenomSet.values()) {
-          const currency = modularChainInfo.evm.currencies.find(
-            (currency) => currency.coinMinimalDenom === coinMinimalDenom
-          );
-          if (currency) {
-            if (currency.coinDenom.toLowerCase().includes(search)) {
-              return true;
-            }
-          }
-        }
-      }
-      if ("bitcoin" in modularChainInfo) {
-        for (const coinMinimalDenom of coinMinimaldenomSet.values()) {
-          const currency = modularChainInfo.bitcoin.currencies.find(
-            (currency) => currency.coinMinimalDenom === coinMinimalDenom
-          );
-          if (currency) {
-            if (currency.coinDenom.toLowerCase().includes(search)) {
-              return true;
-            }
-          }
-        }
-      }
-      if ("starknet" in modularChainInfo) {
-        for (const coinMinimalDenom of coinMinimaldenomSet.values()) {
-          const currency = modularChainInfo.starknet.currencies.find(
-            (currency) => currency.coinMinimalDenom === coinMinimalDenom
-          );
-
-          if (currency) {
-            if (currency.coinDenom.toLowerCase().includes(search)) {
-              return true;
-            }
+      for (const coinMinimalDenom of coinMinimaldenomSet.values()) {
+        const currency = modularChainInfoImpl.findCurrency(coinMinimalDenom);
+        if (currency) {
+          if (currency.coinDenom.toLowerCase().includes(searchLower)) {
+            return true;
           }
         }
       }

packages/background/src/chains/service.ts

@@ -1,4 +1,5 @@
 import {
+  convertModularChainInfoToChainInfo,
   DenomHelper,
   KVStore,
   PrefixKVStore,
@@ -1189,19 +1190,23 @@ export class ChainsService {
   ): ModularChainInfo[] {
     return modularChainInfos.map((modularChainInfo) => {
       if ("cosmos" in modularChainInfo) {
-        const cosmos = this.getChainInfoOrThrow(modularChainInfo.chainId);
-        const mergedCosmos = this.mergeChainInfosWithDynamics([cosmos])[0];
+        const chainInfo = convertModularChainInfoToChainInfo(
+          modularChainInfo
+        ) as ChainInfo;
+        const mergedCosmos = this.mergeChainInfosWithDynamics([chainInfo])[0];
+
+        const { evm, ...cosmos } = mergedCosmos;
 
         return {
           chainId: cosmos.chainId,
           chainName: cosmos.chainName,
           chainSymbolImageUrl: cosmos.chainSymbolImageUrl,
           isTestnet: cosmos.isTestnet,
-          isNative: !(mergedCosmos.beta ?? false),
-          cosmos: mergedCosmos,
-          ...(mergedCosmos.evm && {
+          isNative: !mergedCosmos.beta,
+          cosmos,
+          ...(!!evm && {
             evm: {
-              ...mergedCosmos.evm,
+              ...evm,
               currencies: mergedCosmos.currencies,
               feeCurrencies: mergedCosmos.feeCurrencies,
               bip44: mergedCosmos.bip44,
@@ -1346,15 +1351,17 @@ export class ChainsService {
               } as ModularChainInfo;
             }
 
+            const { evm, ...cosmos } = chainInfo;
+
             return {
               chainId: chainInfo.chainId,
               chainName: chainInfo.chainName,
               chainSymbolImageUrl: chainInfo.chainSymbolImageUrl,
               isNative: false,
-              cosmos: chainInfo,
-              ...(chainInfo.evm && {
+              cosmos,
+              ...(!!evm && {
                 evm: {
-                  ...chainInfo.evm,
+                  ...evm,
                   currencies: chainInfo.currencies,
                   feeCurrencies: chainInfo.feeCurrencies,
                   bip44: chainInfo.bip44,

packages/stores/src/chain/base.ts

@@ -1774,10 +1774,6 @@ export class ChainStore<C extends ChainInfo = ChainInfo>
       return new ChainInfoImpl(chainInfo, this);
     });
     this._modularChainInfos = infos.modulrChainInfos.map((chainInfo) => {
-      if ("evm" in chainInfo) {
-        return chainInfo;
-      }
-
       if ("currencies" in chainInfo) {
         const cosmos = infos.chainInfos.find(
           (c) => c.chainId === chainInfo.chainId
@@ -1801,6 +1797,7 @@ export class ChainStore<C extends ChainInfo = ChainInfo>
           }),
         };
       }
+
       return chainInfo;
     });
     this._modularChainInfoImpls = infos.modulrChainInfos.map((chainInfo) => {

packages/stores/src/query/balances.ts

@@ -91,14 +91,13 @@ export class ObservableQueryBalancesImplMap {
    */
   @computed
   get balances(): IObservableQueryBalanceImpl[] {
-    const currencies = [];
     const result = [];
 
     const modularChainInfoImpl = this.chainGetter.getModularChainInfoImpl(
       this.chainId
     );
 
-    currencies.push(...modularChainInfoImpl.getCurrencies());
+    const currencies = modularChainInfoImpl.getCurrencies();
 
     for (let i = 0; i < currencies.length; i++) {
       const currency = currencies[i];

packages/types/src/chain-info.ts

@@ -104,7 +104,7 @@ export interface ModularChainInfoBase {
 export type ModularChainInfo = ModularChainInfoBase &
   (
     | {
-        readonly cosmos: ChainInfo;
+        readonly cosmos: Omit<ChainInfo, "evm">;
       }
     | {
         readonly starknet: StarknetChainInfo;
@@ -117,7 +117,7 @@ export type ModularChainInfo = ModularChainInfoBase &
         readonly evm: EVMNativeChainInfo;
       }
     | {
-        readonly cosmos: ChainInfo;
+        readonly cosmos: Omit<ChainInfo, "evm">;
         readonly evm: EVMNativeChainInfo;
       }
   );