DimensionDev · guanbinrui · Mar 23, 2022 · Mar 1, 2022 · Mar 1, 2022 · Mar 1, 2022
diff --git a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx
@@ -12,6 +12,7 @@ import {
     useWeb3State,
     Web3Plugin,
 } from '@masknet/plugin-infra'
+import { ChainId } from '@masknet/web3-shared-evm'
 import { useDashboardI18N } from '../../../../locales'
 import { ChangeNetworkTip } from './ChangeNetworkTip'
 import { getTokenUSDValue } from '../../utils/getTokenUSDValue'
@@ -151,7 +152,7 @@ export const FungibleTokenTableRow = memo<TokenTableRowProps>(({ asset, onSend,
                         </span>
                     </Tooltip>
                     <Tooltip
-                        disableHoverListener={isOnCurrentChain}
+                        disableHoverListener={isOnCurrentChain || asset.token.chainId !== ChainId.Conflux}
                         disableTouchListener
                         title={<ChangeNetworkTip chainId={asset.token.chainId} />}
                         placement="top"
@@ -160,8 +161,12 @@ export const FungibleTokenTableRow = memo<TokenTableRowProps>(({ asset, onSend,
                         <span>
                             <Button
                                 size="small"
-                                style={!isOnCurrentChain ? { pointerEvents: 'none' } : {}}
-                                disabled={!isOnCurrentChain}
+                                style={
+                                    !isOnCurrentChain || asset.token.chainId === ChainId.Conflux
+                                        ? { pointerEvents: 'none' }
+                                        : {}
+                                }
+                                disabled={!isOnCurrentChain || asset.token.chainId === ChainId.Conflux}
                                 variant="outlined"
                                 color="secondary"
                                 onClick={onSwap}

diff --git a/packages/mask/src/components/shared/ApplicationBoard.tsx b/packages/mask/src/components/shared/ApplicationBoard.tsx
@@ -8,6 +8,7 @@ import { MaskMessages } from '../../utils/messages'
 import { useControlledDialog } from '../../utils/hooks/useControlledDialog'
 import { RedPacketPluginID } from '../../plugins/RedPacket/constants'
 import { ITO_PluginID } from '../../plugins/ITO/constants'
+import { base as ITO_Definition } from '../../plugins/ITO/base'
 import { PluginTransakMessages } from '../../plugins/Transak/messages'
 import { PluginPetMessages } from '../../plugins/Pets/messages'
 import { ClaimAllDialog } from '../../plugins/ITO/SNSAdaptor/ClaimAllDialog'
@@ -229,6 +230,10 @@ export function ApplicationBoard({ secondEntries, secondEntryChainTabs }: MaskAp
         }
     }
 
+    // Todo: remove this after refactor applicationBoard
+    const isITOSupportedChain =
+        ITO_Definition.enableRequirement.web3![NetworkPluginID.PLUGIN_EVM]?.supportedChainIds?.includes(currentChainId)
+
     const firstLevelEntries: MaskAppEntry[] = [
         createEntry(
             'Lucky Drop',
@@ -250,14 +255,14 @@ export function ApplicationBoard({ secondEntries, secondEntryChainTabs }: MaskAp
             new URL('./assets/token.png', import.meta.url).toString(),
             () => openEncryptedMessage(ITO_PluginID),
             undefined,
-            isNotEvm,
+            !isITOSupportedChain,
         ),
         createEntry(
             'Claim',
             new URL('./assets/gift.png', import.meta.url).toString(),
             onClaimAllDialogOpen,
             undefined,
-            isNotEvm,
+            !isITOSupportedChain,
         ),
         createEntry(
             'Mask Bridge',
@@ -287,7 +292,7 @@ export function ApplicationBoard({ secondEntries, secondEntryChainTabs }: MaskAp
             new URL('./assets/swap.png', import.meta.url).toString(),
             onSwapDialogOpen,
             undefined,
-            isNotEvm,
+            isNotEvm || currentChainId === ChainId.Conflux,
         ),
         createEntry(
             'Fiat On-Ramp',

diff --git a/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx b/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx
@@ -1,5 +1,5 @@
 import { makeStyles } from '@masknet/theme'
-import { isLessThan } from '@masknet/web3-shared-base'
+import { isLessThan, pow10 } from '@masknet/web3-shared-base'
 import { memo, useEffect, useMemo, useState } from 'react'
 import { useI18N } from '../../../../../utils'
 import { useAsync, useAsyncFn, useUpdateEffect } from 'react-use'
@@ -90,9 +90,10 @@ const useStyles = makeStyles()((theme) => ({
     },
 }))
 
-const minGasPriceOfChain: ChainIdOptionalRecord<string> = {
-    [ChainId.BSC]: '0x12a05f200', // 5
-    [ChainId.Matic]: '0x6fc23ac00', // 30
+const minGasPriceOfChain: ChainIdOptionalRecord<BigNumber.Value> = {
+    [ChainId.BSC]: pow10(9).multipliedBy(5), // 5 Gwei
+    [ChainId.Conflux]: pow10(9).multipliedBy(5), // 5 Gwei
+    [ChainId.Matic]: pow10(9).multipliedBy(30), // 30 Gwei
 }
 
 export const Prior1559GasSetting = memo(() => {
@@ -111,7 +112,8 @@ export const Prior1559GasSetting = memo(() => {
     // #region Get gas options from debank
     const { value: gasOptions } = useAsync(async () => {
         const response = await WalletRPC.getGasPriceDictFromDeBank(chainId)
-        if (!response) return { slow: 0, standard: 0, fast: 0 }
+
+        if (!response) return null
 
         return {
             slow: response.data.slow.price,
@@ -122,20 +124,23 @@ export const Prior1559GasSetting = memo(() => {
     // #endregion
 
     const options = useMemo(
-        () => [
-            {
-                title: t('popups_wallet_gas_fee_settings_low'),
-                gasPrice: gasOptions?.slow ?? 0,
-            },
-            {
-                title: t('popups_wallet_gas_fee_settings_medium'),
-                gasPrice: gasOptions?.standard ?? 0,
-            },
-            {
-                title: t('popups_wallet_gas_fee_settings_high'),
-                gasPrice: gasOptions?.fast ?? 0,
-            },
-        ],
+        () =>
+            gasOptions
+                ? [
+                      {
+                          title: t('popups_wallet_gas_fee_settings_low'),
+                          gasPrice: gasOptions?.slow ?? 0,
+                      },
+                      {
+                          title: t('popups_wallet_gas_fee_settings_medium'),
+                          gasPrice: gasOptions?.standard ?? 0,
+                      },
+                      {
+                          title: t('popups_wallet_gas_fee_settings_high'),
+                          gasPrice: gasOptions?.fast ?? 0,
+                      },
+                  ]
+                : null,
         [gasOptions],
     )
 
@@ -222,7 +227,7 @@ export const Prior1559GasSetting = memo(() => {
     }, [minGasLimit, gas, setValue])
 
     useEffect(() => {
-        if (selected !== null) setValue('gasPrice', formatWeiToGwei(options[selected].gasPrice).toString())
+        if (selected !== null && options) setValue('gasPrice', formatWeiToGwei(options[selected].gasPrice).toString())
     }, [selected, setValue, options])
 
     const [{ loading }, handleConfirm] = useAsyncFn(
@@ -257,25 +262,27 @@ export const Prior1559GasSetting = memo(() => {
 
     return (
         <>
-            <div className={classes.options}>
-                {options.map(({ title, gasPrice }, index) => (
-                    <div
-                        key={index}
-                        onClick={() => setOption(index)}
-                        className={selected === index ? classes.selected : undefined}>
-                        <Typography className={classes.optionsTitle}>{title}</Typography>
-                        <Typography>{formatWeiToGwei(gasPrice ?? 0).toString()} Gwei</Typography>
-                        <Typography className={classes.gasUSD}>
-                            {t('popups_wallet_gas_fee_settings_usd', {
-                                usd: formatWeiToEther(gasPrice)
-                                    .times(nativeTokenPrice)
-                                    .times(minGasLimit || 21000)
-                                    .toPrecision(3),
-                            })}
-                        </Typography>
-                    </div>
-                ))}
-            </div>
+            {options ? (
+                <div className={classes.options}>
+                    {options.map(({ title, gasPrice }, index) => (
+                        <div
+                            key={index}
+                            onClick={() => setOption(index)}
+                            className={selected === index ? classes.selected : undefined}>
+                            <Typography className={classes.optionsTitle}>{title}</Typography>
+                            <Typography>{formatWeiToGwei(gasPrice ?? 0).toString()} Gwei</Typography>
+                            <Typography className={classes.gasUSD}>
+                                {t('popups_wallet_gas_fee_settings_usd', {
+                                    usd: formatWeiToEther(gasPrice)
+                                        .times(nativeTokenPrice)
+                                        .times(minGasLimit || 21000)
+                                        .toPrecision(3),
+                                })}
+                            </Typography>
+                        </div>
+                    ))}
+                </div>
+            ) : null}
             <form onSubmit={onSubmit}>
                 <Typography className={classes.label}>{t('popups_wallet_gas_fee_settings_gas_limit')}</Typography>
                 <Controller

diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/createGetLatestBalance.ts b/packages/mask/src/plugins/EVM/UI/Web3State/createGetLatestBalance.ts
@@ -0,0 +1,10 @@
+import { ChainId, Web3ProviderType, createWeb3 } from '@masknet/web3-shared-evm'
+
+export function createGetLatestBalance(context: Web3ProviderType) {
+    return (chainId: ChainId, account: string) => {
+        const web3 = createWeb3(context.request, () => ({
+            chainId,
+        }))
+        return web3.eth.getBalance(account)
+    }
+}
diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts
@@ -11,15 +11,27 @@ import {
     Web3ProviderType,
     FungibleAssetProvider,
     createExternalProvider,
+    getCoinGeckoCoinId,
+    CurrencyType,
+    PriceRecord,
+    ChainId,
 } from '@masknet/web3-shared-evm'
+import BigNumber from 'bignumber.js'
 import { Pageable, Pagination, TokenType, Web3Plugin } from '@masknet/plugin-infra'
 import BalanceCheckerABI from '@masknet/web3-contracts/abis/BalanceChecker.json'
 import ERC721ABI from '@masknet/web3-contracts/abis/ERC721.json'
 import type { AbiItem } from 'web3-utils'
 import { uniqBy } from 'lodash-unified'
 import { PLUGIN_NETWORKS } from '../../constants'
 import { makeSortAssertWithoutChainFn } from '../../utils/token'
+import { createGetLatestBalance } from './createGetLatestBalance'
 import type { ERC721 } from '@masknet/web3-contracts/types/ERC721'
+import { pow10 } from '@masknet/web3-shared-base'
+import { TokenPrice } from '@masknet/web3-providers'
+
+// tokens unavailable neither from api or balance checker.
+// https://forum.conflux.fun/t/how-to-upvote-debank-proposal-for-conflux-espace-integration/13935
+const TokenUnavailableFromDebankList = [ChainId.Conflux]
 
 export const getFungibleAssetsFn =
     (context: Web3ProviderType) =>
@@ -28,9 +40,12 @@ export const getFungibleAssetsFn =
         const wallet = context.wallets.getCurrentValue().find((x) => isSameAddress(x.address, address))
         const socket = await context.providerSocket
         const networks = PLUGIN_NETWORKS
-        const trustedTokens = context.erc20Tokens
-            .getCurrentValue()
-            .filter((x) => wallet?.erc20_token_whitelist.has(formatEthereumAddress(x.address)))
+        const trustedTokens = uniqBy(
+            context.erc20Tokens
+                .getCurrentValue()
+                .filter((x) => wallet?.erc20_token_whitelist.has(formatEthereumAddress(x.address))),
+            (x) => `${x.chainId}_${formatEthereumAddress(x.address)}`,
+        )
 
         const web3 = new Web3(
             createExternalProvider(context.request, context.getSendOverrides, context.getRequestOptions),
@@ -66,22 +81,28 @@ export const getFungibleAssetsFn =
             },
         }))
 
-        if (!BALANCE_CHECKER_ADDRESS) return assetsFromProvider
-        const balanceCheckerContract = createContract(web3, BALANCE_CHECKER_ADDRESS, BalanceCheckerABI as AbiItem[])
-        if (!balanceCheckerContract) return assetsFromProvider
-        let balanceList: string[]
-        try {
-            balanceList = await balanceCheckerContract?.methods
-                .balances(
-                    [address],
-                    trustedTokens.map((x) => x.address),
-                )
-                .call({
-                    from: undefined,
-                })
-            if (balanceList.length !== trustedTokens?.length) return assetsFromProvider
-        } catch {
-            balanceList = []
+        const balanceCheckerContract = createContract(
+            web3,
+            BALANCE_CHECKER_ADDRESS ?? '',
+            BalanceCheckerABI as AbiItem[],
+        )
+
+        let balanceList: string[] = []
+
+        if (BALANCE_CHECKER_ADDRESS && balanceCheckerContract) {
+            try {
+                balanceList = await balanceCheckerContract?.methods
+                    .balances(
+                        [address],
+                        trustedTokens.map((x) => x.address),
+                    )
+                    .call({
+                        from: address,
+                    })
+                if (balanceList.length !== trustedTokens?.length) return assetsFromProvider
+            } catch {
+                balanceList = []
+            }
         }
 
         const assetFromChain = balanceList.map(
@@ -101,6 +122,27 @@ export const getFungibleAssetsFn =
 
         const allTokens = [...assetsFromProvider, ...assetFromChain]
 
+        const getBalance = createGetLatestBalance(context)
+        const allRequest = TokenUnavailableFromDebankList.map(async (x) => {
+            const balance = await getBalance(x, address)
+            const coinId = getCoinGeckoCoinId(x)
+            const price = (await TokenPrice.getNativeTokenPrice([coinId], CurrencyType.USD))[coinId]
+
+            return {
+                chainId: x,
+                price: price,
+                balance,
+            }
+        })
+
+        const tokenUnavailableFromDebankResults = (await Promise.allSettled(allRequest))
+            .map((x) => (x.status === 'fulfilled' ? x.value : null))
+            .filter((x) => Boolean(x)) as {
+            chainId: ChainId
+            balance: string
+            price: PriceRecord
+        }[]
+
         const nativeTokens: Web3Plugin.Asset<Web3Plugin.FungibleToken>[] = networks
             .filter(
                 (t) =>
@@ -113,11 +155,19 @@ export const getFungibleAssetsFn =
             )
             .map((x) => {
                 const nativeToken = createNativeToken(x.chainId)
+                const result = tokenUnavailableFromDebankResults.find((y) => y.chainId === x.chainId)
                 return {
                     id: nativeToken.address,
                     chainId: x.chainId,
                     token: { ...nativeToken, id: nativeToken.address!, type: TokenType.Fungible },
-                    balance: '0',
+                    balance: result?.balance ?? '0',
+                    price: result?.price,
+                    value: {
+                        [CurrencyType.USD]: new BigNumber(result?.balance ?? '0')
+                            .dividedBy(pow10(nativeToken.decimals))
+                            .multipliedBy(result ? result.price[CurrencyType.USD] : '0')
+                            .toFixed(),
+                    },
                 }
             })
 

diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/index.ts b/packages/mask/src/plugins/EVM/UI/Web3State/index.ts
@@ -27,8 +27,9 @@ import {
     createExternalProvider,
 } from '@masknet/web3-shared-evm'
 import { getStorage } from '../../storage'
-import { getFungibleAssetsFn, getNonFungibleTokenFn } from './getAssetsFn'
 
+import { getFungibleAssetsFn, getNonFungibleTokenFn } from './getAssetsFn'
+import { createGetLatestBalance } from './createGetLatestBalance'
 const ZERO_X_ERROR_ADDRESS = '0x'
 
 export function fixWeb3State(state?: Web3Plugin.ObjectCapabilities.Capabilities, context?: Web3ProviderType) {
@@ -114,12 +115,7 @@ export function fixWeb3State(state?: Web3Plugin.ObjectCapabilities.Capabilities,
         },
     }
     state.Utils = state.Utils ?? {
-        getLatestBalance: (chainId: ChainId, account: string) => {
-            const web3 = createWeb3(context.request, () => ({
-                chainId,
-            }))
-            return web3.eth.getBalance(account)
-        },
+        getLatestBalance: createGetLatestBalance(context),
         getLatestBlockNumber: (chainId: ChainId) => {
             const web3 = createWeb3(context.request, () => ({
                 chainId,

diff --git a/packages/mask/src/plugins/EVM/assets/conflux.png b/packages/mask/src/plugins/EVM/assets/conflux.png
diff --git a/packages/mask/src/plugins/EVM/constants.ts b/packages/mask/src/plugins/EVM/constants.ts
@@ -167,6 +167,16 @@ export const PLUGIN_NETWORKS: Web3Plugin.NetworkDescriptor[] = [
         iconColor: 'rgb(112, 212, 74)',
         isMainnet: true,
     },
+    {
+        ID: `${PLUGIN_ID}_conflux`,
+        networkSupporterPluginID: PLUGIN_ID,
+        chainId: ChainId.Conflux,
+        type: NetworkType.Conflux,
+        name: 'Conflux',
+        icon: new URL('./assets/conflux.png', import.meta.url),
+        iconColor: 'rgb(112, 212, 74)',
+        isMainnet: true,
+    },
 ]
 export const PLUGIN_PROVIDERS: Web3Plugin.ProviderDescriptor[] = [
     {