From fd4c9922b3bb7940fc209c7f7701fcad2ad5c437 Mon Sep 17 00:00:00 2001
From: guanbinrui <guanbinrui@dimension.im>
Date: Sat, 11 Jun 2022 14:49:41 +0800
Subject: [PATCH] refactor: move useGasConfig to EVM hooks

---
 .../src/plugins/Tips/components/TokenSection/index.tsx    | 2 +-
 .../mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx  | 8 ++++----
 packages/plugin-infra/src/web3/EVM/index.ts               | 1 +
 .../hooks => plugin-infra/src/web3/EVM}/useGasConfig.ts   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename packages/{mask/src/plugins/Trader/SNSAdaptor/trader/hooks => plugin-infra/src/web3/EVM}/useGasConfig.ts (95%)

diff --git a/packages/mask/src/plugins/Tips/components/TokenSection/index.tsx b/packages/mask/src/plugins/Tips/components/TokenSection/index.tsx
index 3a241b638d13..3ba8bc47f0b6 100644
--- a/packages/mask/src/plugins/Tips/components/TokenSection/index.tsx
+++ b/packages/mask/src/plugins/Tips/components/TokenSection/index.tsx
@@ -1,3 +1,4 @@
+import { useGasConfig } from '@masknet/plugin-infra/web3-evm'
 import { useFungibleTokenBalance, useGasPrice, useWeb3State } from '@masknet/plugin-infra/web3'
 import { usePickToken } from '@masknet/shared'
 import { NetworkPluginID } from '@masknet/web3-shared-base'
@@ -5,7 +6,6 @@ import { isNativeTokenAddress } from '@masknet/web3-shared-evm'
 import BigNumber from 'bignumber.js'
 import { FC, useCallback, useEffect, useMemo } from 'react'
 import { TokenAmountPanel } from '../../../../web3/UI/TokenAmountPanel'
-import { useGasConfig } from '../../../Trader/SNSAdaptor/trader/hooks/useGasConfig'
 import { TargetChainIdContext, useTip } from '../../contexts'
 
 const GAS_LIMIT = 21000
diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx
index 96569b9ceb34..f5f916f63e8f 100644
--- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx
+++ b/packages/mask/src/plugins/Trader/SNSAdaptor/trader/Trader.tsx
@@ -1,3 +1,5 @@
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useUnmount, useUpdateEffect } from 'react-use'
 import { delay } from '@dimensiondev/kit'
 import { useOpenShareTxDialog, usePickToken } from '@masknet/shared'
 import { makeStyles, useStylesExtends } from '@masknet/theme'
@@ -10,8 +12,8 @@ import {
     useTokenConstants,
     UST,
 } from '@masknet/web3-shared-evm'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useUnmount, useUpdateEffect } from 'react-use'
+import { useGasConfig } from '@masknet/plugin-infra/web3-evm'
+import { useChainId, useChainIdValid, useFungibleTokenBalance, useWallet, useAccount } from '@masknet/plugin-infra/web3'
 import { activatedSocialNetworkUI } from '../../../../social-network'
 import { isFacebook } from '../../../../social-network-adaptor/facebook.com/base'
 import { isTwitter } from '../../../../social-network-adaptor/twitter.com/base'
@@ -25,10 +27,8 @@ import { useTradeCallback } from '../../trader/useTradeCallback'
 import type { Coin } from '../../types'
 import { TokenPanelType, TradeInfo } from '../../types'
 import { ConfirmDialog } from './ConfirmDialog'
-import { useGasConfig } from './hooks/useGasConfig'
 import { useSortedTrades } from './hooks/useSortedTrades'
 import { useUpdateBalance } from './hooks/useUpdateBalance'
-import { useChainId, useChainIdValid, useFungibleTokenBalance, useWallet, useAccount } from '@masknet/plugin-infra/web3'
 import { SettingsDialog } from './SettingsDialog'
 import { TradeForm } from './TradeForm'
 
diff --git a/packages/plugin-infra/src/web3/EVM/index.ts b/packages/plugin-infra/src/web3/EVM/index.ts
index 36d592ccec0b..13b28f9e7d1c 100644
--- a/packages/plugin-infra/src/web3/EVM/index.ts
+++ b/packages/plugin-infra/src/web3/EVM/index.ts
@@ -7,6 +7,7 @@ export * from './useERC721TokenByIndex'
 export * from './useERC721ContractIsApproveForAll'
 export * from './useERC721ContractSetApproveForAllCallback'
 export * from './useERC721TokenTransferCallback'
+export * from './useGasConfig'
 export * from './useMulticall'
 export * from './useNativeTokenTransferCallback'
 export * from './useNativeTokenWrapperCallback'
diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGasConfig.ts b/packages/plugin-infra/src/web3/EVM/useGasConfig.ts
similarity index 95%
rename from packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGasConfig.ts
rename to packages/plugin-infra/src/web3/EVM/useGasConfig.ts
index b29116c95897..8846b45668e8 100644
--- a/packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGasConfig.ts
+++ b/packages/plugin-infra/src/web3/EVM/useGasConfig.ts
@@ -1,8 +1,8 @@
 import { useState } from 'react'
 import { useAsync } from 'react-use'
 import { GasOptionConfig, formatGweiToWei, ChainId } from '@masknet/web3-shared-evm'
-import { useGasOptions } from '@masknet/plugin-infra/web3'
 import { GasOptionType, NetworkPluginID } from '@masknet/web3-shared-base'
+import { useGasOptions } from '../useGasOptions'
 
 // TODO: support multiple chain
 export function useGasConfig(chainId: ChainId) {