diff --git a/package.json b/package.json
index 853e066c325f..d8f48100f2d7 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "yarn": ">=999.0.0",
     "npm": ">=999.0.0"
   },
-  "version": "2.8.0",
+  "version": "2.9.0",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
diff --git a/packages/dashboard/src/locales/qya-AA.json b/packages/dashboard/src/locales/qya-AA.json
index fd59188c81fa..dfab6f0d573f 100644
--- a/packages/dashboard/src/locales/qya-AA.json
+++ b/packages/dashboard/src/locales/qya-AA.json
@@ -186,7 +186,6 @@
     "wallets_add_token_next": "crwdns1787:0crwdne1787:0",
     "wallets_empty_tokens_tip": "crwdns1789:0crwdne1789:0",
     "wallets_empty_collectible_tip": "crwdns1791:0crwdne1791:0",
-    "wallets_reload": "crwdns17240:0crwdne17240:0",
     "wallets_address_copied": "crwdns1793:0crwdne1793:0",
     "public_key_copied": "crwdns16574:0crwdne16574:0",
     "wallets_address_copy": "crwdns1795:0crwdne1795:0",
diff --git a/packages/mask/shared-ui/locales/en-US.json b/packages/mask/shared-ui/locales/en-US.json
index 41ba082b3a94..30924df501d6 100644
--- a/packages/mask/shared-ui/locales/en-US.json
+++ b/packages/mask/shared-ui/locales/en-US.json
@@ -896,7 +896,7 @@
     "popups_social_account": "Social Accounts",
     "popups_connected_wallets": "Connected Wallets",
     "popups_loading": "Loading",
-    "popups_connect_your_web2_social_accounts": "Connect your web2 social accounts",
+    "popups_connect_your_web2_social_accounts": "Connect your social media accounts",
     "popups_connect_social_account": "Connect Social Account",
     "popups_disconnect_success": " Disconnect successfully. ",
     "popups_disconnect_failed": "Disconnect failed.",
diff --git a/packages/mask/shared-ui/locales/qya-AA.json b/packages/mask/shared-ui/locales/qya-AA.json
index 6c4a154a8b3f..e430fbf22a3a 100644
--- a/packages/mask/shared-ui/locales/qya-AA.json
+++ b/packages/mask/shared-ui/locales/qya-AA.json
@@ -98,7 +98,6 @@
     "copy_success_of_image": "crwdns4039:0crwdne4039:0",
     "connecting": "crwdns4043:0crwdne4043:0",
     "collectibles_name": "crwdns16232:0crwdne16232:0",
-    "select_an_nft": "crwdns17246:0crwdne17246:0",
     "create": "crwdns4047:0crwdne4047:0",
     "copied": "crwdns9361:0crwdne9361:0",
     "daily": "crwdns4057:0crwdne4057:0",
@@ -356,10 +355,57 @@
     "application_hint": "crwdns16628:0crwdne16628:0",
     "plugin_red_packet_create": "crwdns11873:0crwdne11873:0",
     "plugin_red_packet_claimed": "crwdns16926:0crwdne16926:0",
+    "plugin_red_packet_erc20_tab_title": "crwdns16928:0crwdne16928:0",
+    "plugin_red_packet_erc721_tab_title": "crwdns16930:0crwdne16930:0",
+    "plugin_red_packet_name": "crwdns16932:0crwdne16932:0",
+    "plugin_red_packet_recommend_feature_description": "crwdns16934:0crwdne16934:0",
+    "plugin_red_packet_description": "crwdns16936:0crwdne16936:0",
+    "plugin_red_packet_erc721_insufficient_balance": "crwdns16938:0crwdne16938:0",
+    "plugin_red_packet_details": "crwdns16940:0crwdne16940:0",
+    "plugin_red_packet_split_mode": "crwdns16942:0crwdne16942:0",
+    "plugin_red_packet_average": "crwdns16944:0crwdne16944:0",
+    "plugin_red_packet_random": "crwdns16946:0crwdne16946:0",
+    "plugin_red_packet_shares": "crwdns16948:0crwdne16948:0",
+    "plugin_red_packet_best_wishes": "crwdns16950:0crwdne16950:0",
+    "plugin_red_packet_create_new": "crwdns16952:0crwdne16952:0",
     "plugin_red_packet_claim": "crwdns16954:0crwdne16954:0",
+    "plugin_red_packet_claiming": "crwdns16956:0crwdne16956:0",
+    "plugin_red_packet_refund": "crwdns16958:0crwdne16958:0",
+    "plugin_red_packet_empty": "crwdns16960:0crwdne16960:0",
+    "plugin_red_packet_data_broken": "crwdns16962:0{{duration}}crwdne16962:0",
+    "plugin_red_packet_refunding": "crwdns16964:0crwdne16964:0",
+    "plugin_red_packet_select_existing": "crwdns16966:0crwdne16966:0",
+    "plugin_red_packet_share_unclaimed_message_official_account": "crwdns16968:0{{sender}}crwdnd16968:0{{network}}crwdnd16968:0{{account}}crwdnd16968:0{{payload}}crwdne16968:0",
+    "plugin_red_packet_share_unclaimed_message_not_twitter": "crwdns16970:0{{sender}}crwdnd16970:0{{network}}crwdnd16970:0{{payload}}crwdne16970:0",
+    "plugin_red_packet_share_message_official_account": "crwdns16972:0{{sender}}crwdnd16972:0{{network}}crwdnd16972:0{{account}}crwdnd16972:0{{payload}}crwdne16972:0",
+    "plugin_red_packet_share_message_not_twitter": "crwdns16974:0{{sender}}crwdnd16974:0{{network}}crwdnd16974:0{{payload}}crwdne16974:0",
+    "plugin_red_packet_nft_share_foreshow_message": "crwdns16976:0{{sender}}crwdnd16976:0{{network}}crwdnd16976:0{{account}}crwdnd16976:0{{payload}}crwdne16976:0",
+    "plugin_red_packet_nft_share_foreshow_message_not_twitter": "crwdns16978:0{{sender}}crwdnd16978:0{{network}}crwdnd16978:0{{payload}}crwdne16978:0",
+    "plugin_red_packet_nft_share_claimed_message": "crwdns16980:0{{sender}}crwdnd16980:0{{network}}crwdnd16980:0{{account}}crwdnd16980:0{{payload}}crwdne16980:0",
+    "plugin_red_packet_nft_share_claimed_message_not_twitter": "crwdns16982:0{{sender}}crwdnd16982:0{{network}}crwdnd16982:0{{payload}}crwdne16982:0",
+    "plugin_red_packet_nft_tip": "crwdns16984:0crwdne16984:0",
+    "plugin_red_packet_nft_no_history": "crwdns16986:0crwdne16986:0",
+    "plugin_red_packet_attached_message": "crwdns16988:0crwdne16988:0",
+    "plugin_red_packet_from": "crwdns16990:0{{name}}crwdne16990:0",
+    "plugin_red_packet_description_claimed": "crwdns16992:0{{amount}}crwdnd16992:0{{symbol}}crwdne16992:0",
+    "plugin_red_packet_description_expired": "crwdns16994:0crwdne16994:0",
+    "plugin_red_packet_description_refunded": "crwdns16996:0crwdne16996:0",
+    "plugin_red_packet_description_refund": "crwdns16998:0{{balance}}crwdnd16998:0{{symbol}}crwdne16998:0",
+    "plugin_red_packet_description_empty": "crwdns17000:0crwdne17000:0",
+    "plugin_red_packet_description_broken": "crwdns17002:0crwdne17002:0",
+    "plugin_red_packet_description_failover": "crwdns17004:0{{shares}}crwdnd17004:0{{total}}crwdnd17004:0{{symbol}}crwdne17004:0",
+    "plugin_red_packet_amount_per_share": "crwdns17006:0crwdne17006:0",
+    "plugin_red_packet_send_symbol": "crwdns17008:0{{amount}}crwdnd17008:0{{symbol}}crwdne17008:0",
+    "plugin_red_packet_amount_total": "crwdns17010:0crwdne17010:0",
+    "plugin_red_packet_next": "crwdns17012:0crwdne17012:0",
+    "plugin_red_packet_back": "crwdns17014:0crwdne17014:0",
+    "plugin_red_packet_hint": "crwdns17016:0crwdne17016:0",
+    "plugin_red_packet_token": "crwdns17018:0crwdne17018:0",
+    "plugin_red_packet_message_label": "crwdns17020:0crwdne17020:0",
     "plugin_red_packet_create_with_token": "crwdns4775:0{{amount}}crwdnd4775:0{{symbol}}crwdne4775:0",
     "plugin_nft_red_packet_create": "crwdns11875:0crwdne11875:0",
     "plugin_red_packet_nft_account_name": "crwdns8159:0crwdne8159:0",
+    "plugin_red_packet_nft_shift_select_tip": "crwdns10819:0{{text}}crwdne10819:0",
     "plugin_gitcoin_select_a_token": "crwdns4793:0crwdne4793:0",
     "plugin_gitcoin_insufficient_balance": "crwdns4799:0{{symbol}}crwdne4799:0",
     "plugin_trader_fail_to_load": "crwdns10207:0crwdne10207:0",
diff --git a/packages/mask/shared-ui/locales/zh-CN.json b/packages/mask/shared-ui/locales/zh-CN.json
index 0dbd24f25028..e3d10e476752 100644
--- a/packages/mask/shared-ui/locales/zh-CN.json
+++ b/packages/mask/shared-ui/locales/zh-CN.json
@@ -298,6 +298,7 @@
     "plugin_red_packet_create_with_token": "使用 {{symbol}} 创建红包",
     "plugin_nft_red_packet_create": "创建一个NFT红包",
     "plugin_red_packet_nft_account_name": "钱包账户",
+    "plugin_red_packet_nft_shift_select_tip": "您也可以使用 <text>{{text}}</text> 选择多个NFT。",
     "plugin_gitcoin_select_a_token": "选择代币",
     "plugin_gitcoin_insufficient_balance": "{{symbol}} 余额不足",
     "plugin_trader_fail_to_load": "无法加载趋势信息自  ",
diff --git a/packages/mask/shared/site-adaptors/index.ts b/packages/mask/shared/site-adaptors/index.ts
index f85949604ff1..a06c3c9d8c24 100644
--- a/packages/mask/shared/site-adaptors/index.ts
+++ b/packages/mask/shared/site-adaptors/index.ts
@@ -4,4 +4,4 @@ import './implementations/facebook.com'
 import './implementations/twitter.com'
 import './implementations/minds.com'
 import './implementations/instagram.com'
-import './implementations/opensea.io'
+// add opensea
diff --git a/packages/mask/src/components/InjectedComponents/ProfileTabContent.tsx b/packages/mask/src/components/InjectedComponents/ProfileTabContent.tsx
index 63bf85fd115b..84a4027d0f9b 100644
--- a/packages/mask/src/components/InjectedComponents/ProfileTabContent.tsx
+++ b/packages/mask/src/components/InjectedComponents/ProfileTabContent.tsx
@@ -63,11 +63,7 @@ export function ProfileTabContent(props: ProfileTabContentProps) {
         return availablePlugins
             .flatMap((x) => x.ProfileTabs?.map((y) => ({ ...y, pluginID: x.ID })) ?? EMPTY_LIST)
             .filter((z) => z.Utils?.shouldDisplay?.(identity, socialAddressList) ?? true)
-    }, [
-        identity.identifier?.userId,
-        availablePlugins.map((x) => x.ID).join(),
-        socialAddressList.map((x) => x.address).join(),
-    ])
+    }, [identity, availablePlugins.map((x) => x.ID).join(), socialAddressList.map((x) => x.address).join()])
 
     const tabs = displayPlugins
         .sort((a, z) => {
diff --git a/packages/mask/src/components/shared/VerifyWallet/CurrentWalletBox.tsx b/packages/mask/src/components/shared/VerifyWallet/CurrentWalletBox.tsx
index 6a5e882e1777..65da148fa976 100644
--- a/packages/mask/src/components/shared/VerifyWallet/CurrentWalletBox.tsx
+++ b/packages/mask/src/components/shared/VerifyWallet/CurrentWalletBox.tsx
@@ -2,7 +2,6 @@ import {
     useAccount,
     useNetworkDescriptor,
     useProviderDescriptor,
-    useProviderType,
     useReverseAddress,
     useWeb3State,
 } from '@masknet/plugin-infra/web3'
@@ -105,7 +104,7 @@ export function CurrentWalletBox(props: CurrentWalletBox) {
     const { t } = useI18N()
     const { classes } = useStyles()
     const { wallet, walletName, notInPop, changeWallet } = props
-    const providerType = useProviderType(NetworkPluginID.PLUGIN_EVM)
+    const { providerType } = wallet
     const providerDescriptor = useProviderDescriptor(NetworkPluginID.PLUGIN_EVM, providerType)
     const networkDescriptor = useNetworkDescriptor(NetworkPluginID.PLUGIN_EVM)
     const frontAccount = useAccount(NetworkPluginID.PLUGIN_EVM)
@@ -133,9 +132,6 @@ export function CurrentWalletBox(props: CurrentWalletBox) {
                             <Typography className={classes.accountName}>
                                 {walletName ?? providerDescriptor?.name}
                             </Typography>
-                            {domain && Others?.formatDomainName ? (
-                                <Typography className={classes.domain}>{Others.formatDomainName(domain)}</Typography>
-                            ) : null}
                         </>
                     )}
                 </div>
diff --git a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx
index 110be98a396f..67ea8aea2ddd 100644
--- a/packages/mask/src/components/shared/VerifyWallet/Steps.tsx
+++ b/packages/mask/src/components/shared/VerifyWallet/Steps.tsx
@@ -162,7 +162,9 @@ export function Steps(props: StepsProps) {
     return (
         <div className={classes.container}>
             <CurrentWalletBox notInPop={notInPop} walletName={walletName} wallet={wallet} changeWallet={changeWallet} />
-            {notEvm && <Typography className={classes.hasBound}>{t('plugin_tips_not_evm_alert')}</Typography>}
+            {notEvm && wallet.account && (
+                <Typography className={classes.hasBound}>{t('plugin_tips_not_evm_alert')}</Typography>
+            )}
             {isBound && <Typography className={classes.hasBound}>{t('wallet_verify_has_bound')}</Typography>}
             {notConnected && (
                 <Typography className={classes.hasBound} style={{ textAlign: 'center' }}>
diff --git a/packages/mask/src/components/shared/WalletStatusBox/index.tsx b/packages/mask/src/components/shared/WalletStatusBox/index.tsx
index 0d0072c08eb1..f725032f28cc 100644
--- a/packages/mask/src/components/shared/WalletStatusBox/index.tsx
+++ b/packages/mask/src/components/shared/WalletStatusBox/index.tsx
@@ -13,7 +13,7 @@ import {
 import { FormattedAddress, useSnackbarCallback, WalletIcon } from '@masknet/shared'
 import { ProviderType } from '@masknet/web3-shared-evm'
 import { isDashboardPage } from '@masknet/shared-base'
-import { formatBalance, NetworkPluginID } from '@masknet/web3-shared-base'
+import { formatBalance } from '@masknet/web3-shared-base'
 import { useRemoteControlledDialog } from '@masknet/shared-base-ui'
 import { getMaskColor, makeStyles } from '@masknet/theme'
 import { Button, Link, Typography } from '@mui/material'
@@ -120,12 +120,12 @@ export function WalletStatusBox(props: WalletStatusBox) {
     const { classes } = useStyles({
         contentBackground: providerDescriptor?.backgroundGradient,
     })
-    const connection = useWeb3Connection(NetworkPluginID.PLUGIN_EVM)
+    const connection = useWeb3Connection()
     const chainId = useChainId()
     const account = useAccount()
     const wallet = useWallet()
-    const { value: balance = '0' } = useBalance()
-    const { value: nativeToken } = useNativeToken(NetworkPluginID.PLUGIN_EVM)
+    const { value: balance = '0', loading: loadingBalance } = useBalance()
+    const { value: nativeToken, loading: loadingNativeToken } = useNativeToken()
     const networkDescriptor = useNetworkDescriptor()
     const { Others } = useWeb3State()
     const { value: domain } = useReverseAddress(undefined, account)
@@ -200,30 +200,29 @@ export function WalletStatusBox(props: WalletStatusBox) {
                             <LinkOutIcon className={classNames(classes.icon, classes.linkIcon)} />
                         </Link>
                     </div>
-                    {networkDescriptor?.networkSupporterPluginID === NetworkPluginID.PLUGIN_EVM ? (
-                        <div className={classes.infoRow}>
-                            <Typography className={classes.balance}>
-                                {formatBalance(balance, nativeToken?.decimals, 3)} {nativeToken?.symbol}
-                            </Typography>
-                        </div>
-                    ) : null}
+
+                    <div className={classes.infoRow}>
+                        <Typography className={classes.balance}>
+                            {loadingNativeToken || loadingBalance
+                                ? '-'
+                                : `${formatBalance(balance, nativeToken?.decimals, 3)} ${nativeToken?.symbol}`}
+                        </Typography>
+                    </div>
                 </div>
 
                 {!props.disableChange && (
                     <section>
-                        {networkDescriptor?.networkSupporterPluginID === NetworkPluginID.PLUGIN_EVM ? (
-                            <Button
-                                className={classNames(classes.actionButton)}
-                                variant="contained"
-                                size="small"
-                                onClick={async () => {
-                                    await connection.disconnect()
-                                    closeWalletStatusDialog()
-                                    openSelectProviderDialog()
-                                }}>
-                                {t('plugin_wallet_disconnect')}
-                            </Button>
-                        ) : null}
+                        <Button
+                            className={classNames(classes.actionButton)}
+                            variant="contained"
+                            size="small"
+                            onClick={async () => {
+                                await connection.disconnect()
+                                closeWalletStatusDialog()
+                                openSelectProviderDialog()
+                            }}>
+                            {t('plugin_wallet_disconnect')}
+                        </Button>
                         <Button
                             className={classNames(classes.actionButton)}
                             variant="contained"
diff --git a/packages/mask/src/extension/options-page/DashboardComponents/ActionButton.tsx b/packages/mask/src/extension/options-page/DashboardComponents/ActionButton.tsx
index 449c69a66a4d..d01f32ccdfcf 100644
--- a/packages/mask/src/extension/options-page/DashboardComponents/ActionButton.tsx
+++ b/packages/mask/src/extension/options-page/DashboardComponents/ActionButton.tsx
@@ -114,9 +114,8 @@ export function ActionButtonPromise(props: ActionButtonPromiseProps) {
     } = props
 
     const [state, setState] = useState<ActionButtonPromiseState>('init')
-    const basicClass = classNames(classes.button, b.className)
-    const completeClass = classNames(basicClass, classes.success)
-    const failClass = classNames(basicClass, classes.failed)
+    const completeClass = classNames(classes.success, b.className)
+    const failClass = classNames(classes.failed, b.className)
 
     const run = () => {
         setState('wait')
@@ -145,16 +144,7 @@ export function ActionButtonPromise(props: ActionButtonPromiseProps) {
     }, [executor, noUpdateEffect])
 
     if (state === 'wait')
-        return (
-            <Button
-                {...b}
-                startIcon={circle}
-                disabled={!waitingOnClick}
-                children={waiting}
-                onClick={cancel}
-                className={basicClass}
-            />
-        )
+        return <Button {...b} startIcon={circle} disabled={!waitingOnClick} children={waiting} onClick={cancel} />
     if (state === 'complete')
         return (
             <Button
@@ -177,7 +167,7 @@ export function ActionButtonPromise(props: ActionButtonPromiseProps) {
                 onClick={failClick}
             />
         )
-    return <Button {...b} children={init} onClick={run} className={basicClass} />
+    return <Button {...b} children={init} onClick={run} />
 }
 const useStyles = makeStyles()({
     success: {
@@ -194,7 +184,4 @@ const useStyles = makeStyles()({
             backgroundColor: red[700],
         },
     },
-    button: {
-        borderRadius: 999,
-    },
 })
diff --git a/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx b/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx
index 749c456f7eb5..6eec63d773c8 100644
--- a/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx
+++ b/packages/mask/src/extension/popups/components/NetworkSelector/index.tsx
@@ -8,7 +8,6 @@ import {
     useAccount,
     useChainId,
     Web3Helper,
-    useWeb3State,
     useProviderType,
 } from '@masknet/plugin-infra/web3'
 import { currentMaskWalletAccountSettings } from '../../../../plugins/Wallet/settings'
@@ -61,14 +60,13 @@ export const NetworkSelector = memo(() => {
         (x) => x.networkSupporterPluginID === NetworkPluginID.PLUGIN_EVM,
     ) as Array<NetworkDescriptor<ChainId, NetworkType>>
 
-    const web3State = useWeb3State(NetworkPluginID.PLUGIN_EVM)
     const account = useAccount(NetworkPluginID.PLUGIN_EVM)
     const chainId = useChainId(NetworkPluginID.PLUGIN_EVM)
     const providerType = useProviderType(NetworkPluginID.PLUGIN_EVM)
     const onChainChange = useCallback(
         async (chainId: Web3Helper.Definition[NetworkPluginID.PLUGIN_EVM]['ChainId']) => {
             if (providerType === ProviderType.MaskWallet) {
-                await web3State.Provider?.connect(chainId, ProviderType.MaskWallet)
+                await WalletRPC.updateMaskAccount({ chainId })
             }
             return WalletRPC.updateMaskAccount({
                 chainId,
diff --git a/packages/mask/src/extension/popups/pages/Personas/Accounts/UI.tsx b/packages/mask/src/extension/popups/pages/Personas/Accounts/UI.tsx
index 46e626353b94..3b266621be10 100644
--- a/packages/mask/src/extension/popups/pages/Personas/Accounts/UI.tsx
+++ b/packages/mask/src/extension/popups/pages/Personas/Accounts/UI.tsx
@@ -18,7 +18,7 @@ const useStyles = makeStyles()(() => ({
     },
     connect: {
         backgroundColor: '#ffffff',
-        padding: '11px 20px',
+        padding: '11px 16px',
         borderRadius: 99,
         fontWeight: 700,
         fontSize: 14,
diff --git a/packages/mask/src/extension/popups/pages/Personas/VerifyWallet/index.tsx b/packages/mask/src/extension/popups/pages/Personas/VerifyWallet/index.tsx
index 07de87d4340d..eb0bf513acc9 100644
--- a/packages/mask/src/extension/popups/pages/Personas/VerifyWallet/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Personas/VerifyWallet/index.tsx
@@ -68,7 +68,11 @@ const VerifyWallet = memo(() => {
     }
 
     useEffect(() => {
-        if (request?.payload.method !== EthereumMethodType.ETH_SIGN) return
+        if (
+            request?.payload.method !== EthereumMethodType.ETH_SIGN &&
+            request?.payload.method !== EthereumMethodType.PERSONAL_SIGN
+        )
+            return
 
         navigate(urlcat(PopupRoutes.WalletSignRequest, { goBack: true }), {
             state: wallet,
diff --git a/packages/mask/src/extension/popups/pages/Wallet/ImportWallet/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/ImportWallet/index.tsx
index a00d31c4fb09..21cc3559fdc6 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/ImportWallet/index.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/ImportWallet/index.tsx
@@ -176,7 +176,6 @@ const ImportWallet = memo(() => {
                                     account: wallet,
                                 })
                             }
-                            await WalletRPC.resolveMaskAccount([wallet])
                             navigate(PopupRoutes.Wallet, { replace: true })
                             await Services.Helper.removePopupWindow()
                             break
@@ -185,7 +184,6 @@ const ImportWallet = memo(() => {
                             await WalletRPC.updateMaskAccount({
                                 account: privateKeyWallet,
                             })
-                            await WalletRPC.resolveMaskAccount([privateKeyWallet])
 
                             await Services.Helper.removePopupWindow()
                             navigate(PopupRoutes.Wallet, { replace: true })
diff --git a/packages/mask/src/manifest.json b/packages/mask/src/manifest.json
index 9f1dfefa71f5..4dc9e740f633 100644
--- a/packages/mask/src/manifest.json
+++ b/packages/mask/src/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "Mask Network",
-    "version": "2.8.0",
+    "version": "2.9.0",
     "manifest_version": 2,
     "permissions": ["storage", "downloads", "webNavigation", "activeTab"],
     "optional_permissions": ["<all_urls>", "notifications", "clipboardRead"],
diff --git a/packages/mask/src/plugin-infra/host.ts b/packages/mask/src/plugin-infra/host.ts
index a6d4e04f0423..7a9bf5c1f8b0 100644
--- a/packages/mask/src/plugin-infra/host.ts
+++ b/packages/mask/src/plugin-infra/host.ts
@@ -17,78 +17,80 @@ import { currentMaskWalletAccountSettings, currentMaskWalletChainIdSettings } fr
 import { WalletMessages, WalletRPC } from '../plugins/Wallet/messages'
 import type { WalletConnectQRCodeDialogEvent } from '@masknet/plugin-wallet'
 
+const SharedContext: Omit<Plugin.Shared.SharedContext, 'createKVStorage'> = {
+    currentPersona: createSubscriptionFromAsync(
+        Services.Settings.getCurrentPersonaIdentifier,
+        undefined,
+        MaskMessages.events.currentPersonaIdentifier.on,
+    ),
+
+    nativeType: nativeAPI?.type,
+    hasNativeAPI,
+
+    send: WalletRPC.sendPayload,
+
+    fetch: Services.Helper.r2d2Fetch,
+
+    openPopupWindow: Services.Helper.openPopupWindow,
+    closePopupWindow: Services.Helper.removePopupWindow,
+
+    openWalletConnectDialog: (uri: string, callback) => {
+        const onClose = (ev: WalletConnectQRCodeDialogEvent) => {
+            if (ev.open) return
+            callback()
+            WalletMessages.events.walletConnectQRCodeDialogUpdated.off(onClose)
+        }
+
+        WalletMessages.events.walletConnectQRCodeDialogUpdated.on(onClose)
+        WalletMessages.events.walletConnectQRCodeDialogUpdated.sendToLocal({
+            open: true,
+            uri,
+        })
+    },
+    closeWalletConnectDialog: () => {
+        WalletMessages.events.walletConnectQRCodeDialogUpdated.sendToLocal({
+            open: false,
+        })
+    },
+
+    account: createSubscriptionFromValueRef(currentMaskWalletAccountSettings),
+    chainId: createSubscriptionFromValueRef(currentMaskWalletChainIdSettings),
+
+    wallets: createSubscriptionFromAsync(
+        () => WalletRPC.getWallets(),
+        EMPTY_LIST,
+        WalletMessages.events.walletsUpdated.on,
+    ),
+    walletPrimary: createSubscriptionFromAsync(
+        () => WalletRPC.getWalletPrimary(),
+        null,
+        WalletMessages.events.walletsUpdated.on,
+    ),
+
+    personaSignMessage: Services.Identity.signWithPersona,
+
+    updateAccount: WalletRPC.updateMaskAccount,
+    resetAccount: WalletRPC.resetMaskAccount,
+    selectAccount: WalletRPC.selectMaskAccount,
+
+    signTransaction: WalletRPC.signTransaction,
+    signTypedData: WalletRPC.signTypedData,
+    signPersonalMessage: WalletRPC.signPersonalMessage,
+
+    getWallets: WalletRPC.getWallets,
+    getWalletPrimary: WalletRPC.getWalletPrimary,
+    addWallet: WalletRPC.updateWallet,
+    updateWallet: WalletRPC.updateWallet,
+    removeWallet: WalletRPC.removeWallet,
+}
+
 export function createSharedContext(pluginID: string, signal: AbortSignal): Plugin.Shared.SharedContext {
     return {
         createKVStorage<T extends object>(type: 'memory' | 'persistent', defaultValues: T) {
-            if (type === 'memory') return InMemoryStorages.Plugin.createSubScope(pluginID, defaultValues, signal)
-            else return PersistentStorages.Plugin.createSubScope(pluginID, defaultValues, signal)
+            if (type === 'memory') return InMemoryStorages.Plugin.createSubScope(pluginID, defaultValues)
+            else return PersistentStorages.Plugin.createSubScope(pluginID, defaultValues)
         },
-
-        nativeType: nativeAPI?.type,
-        hasNativeAPI,
-
-        send: WalletRPC.sendPayload,
-
-        fetch: Services.Helper.r2d2Fetch,
-
-        openPopupWindow: Services.Helper.openPopupWindow,
-        closePopupWindow: Services.Helper.removePopupWindow,
-
-        openWalletConnectDialog: (uri: string, callback) => {
-            const onClose = (ev: WalletConnectQRCodeDialogEvent) => {
-                if (ev.open) return
-                callback()
-                WalletMessages.events.walletConnectQRCodeDialogUpdated.off(onClose)
-            }
-
-            WalletMessages.events.walletConnectQRCodeDialogUpdated.on(onClose)
-            WalletMessages.events.walletConnectQRCodeDialogUpdated.sendToLocal({
-                open: true,
-                uri,
-            })
-        },
-        closeWalletConnectDialog: () => {
-            WalletMessages.events.walletConnectQRCodeDialogUpdated.sendToLocal({
-                open: false,
-            })
-        },
-
-        account: createSubscriptionFromValueRef(currentMaskWalletAccountSettings),
-        chainId: createSubscriptionFromValueRef(currentMaskWalletChainIdSettings),
-
-        currentPersona: createSubscriptionFromAsync(
-            Services.Settings.getCurrentPersonaIdentifier,
-            undefined,
-            MaskMessages.events.currentPersonaIdentifier.on,
-            signal,
-        ),
-
-        wallets: createSubscriptionFromAsync(
-            () => WalletRPC.getWallets(),
-            EMPTY_LIST,
-            WalletMessages.events.walletsUpdated.on,
-        ),
-        walletPrimary: createSubscriptionFromAsync(
-            () => WalletRPC.getWalletPrimary(),
-            null,
-            WalletMessages.events.walletsUpdated.on,
-        ),
-
-        personaSignMessage: Services.Identity.signWithPersona,
-
-        updateAccount: WalletRPC.updateMaskAccount,
-        resetAccount: WalletRPC.resetMaskAccount,
-        selectAccount: WalletRPC.selectMaskAccount,
-
-        signTransaction: WalletRPC.signTransaction,
-        signTypedData: WalletRPC.signTypedData,
-        signPersonalMessage: WalletRPC.signPersonalMessage,
-
-        getWallets: WalletRPC.getWallets,
-        getWalletPrimary: WalletRPC.getWalletPrimary,
-        addWallet: WalletRPC.updateWallet,
-        updateWallet: WalletRPC.updateWallet,
-        removeWallet: WalletRPC.removeWallet,
+        ...SharedContext,
     }
 }
 
diff --git a/packages/mask/src/plugins/ArtBlocks/hooks/usePurchaseCallback.ts b/packages/mask/src/plugins/ArtBlocks/hooks/usePurchaseCallback.ts
index 247496f2c7c1..418781846fec 100644
--- a/packages/mask/src/plugins/ArtBlocks/hooks/usePurchaseCallback.ts
+++ b/packages/mask/src/plugins/ArtBlocks/hooks/usePurchaseCallback.ts
@@ -1,6 +1,6 @@
 import { useAccount, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { NetworkPluginID } from '@masknet/web3-shared-base'
-import { ChainId, encodeTransaction, SchemaType } from '@masknet/web3-shared-evm'
+import { ChainId, encodeContractTransaction, SchemaType } from '@masknet/web3-shared-evm'
 import BigNumber from 'bignumber.js'
 import { useAsyncFn } from 'react-use'
 import { useArtBlocksContract } from './useArtBlocksContract'
@@ -14,15 +14,13 @@ export function usePurchaseCallback(chainId: ChainId, projectId: string, amount:
     return useAsyncFn(async () => {
         if (!genArt721MinterContract) return
 
-        const value = new BigNumber(schema === SchemaType.Native ? amount : 0).toFixed()
-        const config = {
-            from: account,
-            value,
-        }
-        const tx = await encodeTransaction(
+        const tx = await encodeContractTransaction(
             genArt721MinterContract,
             genArt721MinterContract.methods.purchase(projectId),
-            config,
+            {
+                from: account,
+                value: new BigNumber(schema === SchemaType.Native ? amount : 0).toFixed(),
+            },
         )
         return connection.sendTransaction(tx)
     }, [account, amount, chainId, genArt721MinterContract, connection])
diff --git a/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx b/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx
index 392bcf93a8e0..11451af6dc49 100644
--- a/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx
+++ b/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx
@@ -13,17 +13,9 @@ import { makeStyles } from '@masknet/theme'
 const useStyles = makeStyles()((theme) => ({
     root: {
         margin: 0,
-        padding: '1px !important',
+        padding: '0px !important',
         '::-webkit-scrollbar': {
-            backgroundColor: 'transparent',
-            width: 20,
-        },
-        '::-webkit-scrollbar-thumb': {
-            borderRadius: '20px',
-            width: 5,
-            border: '7px solid rgba(0, 0, 0, 0)',
-            backgroundColor: theme.palette.mode === 'dark' ? 'rgba(250, 250, 250, 0.2)' : 'rgba(0, 0, 0, 0.2)',
-            backgroundClip: 'padding-box',
+            display: 'none',
         },
     },
 }))
diff --git a/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx b/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx
index 5b31770d4bdf..313882ebfc8f 100644
--- a/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx
+++ b/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx
@@ -103,11 +103,11 @@ export function NFTListDialog(props: NFTListDialogProps) {
     const { classes } = useStyles()
     const currentPluginId = useCurrentWeb3NetworkPluginID()
     const account = useAccount(currentPluginId)
-    const currentChainId = useChainId<'all'>(currentPluginId)
-    const [chainId, setChainId] = useState<ChainId>(currentChainId as ChainId)
+    const currentChainId = useChainId(currentPluginId)
+    const [chainId, setChainId] = useState<ChainId>((currentChainId ?? ChainId.Mainnet) as ChainId)
     const [open_, setOpen_] = useState(false)
     const [selectedAccount, setSelectedAccount] = useState(account ?? wallets?.[0]?.identity ?? '')
-    const [selectedPluginId, setSelectedPluginId] = useState(currentPluginId)
+    const [selectedPluginId, setSelectedPluginId] = useState(currentPluginId ?? NetworkPluginID.PLUGIN_EVM)
     const [selectedToken, setSelectedToken] = useState<AllChainsNonFungibleToken | undefined>(tokenInfo)
     const [disabled, setDisabled] = useState(false)
     const t = useI18N()
@@ -237,7 +237,7 @@ export function NFTListDialog(props: NFTListDialogProps) {
         selectedPluginId === NetworkPluginID.PLUGIN_SOLANA
             ? (x) => x.tokenId
             : (x) => x.contract?.address.toLowerCase() + x.tokenId,
-    )
+    ).filter((x) => x.chainId === chainId)
 
     const NoNFTList = () => {
         if (!collectibles.length && !loadFinish && !loadError) {
diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTImage.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTImage.tsx
index b786a878fb94..f5fbb2c7762f 100644
--- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTImage.tsx
+++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTImage.tsx
@@ -7,7 +7,7 @@ import type { AllChainsNonFungibleToken } from '../types'
 const useStyles = makeStyles()((theme) => ({
     imgBackground: {
         position: 'relative',
-        padding: 4,
+        padding: 6,
         borderRadius: '100%',
         display: 'flex',
         alignItems: 'center',
@@ -15,8 +15,8 @@ const useStyles = makeStyles()((theme) => ({
     },
     icon: {
         position: 'absolute',
-        top: 2,
-        right: 2,
+        top: 8,
+        right: 13,
         width: 20,
         height: 20,
         color: theme.palette.primary.main,
diff --git a/packages/mask/src/plugins/Avatar/Services/storage.ts b/packages/mask/src/plugins/Avatar/Services/storage.ts
index 21c02284070d..fa0421514975 100644
--- a/packages/mask/src/plugins/Avatar/Services/storage.ts
+++ b/packages/mask/src/plugins/Avatar/Services/storage.ts
@@ -22,7 +22,6 @@ export async function saveAvatar(account: string, network: EnhanceableSite, avat
     await setAddress(network, avatar.userId, avatar.pluginId ?? NetworkPluginID.PLUGIN_EVM, account)
     await NFTAvatarStorage(network).set(avatar.userId, {
         ...avatar,
-        address: avatar.pluginId === NetworkPluginID.PLUGIN_SOLANA ? avatar.tokenId : avatar.address,
         sign,
     })
 
diff --git a/packages/mask/src/plugins/Avatar/hooks/save/useSave.ts b/packages/mask/src/plugins/Avatar/hooks/save/useSave.ts
index f380a2624c8a..45ccdef3da8d 100644
--- a/packages/mask/src/plugins/Avatar/hooks/save/useSave.ts
+++ b/packages/mask/src/plugins/Avatar/hooks/save/useSave.ts
@@ -24,8 +24,7 @@ export function useSave(pluginId: NetworkPluginID, chainId: ChainId) {
             persona: ECKeyIdentifier,
             proof: BindingProof,
         ) => {
-            if (pluginId === NetworkPluginID.PLUGIN_SOLANA && !token.tokenId) return
-            if (pluginId !== NetworkPluginID.PLUGIN_SOLANA && (!token.contract?.address || !token.tokenId)) return
+            if (!token.contract?.address || !token.tokenId) return
             const info: NextIDAvatarMeta = {
                 pluginId,
                 nickname: data.nickname,
diff --git a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts
index 2b24a3d80fd7..d5c5c3c9b604 100644
--- a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts
+++ b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts
@@ -22,9 +22,9 @@ export function useNFT(
             chainId,
         })
         return {
-            amount: asset?.price?.[CurrencyType.NATIVE] ?? '0',
+            amount: asset?.price?.[CurrencyType.USD] ?? '0',
             name: asset?.contract?.name ?? '',
-            symbol: asset?.contract?.symbol ?? 'ETH',
+            symbol: asset?.payment_tokens?.[0].symbol ?? 'ETH',
             image: asset?.metadata?.imageURL ?? '',
             owner: asset?.owner?.address ?? asset?.ownerId ?? '',
             slug: asset?.collection?.slug ?? '',
diff --git a/packages/mask/src/plugins/Avatar/utils/index.ts b/packages/mask/src/plugins/Avatar/utils/index.ts
index 8766c899284a..00d4f5c18f2f 100644
--- a/packages/mask/src/plugins/Avatar/utils/index.ts
+++ b/packages/mask/src/plugins/Avatar/utils/index.ts
@@ -59,11 +59,9 @@ export function formatPrice(amount: string, symbol: string) {
 
 export function formatText(name: string, tokenId: string) {
     const _name = name.replace(/#\d*/, '').trim()
-    let token = tokenId
-    if (tokenId.length > 10) {
-        token = tokenId.slice(0, 6) + '...' + tokenId.slice(-4)
-    }
-    return `${_name} #${token}`
+    const __name = `${_name} #${tokenId}`
+    if (__name.length > 35) return `${__name.slice(0, 35)}...`
+    return __name
 }
 
 export function formatTokenId(symbol: string, tokenId: string) {
diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx
index 1d55a2607a6b..5e5fcc181c19 100644
--- a/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx
+++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/Collectible.tsx
@@ -140,7 +140,7 @@ export function Collectible(props: CollectibleProps) {
     const CollectibleProviderSwitcher = useSwitcher(provider, setProvider, supportedProvider, resolveSourceName, true)
     // #endregion
 
-    if (!asset.value?.id || !token)
+    if (!asset.value || !token)
         return (
             <Box display="flex" flexDirection="column" alignItems="center" justifyContent="center">
                 <Typography color={MaskColorVar.textPluginColor} sx={{ marginTop: 8, marginBottom: 8 }}>
diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/ActionBar.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/ActionBar.tsx
index cce3789f3c96..e1ad2f9cbe2b 100644
--- a/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/ActionBar.tsx
+++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/ActionBar.tsx
@@ -17,6 +17,7 @@ const useStyles = makeStyles()((theme) => {
     return {
         root: {
             width: 'calc(100% - 24px)',
+            gap: 8,
         },
         button: {
             flex: 1,
diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/PostListingDialog.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/PostListingDialog.tsx
index 290666f31d48..f7aa4bd4a3ab 100644
--- a/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/PostListingDialog.tsx
+++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/OpenSea/PostListingDialog.tsx
@@ -33,7 +33,7 @@ export interface PostListingDialogProps {
 
 export function PostListingDialog(props: PostListingDialogProps) {
     const { asset, open, onClose } = props
-    const paymentTokens = asset?.auction?.offerTokens ?? []
+    const paymentTokens = asset?.auction?.offerTokens ?? asset?.payment_tokens ?? []
 
     const { t } = useI18N()
     const { classes } = useStyles()
@@ -43,7 +43,6 @@ export function PostListingDialog(props: PostListingDialogProps) {
         <Tab key="price" label={t('plugin_collectible_set_price')} />,
         <Tab key="bid" label={t('plugin_collectible_highest_bid')} />,
     ]
-
     return (
         <InjectedDialog title={t('plugin_collectible_post_listing')} open={open} onClose={onClose} maxWidth="md">
             <DialogContent className={classes.content}>
diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx
index aac51bf715a2..b8fa73c863d4 100644
--- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx
+++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/ActionBar.tsx
@@ -12,6 +12,7 @@ const useStyles = makeStyles()((theme) => {
     return {
         root: {
             flex: 1,
+            gap: 8,
         },
         button: {
             flex: 1,
@@ -65,7 +66,7 @@ export function ActionBar(props: ActionBarProps) {
             {!assetSource?.isSoldOut &&
             !assetSource?.is24Auction &&
             (!assetSource?.trade?.latestBid || assetSource?.trade?.latestBid < assetSource?.priceInEth) &&
-            assetSource?.trade?.isCanAuction ? (
+            assetSource?.trade?.is_auction ? (
                 <ActionButton
                     className={classes.button}
                     color="primary"
diff --git a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx
index fec469141dce..d0b1f20a51e2 100644
--- a/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx
+++ b/packages/mask/src/plugins/CryptoartAI/SNSAdaptor/MakeOfferDialog.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState, useCallback } from 'react'
-import { InjectedDialog, useOpenShareTxDialog } from '@masknet/shared'
+import { InjectedDialog, NFTCardStyledAssetPlayer, useOpenShareTxDialog } from '@masknet/shared'
 import { makeStyles } from '@masknet/theme'
 import { first } from 'lodash-unified'
 import BigNumber from 'bignumber.js'
@@ -155,6 +155,7 @@ export function MakeOfferDialog(props: MakeOfferDialogProps) {
     }, [amount, balance.value, isVerified, is24Auction])
 
     if (!asset || !asset.value) return null
+
     return (
         <InjectedDialog
             title={
@@ -168,14 +169,14 @@ export function MakeOfferDialog(props: MakeOfferDialogProps) {
                         <Box className={classes.mediaContent}>
                             {assetSource?.ossUrl.match(/\.(mp4|avi|webm)$/i) ? (
                                 <Link href={assetSource?.ossUrl} target="_blank" rel="noopener noreferrer">
-                                    <img
-                                        className={classes.player}
-                                        src={assetSource?.shareUrl}
-                                        alt={assetSource?.title}
-                                    />
+                                    <NFTCardStyledAssetPlayer url={assetSource.ossUrl || assetSource.shareUrl} />
                                 </Link>
                             ) : (
-                                <img className={classes.player} src={assetSource?.shareUrl} alt={assetSource?.title} />
+                                <img
+                                    className={classes.player}
+                                    src={assetSource?.ossUrl || assetSource?.shareUrl}
+                                    alt={assetSource?.title}
+                                />
                             )}
                         </Box>
                         <h3>
diff --git a/packages/mask/src/plugins/CryptoartAI/hooks/usePlaceBidCallback.ts b/packages/mask/src/plugins/CryptoartAI/hooks/usePlaceBidCallback.ts
index 2923da7193f8..316812586795 100644
--- a/packages/mask/src/plugins/CryptoartAI/hooks/usePlaceBidCallback.ts
+++ b/packages/mask/src/plugins/CryptoartAI/hooks/usePlaceBidCallback.ts
@@ -1,6 +1,6 @@
 import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { NetworkPluginID, toFixed } from '@masknet/web3-shared-base'
-import { encodeTransaction, ZERO_ADDRESS } from '@masknet/web3-shared-evm'
+import { encodeContractTransaction, ZERO_ADDRESS } from '@masknet/web3-shared-evm'
 import { useAsyncFn } from 'react-use'
 import { useCryptoArtAI_Contract } from './useCryptoArtAI_Contract'
 
@@ -21,12 +21,12 @@ export function usePlaceBidCallback(is24Auction: boolean, editionNumber: string)
                 value: toFixed(priceInWei),
             }
             const tx = is24Auction
-                ? await encodeTransaction(
+                ? await encodeContractTransaction(
                       artistAcceptingBidsV2_contract!,
                       artistAcceptingBidsV2_contract!.methods.placeBid(editionNumber),
                       config,
                   )
-                : await encodeTransaction(
+                : await encodeContractTransaction(
                       cANFTMarket_contract!,
                       cANFTMarket_contract!.methods.placeBid(editionNumber, ZERO_ADDRESS),
                       config,
diff --git a/packages/mask/src/plugins/CryptoartAI/hooks/usePurchaseCallback.ts b/packages/mask/src/plugins/CryptoartAI/hooks/usePurchaseCallback.ts
index 824d94f4f18d..29d2b654f3bd 100644
--- a/packages/mask/src/plugins/CryptoartAI/hooks/usePurchaseCallback.ts
+++ b/packages/mask/src/plugins/CryptoartAI/hooks/usePurchaseCallback.ts
@@ -1,6 +1,6 @@
 import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { NetworkPluginID, toFixed } from '@masknet/web3-shared-base'
-import { encodeTransaction } from '@masknet/web3-shared-evm'
+import { encodeContractTransaction } from '@masknet/web3-shared-evm'
 import { useAsyncFn } from 'react-use'
 import { useCryptoArtAI_Contract } from './useCryptoArtAI_Contract'
 
@@ -17,7 +17,7 @@ export function usePurchaseCallback(editionNumber: string, priceInWei: number) {
             from: account,
             value: toFixed(priceInWei),
         }
-        const tx = await encodeTransaction(
+        const tx = await encodeContractTransaction(
             knownOriginDigitalAssetV2_contract,
             knownOriginDigitalAssetV2_contract.methods.purchase(editionNumber),
             config,
diff --git a/packages/mask/src/plugins/Gitcoin/hooks/useDonateCallback.ts b/packages/mask/src/plugins/Gitcoin/hooks/useDonateCallback.ts
index f716701ca298..912802ae954a 100644
--- a/packages/mask/src/plugins/Gitcoin/hooks/useDonateCallback.ts
+++ b/packages/mask/src/plugins/Gitcoin/hooks/useDonateCallback.ts
@@ -2,7 +2,7 @@ import { useMemo } from 'react'
 import { useAsyncFn } from 'react-use'
 import BigNumber from 'bignumber.js'
 import { FungibleToken, NetworkPluginID, toFixed } from '@masknet/web3-shared-base'
-import { ChainId, encodeTransaction, SchemaType, useGitcoinConstants } from '@masknet/web3-shared-evm'
+import { ChainId, encodeContractTransaction, SchemaType, useGitcoinConstants } from '@masknet/web3-shared-evm'
 import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { useBulkCheckoutContract } from '../contracts/useBulkCheckoutWallet'
 
@@ -51,13 +51,11 @@ export function useDonateCallback(address: string, amount: string, token?: Fungi
             value,
         }
 
-        const tx = await encodeTransaction(bulkCheckoutContract, bulkCheckoutContract.methods.donate(donations), config)
-
-        console.log('DEBUG: get tx')
-        console.log({
-            tx,
-        })
-
+        const tx = await encodeContractTransaction(
+            bulkCheckoutContract,
+            bulkCheckoutContract.methods.donate(donations),
+            config,
+        )
         return connection.sendTransaction(tx)
     }, [account, amount, token, donations, connection])
 }
diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useClaimCallback.ts b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useClaimCallback.ts
index 0e596de1a1f3..b84b4660ef95 100644
--- a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useClaimCallback.ts
+++ b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useClaimCallback.ts
@@ -1,6 +1,6 @@
 import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { isSameAddress, NetworkPluginID } from '@masknet/web3-shared-base'
-import { encodeTransaction, useITOConstants } from '@masknet/web3-shared-evm'
+import { encodeContractTransaction, useITOConstants } from '@masknet/web3-shared-evm'
 import stringify from 'json-stable-stringify'
 import { useAsyncFn } from 'react-use'
 import { checkAvailability } from '../utils/checkAvailability'
@@ -32,7 +32,7 @@ export function useClaimCallback(pids: string[], contractAddress: string | undef
         const config = {
             from: account,
         }
-        const tx = await encodeTransaction(ITO_Contract, ITO_Contract.methods.claim(pids), config)
+        const tx = await encodeContractTransaction(ITO_Contract, ITO_Contract.methods.claim(pids), config)
         return connection.sendTransaction(tx)
     }, [account, chainId, ITO_Contract, stringify(pids), isV1, connection])
 }
diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useDestructCallback.ts b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useDestructCallback.ts
index 7ff6700b01fc..d11e1fa11684 100644
--- a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useDestructCallback.ts
+++ b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useDestructCallback.ts
@@ -1,6 +1,6 @@
 import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { NetworkPluginID } from '@masknet/web3-shared-base'
-import { encodeTransaction } from '@masknet/web3-shared-evm'
+import { encodeContractTransaction } from '@masknet/web3-shared-evm'
 import { useAsyncFn } from 'react-use'
 import { useITO_Contract } from './useITO_Contract'
 
@@ -18,7 +18,7 @@ export function useDestructCallback(ito_address: string) {
                 from: account,
             }
 
-            const tx = await encodeTransaction(ITO_Contract, ITO_Contract.methods.destruct(id), config)
+            const tx = await encodeContractTransaction(ITO_Contract, ITO_Contract.methods.destruct(id), config)
             return connection.sendTransaction(tx)
         },
         [ITO_Contract, connection],
diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useMaskClaimCallback.ts b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useMaskClaimCallback.ts
index b520af5eccdc..8301eef1e8dc 100644
--- a/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useMaskClaimCallback.ts
+++ b/packages/mask/src/plugins/ITO/SNSAdaptor/hooks/useMaskClaimCallback.ts
@@ -1,6 +1,6 @@
 import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { NetworkPluginID } from '@masknet/web3-shared-base'
-import { encodeTransaction } from '@masknet/web3-shared-evm'
+import { encodeContractTransaction } from '@masknet/web3-shared-evm'
 import { useAsyncFn } from 'react-use'
 import { useMaskITO_Contract } from './useMaskITO_Contract'
 
@@ -16,7 +16,7 @@ export function useMaskClaimCallback() {
         const config = {
             from: account,
         }
-        const tx = await encodeTransaction(MaskITO_Contract, MaskITO_Contract.methods.claim(), config)
+        const tx = await encodeContractTransaction(MaskITO_Contract, MaskITO_Contract.methods.claim(), config)
         return connection.sendTransaction(tx)
     }, [account, chainId, MaskITO_Contract, connection])
 }
diff --git a/packages/mask/src/plugins/MaskBox/hooks/useMaskBoxCreationSuccessEvent.ts b/packages/mask/src/plugins/MaskBox/hooks/useMaskBoxCreationSuccessEvent.ts
index f6bcb97e3d71..478b9e076364 100644
--- a/packages/mask/src/plugins/MaskBox/hooks/useMaskBoxCreationSuccessEvent.ts
+++ b/packages/mask/src/plugins/MaskBox/hooks/useMaskBoxCreationSuccessEvent.ts
@@ -4,19 +4,19 @@ import type { CreationSuccess } from '@masknet/web3-contracts/types/MaskBox'
 import { useMaskBoxConstants } from '@masknet/web3-shared-evm'
 import { useMaskBoxContract } from './useMaskBoxContract'
 import { NetworkPluginID } from '@masknet/web3-shared-base'
-import { useBlockNumber } from '@masknet/plugin-infra/web3'
+import { useWeb3Connection } from '@masknet/plugin-infra/web3'
 
 // dynamically set the block range window size
 const FRAGMENT_SIZE = 3000
 const MAX_PAGE_SIZE = 10
 
 export function useMaskBoxCreationSuccessEvent(creatorAddress: string, tokenAddress: string, boxId: string) {
-    const { value: blockNumber = 0 } = useBlockNumber(NetworkPluginID.PLUGIN_EVM)
+    const connection = useWeb3Connection(NetworkPluginID.PLUGIN_EVM)
     const maskBoxContract = useMaskBoxContract()
-    const { MASK_BOX_CONTRACT_FROM_BLOCK = Math.max(0, blockNumber - FRAGMENT_SIZE) } = useMaskBoxConstants()
+    const { MASK_BOX_CONTRACT_FROM_BLOCK } = useMaskBoxConstants()
 
     return useAsyncRetry(async () => {
-        if (!blockNumber) return null
+        if (!connection) return null
         if (!maskBoxContract) return null
 
         const getPastEvents = (fromBlock: number, toBlock: number) => {
@@ -31,7 +31,8 @@ export function useMaskBoxCreationSuccessEvent(creatorAddress: string, tokenAddr
             })
         }
 
-        const range = blockNumber - MASK_BOX_CONTRACT_FROM_BLOCK
+        const blockNumber = await connection.getBlockNumber()
+        const range = blockNumber - (MASK_BOX_CONTRACT_FROM_BLOCK ?? Math.max(0, blockNumber - FRAGMENT_SIZE))
         const size = Math.min(MAX_PAGE_SIZE, Math.ceil(range / FRAGMENT_SIZE))
         const allSettled = await Promise.allSettled(
             Array.from({ length: size }).map((_, index) =>
@@ -41,5 +42,5 @@ export function useMaskBoxCreationSuccessEvent(creatorAddress: string, tokenAddr
         const events = allSettled.flatMap((x) => (x.status === 'fulfilled' ? x.value : []))
         const filtered = (events as unknown as CreationSuccess[]).filter((evt) => evt.returnValues.box_id === boxId)
         return first(filtered)
-    }, [boxId, creatorAddress, tokenAddress, maskBoxContract, blockNumber, MASK_BOX_CONTRACT_FROM_BLOCK])
+    }, [boxId, creatorAddress, tokenAddress, maskBoxContract, MASK_BOX_CONTRACT_FROM_BLOCK])
 }
diff --git a/packages/mask/src/plugins/PoolTogether/hooks/useDepositCallback.ts b/packages/mask/src/plugins/PoolTogether/hooks/useDepositCallback.ts
index e3ca52a27084..701768455d51 100644
--- a/packages/mask/src/plugins/PoolTogether/hooks/useDepositCallback.ts
+++ b/packages/mask/src/plugins/PoolTogether/hooks/useDepositCallback.ts
@@ -1,6 +1,6 @@
 import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { FungibleToken, NetworkPluginID } from '@masknet/web3-shared-base'
-import { ChainId, encodeTransaction, SchemaType } from '@masknet/web3-shared-evm'
+import { ChainId, encodeContractTransaction, SchemaType } from '@masknet/web3-shared-evm'
 import BigNumber from 'bignumber.js'
 import { useAsyncFn } from 'react-use'
 import { usePoolTogetherPoolContract } from '../contracts/usePoolTogetherPool'
@@ -36,7 +36,7 @@ export function useDepositCallback(
             value: new BigNumber(token.schema === SchemaType.Native ? amount : 0).toFixed(),
         }
 
-        const tx = await encodeTransaction(
+        const tx = await encodeContractTransaction(
             poolContract,
             poolContract.methods.depositTo(account, amount, controlledToken, referrer),
             config,
diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketConfirmDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketConfirmDialog.tsx
index db3918f4badb..caed036b4a97 100644
--- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketConfirmDialog.tsx
+++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketConfirmDialog.tsx
@@ -9,7 +9,7 @@ import { FormattedBalance, useOpenShareTxDialog } from '@masknet/shared'
 import ActionButton from '../../../extension/options-page/DashboardComponents/ActionButton'
 import { useI18N } from '../locales'
 import { RedPacketSettings, useCreateCallback } from './hooks/useCreateCallback'
-import { useAccount, useChainId, useNetworkType, useWeb3, useWeb3Connection } from '@masknet/plugin-infra/web3'
+import { useAccount, useChainId, useNetworkType, useWeb3 } from '@masknet/plugin-infra/web3'
 import { NetworkPluginID, formatBalance } from '@masknet/web3-shared-base'
 import type { RedPacketJSONPayload, RedPacketRecord } from '../types'
 import { RedPacketRPC } from '../messages'
@@ -97,11 +97,11 @@ export function RedPacketConfirmDialog(props: ConfirmRedPacketFormProps) {
     )!
     const [{ loading: isCreating }, createCallback] = useCreateCallback(settings!, contract_version, publicKey)
     const openShareTxDialog = useOpenShareTxDialog()
-    const connection = useWeb3Connection(NetworkPluginID.PLUGIN_EVM)
     const createRedpacket = useCallback(async () => {
-        const hash = await createCallback()
+        const result = await createCallback()
+
+        const { hash, receipt, events } = result ?? {}
         if (typeof hash !== 'string') return
-        const receipt = await connection.getTransactionReceipt(hash)
         if (typeof receipt?.transactionHash !== 'string') return
         await openShareTxDialog({
             hash: receipt.transactionHash,
@@ -110,7 +110,7 @@ export function RedPacketConfirmDialog(props: ConfirmRedPacketFormProps) {
         // the settings is not available
         if (!settings?.token) return
 
-        const CreationSuccess = (receipt.events?.CreationSuccess.returnValues ?? {}) as {
+        const CreationSuccess = (events?.CreationSuccess.returnValues ?? {}) as {
             creation_time: string
             creator: string
             id: string
diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimCallback.ts b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimCallback.ts
index 09f779da6f9a..0a58672556d6 100644
--- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimCallback.ts
+++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimCallback.ts
@@ -2,7 +2,7 @@ import { useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import type { HappyRedPacketV1 } from '@masknet/web3-contracts/types/HappyRedPacketV1'
 import type { HappyRedPacketV4 } from '@masknet/web3-contracts/types/HappyRedPacketV4'
 import { NetworkPluginID } from '@masknet/web3-shared-base'
-import { encodeTransaction } from '@masknet/web3-shared-evm'
+import { encodeContractTransaction } from '@masknet/web3-shared-evm'
 import { useAsyncFn } from 'react-use'
 import Web3Utils from 'web3-utils'
 import { useRedPacketContract } from './useRedPacketContract'
@@ -21,12 +21,12 @@ export function useClaimCallback(version: number, from: string, id: string, pass
         // but it is more understandable to declare respectively
         const tx =
             version === 4
-                ? await encodeTransaction(
+                ? await encodeContractTransaction(
                       redPacketContract,
                       (redPacketContract as HappyRedPacketV4).methods.claim(id, password, from),
                       config,
                   )
-                : await encodeTransaction(
+                : await encodeContractTransaction(
                       redPacketContract,
                       (redPacketContract as HappyRedPacketV1).methods.claim(id, password, from, Web3Utils.sha3(from)!),
                       config,
diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimNftRedpacketCallback.ts b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimNftRedpacketCallback.ts
index a686c8434448..4ddcafb8efad 100644
--- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimNftRedpacketCallback.ts
+++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useClaimNftRedpacketCallback.ts
@@ -1,7 +1,7 @@
 import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import type { NftRedPacket } from '@masknet/web3-contracts/types/NftRedPacket'
 import { NetworkPluginID } from '@masknet/web3-shared-base'
-import { encodeTransaction } from '@masknet/web3-shared-evm'
+import { encodeContractTransaction } from '@masknet/web3-shared-evm'
 import { useAsyncFn } from 'react-use'
 import { useNftRedPacketContract } from './useNftRedPacketContract'
 
@@ -34,7 +34,11 @@ export function useClaimNftRedpacketCallback(id: string, totalAmount: number | u
             chainId,
         }
 
-        const tx = await encodeTransaction(nftRedPacketContract, nftRedPacketContract.methods.claim(...params), config)
+        const tx = await encodeContractTransaction(
+            nftRedPacketContract,
+            nftRedPacketContract.methods.claim(...params),
+            config,
+        )
         return connection.sendTransaction(tx)
     }, [id, connection, signedMsg, account, chainId, totalAmount])
 }
diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx
index b7af97327970..dd57a2476f68 100644
--- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx
+++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useCreateCallback.tsx
@@ -1,11 +1,17 @@
 import { useCallback } from 'react'
 import { useAsyncFn } from 'react-use'
 import Web3Utils from 'web3-utils'
-import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
+import { omit } from 'lodash-unified'
+import { useAccount, useChainId, useWeb3Connection, useWeb3 } from '@masknet/plugin-infra/web3'
 import type { HappyRedPacketV4 } from '@masknet/web3-contracts/types/HappyRedPacketV4'
 import { FungibleToken, isLessThan, NetworkPluginID, toFixed } from '@masknet/web3-shared-base'
-import { ChainId, encodeTransaction, SchemaType, useTokenConstants } from '@masknet/web3-shared-evm'
-import { omit } from 'lodash-unified'
+import {
+    ChainId,
+    encodeContractTransaction,
+    SchemaType,
+    useTokenConstants,
+    decodeEvents,
+} from '@masknet/web3-shared-evm'
 import { useRedPacketContract } from './useRedPacketContract'
 
 export interface RedPacketSettings {
@@ -111,11 +117,11 @@ export function useCreateCallback(redPacketSettings: RedPacketSettings, version:
     const redPacketContract = useRedPacketContract(chainId, version)
     const getCreateParams = useCreateParams(redPacketSettings, version, publicKey)
     const connection = useWeb3Connection(NetworkPluginID.PLUGIN_EVM)
+    const web3 = useWeb3(NetworkPluginID.PLUGIN_EVM)
 
     return useAsyncFn(async () => {
         const { token } = redPacketSettings
         const createParams = await getCreateParams()
-
         if (!token || !redPacketContract || !createParams) return
 
         const { gas, params, paramsObj, gasError } = createParams
@@ -138,12 +144,23 @@ export function useCreateCallback(redPacketSettings: RedPacketSettings, version:
             gas,
         }
 
-        const tx = await encodeTransaction(
+        const tx = await encodeContractTransaction(
             redPacketContract,
             redPacketContract.methods.create_red_packet(...params),
             config,
         )
 
-        return connection.sendTransaction(tx)
+        const hash = await connection.sendTransaction(tx)
+        const receipt = await connection.getTransactionReceipt(hash)
+        if (receipt) {
+            const events = decodeEvents(web3, redPacketContract.options.jsonInterface, receipt)
+
+            return {
+                hash,
+                receipt,
+                events,
+            }
+        }
+        return { hash, receipt }
     }, [account, connection, redPacketContract, redPacketSettings, chainId, getCreateParams])
 }
diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useRefundCallback.ts b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useRefundCallback.ts
index c77012aa468f..c6c59eb27c3c 100644
--- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useRefundCallback.ts
+++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/hooks/useRefundCallback.ts
@@ -1,6 +1,6 @@
 import { useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { NetworkPluginID } from '@masknet/web3-shared-base'
-import { encodeTransaction } from '@masknet/web3-shared-evm'
+import { encodeContractTransaction } from '@masknet/web3-shared-evm'
 import { useState } from 'react'
 import { useAsyncFn } from 'react-use'
 import { useRedPacketContract } from './useRedPacketContract'
@@ -18,7 +18,7 @@ export function useRefundCallback(version: number, from: string, id?: string) {
         const config = {
             from,
         }
-        const tx = await encodeTransaction(redPacketContract, redPacketContract.methods.refund(id), config)
+        const tx = await encodeContractTransaction(redPacketContract, redPacketContract.methods.refund(id), config)
         const hash = await connection.sendTransaction(tx)
         setIsRefunded(true)
         return hash
diff --git a/packages/mask/src/plugins/RedPacket/locales/qya-AA.json b/packages/mask/src/plugins/RedPacket/locales/qya-AA.json
index b9deb7f435f7..0dec9e1e3e55 100644
--- a/packages/mask/src/plugins/RedPacket/locales/qya-AA.json
+++ b/packages/mask/src/plugins/RedPacket/locales/qya-AA.json
@@ -54,7 +54,7 @@
     "send_symbol": "crwdns16836:0{{amount}}crwdnd16836:0{{symbol}}crwdne16836:0",
     "back": "crwdns16838:0crwdne16838:0",
     "hint": "crwdns16840:0crwdne16840:0",
-    "total_amount": "crwdns17248:0crwdne17248:0",
+    "amount_total": "crwdns16842:0crwdne16842:0",
     "amount_per_share": "crwdns16844:0crwdne16844:0",
     "shares": "crwdns16846:0crwdne16846:0",
     "average": "crwdns16848:0crwdne16848:0",
diff --git a/packages/mask/src/plugins/Referral/SNSAdaptor/FarmPost.tsx b/packages/mask/src/plugins/Referral/SNSAdaptor/FarmPost.tsx
index 32531a8cd768..d3436f6bb52f 100644
--- a/packages/mask/src/plugins/Referral/SNSAdaptor/FarmPost.tsx
+++ b/packages/mask/src/plugins/Referral/SNSAdaptor/FarmPost.tsx
@@ -192,7 +192,10 @@ export function FarmPost(props: FarmPostProps) {
                 )}
             </Card>
             <Grid container className={classes.actions}>
-                <ChainBoundary expectedChainId={SWAP_CHAIN_ID} expectedPluginID={NetworkPluginID.PLUGIN_EVM}>
+                <ChainBoundary
+                    expectedChainId={SWAP_CHAIN_ID}
+                    expectedPluginID={NetworkPluginID.PLUGIN_EVM}
+                    renderInTimeline>
                     <WalletConnectedBoundary offChain>
                         <Grid item xs={6} display="flex" textAlign="center">
                             <Button variant="contained" size="medium" onClick={onClickBuyToFarm}>
diff --git a/packages/mask/src/plugins/Referral/SNSAdaptor/utils/referralFarm.ts b/packages/mask/src/plugins/Referral/SNSAdaptor/utils/referralFarm.ts
index 19fd0e328319..8df527027eca 100644
--- a/packages/mask/src/plugins/Referral/SNSAdaptor/utils/referralFarm.ts
+++ b/packages/mask/src/plugins/Referral/SNSAdaptor/utils/referralFarm.ts
@@ -1,7 +1,7 @@
 import { defaultAbiCoder } from '@ethersproject/abi'
 import { parseUnits } from '@ethersproject/units'
 import BigNumber from 'bignumber.js'
-import { ChainId, createContract, encodeTransaction } from '@masknet/web3-shared-evm'
+import { ChainId, createContract, encodeContractTransaction } from '@masknet/web3-shared-evm'
 import type Web3 from 'web3'
 import { AbiItem, asciiToHex, padRight, toWei } from 'web3-utils'
 import ReferralFarmsV1ABI from '@masknet/web3-contracts/abis/ReferralFarmsV1.json'
@@ -57,7 +57,7 @@ export async function runCreateERC20PairFarm(
     if (isNeededGrantPermission && rewardTokenContract) {
         const maxAllowance = new BigNumber(toWei('10000000000000', 'ether'))
 
-        const approveTx = await encodeTransaction(
+        const approveTx = await encodeContractTransaction(
             rewardTokenContract,
             rewardTokenContract.methods.approve(farmsAddr, maxAllowance),
             config,
@@ -80,7 +80,7 @@ export async function runCreateERC20PairFarm(
             : []
 
     if (!farms) return
-    const tx = await encodeTransaction(
+    const tx = await encodeContractTransaction(
         farms,
         farms.methods.increaseReferralFarm(rewardTokenDefn, referredTokenDefn, totalFarmRewardUint128, metaState),
         config,
@@ -145,7 +145,7 @@ export async function adjustFarmRewards(
         ]
 
         if (!farms) return
-        const tx = await encodeTransaction(
+        const tx = await encodeContractTransaction(
             farms,
             farms.methods.configureMetastate(rewardTokenDefn, referredTokenDefn, metaState),
             config,
diff --git a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx
index 1de646ea47ae..dc41ce256104 100644
--- a/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx
+++ b/packages/mask/src/plugins/Savings/SNSAdaptor/SavingsDialog.tsx
@@ -54,8 +54,8 @@ export function SavingsDialog({ open, onClose }: SavingsDialogProps) {
     }, [])
 
     const { value: aaveTokens } = useAsync(async () => {
-        if (chainId !== ChainId.Mainnet) {
-            return []
+        if (!open || chainId !== ChainId.Mainnet) {
+            return EMPTY_LIST
         }
 
         const address = getAaveConstants(chainId).AAVE_PROTOCOL_DATA_PROVIDER_CONTRACT_ADDRESS || ZERO_ADDRESS
@@ -73,7 +73,7 @@ export function SavingsDialog({ open, onClose }: SavingsDialogProps) {
         return tokens?.map((token) => {
             return [token[1], aTokens?.filter((f) => f[0].toUpperCase() === `a${token[0]}`.toUpperCase())[0][1]]
         })
-    }, [web3, chainId])
+    }, [open, web3, chainId])
 
     const { value: detailedAaveTokens } = useFungibleTokens(
         NetworkPluginID.PLUGIN_EVM,
diff --git a/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/AddWallet.tsx b/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/AddWallet.tsx
index cec9a8ce3ff3..d8bd998d186c 100644
--- a/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/AddWallet.tsx
+++ b/packages/mask/src/plugins/Tips/SNSAdaptor/bodyViews/AddWallet.tsx
@@ -10,6 +10,7 @@ import Services from '../../../../extension/service'
 import { useCustomSnackbar } from '@masknet/theme'
 import formatDateTime from 'date-fns/format'
 import {
+    useAccount,
     useChainId,
     useProviderDescriptor,
     useProviderType,
@@ -33,13 +34,14 @@ const AddWalletView = memo(({ currentPersona, bindings, onCancel }: AddWalletVie
     const chainId = useChainId(NetworkPluginID.PLUGIN_EVM)
     const providerType = useProviderType(NetworkPluginID.PLUGIN_EVM)
     const wallet = useWallet(NetworkPluginID.PLUGIN_EVM)
-    const { value: domain } = useReverseAddress(NetworkPluginID.PLUGIN_EVM, wallet?.address)
+    const account = useAccount(NetworkPluginID.PLUGIN_EVM)
+    const { value: domain } = useReverseAddress(NetworkPluginID.PLUGIN_EVM, account)
     const { Others } = useWeb3State(NetworkPluginID.PLUGIN_EVM)
     const connection = useWeb3Connection(NetworkPluginID.PLUGIN_EVM)
 
     const isNotEvm = useProviderDescriptor()?.providerAdaptorPluginID !== NetworkPluginID.PLUGIN_EVM
     const nowTime = useMemo(() => formatDateTime(new Date(), 'yyyy-MM-dd HH:mm'), [])
-    const isBound = bindings.some((x) => isSameAddress(x.identity, wallet?.address))
+    const isBound = bindings.some((x) => isSameAddress(x.identity, account))
 
     const walletName = () => {
         if (isNotEvm && providerType) return `${Others?.providerResolver.providerName(providerType)} Wallet`
@@ -50,15 +52,15 @@ const AddWalletView = memo(({ currentPersona, bindings, onCancel }: AddWalletVie
     }
 
     const { value: payload, loading: payloadLoading } = useAsync(async () => {
-        if (!currentPersona || !wallet?.address) return
+        if (!currentPersona || !account) return
         return NextIDProof.createPersonaPayload(
             currentPersona.identifier.publicKeyAsHex,
             NextIDAction.Create,
-            wallet.address,
+            account,
             NextIDPlatform.Ethereum,
             'default',
         )
-    }, [currentPersona?.identifier, wallet?.address])
+    }, [currentPersona?.identifier, account])
 
     const [{ value: signature }, personaSilentSign] = useAsyncFn(async () => {
         if (!payload || !currentPersona?.identifier) return
@@ -82,16 +84,20 @@ const AddWalletView = memo(({ currentPersona, bindings, onCancel }: AddWalletVie
     }, [currentPersona?.identifier, payload])
 
     const [{ value: walletSignState }, walletSign] = useAsyncFn(async () => {
-        if (!payload || !currentPersona || !wallet?.address) return false
+        if (!payload || !currentPersona || !account) return false
         try {
-            const walletSig = await connection?.signMessage(payload.signPayload, wallet.address)
+            const walletSig = await connection?.signMessage(payload.signPayload, 'personalSign', {
+                chainId,
+                account,
+                providerType,
+            })
             if (!walletSig) throw new Error('Wallet sign failed')
             await NextIDProof.bindProof(
                 payload.uuid,
                 currentPersona.identifier.publicKeyAsHex,
                 NextIDAction.Create,
                 NextIDPlatform.Ethereum,
-                wallet.address,
+                account,
                 payload.createdAt,
                 {
                     walletSignature: walletSig,
@@ -101,6 +107,7 @@ const AddWalletView = memo(({ currentPersona, bindings, onCancel }: AddWalletVie
             showSnackbar(t.tip_wallet_sign_success(), { variant: 'success', message: nowTime })
             return true
         } catch (error) {
+            console.log(error, 'error')
             showSnackbar(t.tip_wallet_sign_error(), { variant: 'error', message: nowTime })
             return false
         }
@@ -127,16 +134,17 @@ const AddWalletView = memo(({ currentPersona, bindings, onCancel }: AddWalletVie
         }
     }, [signature, walletSignState, walletSign, personaSilentSign])
     const { openDialog } = useRemoteControlledDialog(WalletMessages.events.selectProviderDialogUpdated)
-    if (!currentPersona || !wallet || !providerType) return null
+
+    if (!currentPersona || !providerType) return null
 
     return (
         <div>
             <Steps
                 isBound={isBound}
                 notEvm={isNotEvm}
-                notConnected={!wallet?.address}
+                notConnected={!account}
                 wallet={{
-                    account: wallet.address,
+                    account,
                     chainId,
                     providerType,
                 }}
@@ -144,7 +152,7 @@ const AddWalletView = memo(({ currentPersona, bindings, onCancel }: AddWalletVie
                 nickname={currentPersona.nickname}
                 step={step}
                 confirmLoading={confirmLoading || payloadLoading}
-                disableConfirm={isBound || isNotEvm || !wallet.address}
+                disableConfirm={isBound || !!(isNotEvm && account) || !account}
                 notInPop
                 changeWallet={openDialog}
                 onConfirm={handleConfirm}
diff --git a/packages/mask/src/plugins/Tips/components/TipForm.tsx b/packages/mask/src/plugins/Tips/components/TipForm.tsx
index 19f6e6bd743f..85a3836508f6 100644
--- a/packages/mask/src/plugins/Tips/components/TipForm.tsx
+++ b/packages/mask/src/plugins/Tips/components/TipForm.tsx
@@ -54,6 +54,8 @@ const useStyles = makeStyles()((theme) => {
         },
         actionButton: {
             marginTop: theme.spacing(1.5),
+            paddingTop: 12,
+            paddingBottom: 12,
             fontSize: 16,
         },
         button: {
diff --git a/packages/mask/src/plugins/Tips/components/TipTaskManager.tsx b/packages/mask/src/plugins/Tips/components/TipTaskManager.tsx
index b34b04a3b497..4f3001123cc5 100644
--- a/packages/mask/src/plugins/Tips/components/TipTaskManager.tsx
+++ b/packages/mask/src/plugins/Tips/components/TipTaskManager.tsx
@@ -14,7 +14,7 @@ export const TipTaskManager: FC<React.PropsWithChildren<{}>> = ({ children }) =>
     const [tasks, setTasks] = useState<Task[]>(EMPTY_LIST)
 
     const removeTask = useCallback((task: Task) => {
-        setTasks((list) => list.filter((t) => t !== task))
+        setTasks((list) => list.filter((t) => t.id !== task.id))
     }, [])
 
     useEffect(() => {
diff --git a/packages/mask/src/plugins/Trader/trader/native/useTradeCallback.ts b/packages/mask/src/plugins/Trader/trader/native/useTradeCallback.ts
index 9163d4298326..42c4e80693c5 100644
--- a/packages/mask/src/plugins/Trader/trader/native/useTradeCallback.ts
+++ b/packages/mask/src/plugins/Trader/trader/native/useTradeCallback.ts
@@ -24,5 +24,5 @@ export function useTradeCallback(trade: TradeComputed<NativeTokenWrapper> | null
             result = await unwrapCallback(false, tradeAmount)
         }
         return result
-    }, [wrapCallback, unwrapCallback])
+    }, [wrapCallback, unwrapCallback, trade])
 }
diff --git a/packages/mask/src/plugins/Wallet/Dashboard/index.tsx b/packages/mask/src/plugins/Wallet/Dashboard/index.tsx
index 63a4b7fc081f..c08ee5d9b6ca 100644
--- a/packages/mask/src/plugins/Wallet/Dashboard/index.tsx
+++ b/packages/mask/src/plugins/Wallet/Dashboard/index.tsx
@@ -10,6 +10,7 @@ import { WalletRiskWarningDialog } from '../SNSAdaptor/RiskWarningDialog'
 import { GasSettingDialog } from '../SNSAdaptor/GasSettingDialog'
 import { TransactionSnackbar } from '../SNSAdaptor/TransactionSnackbar'
 import { WalletConnectQRCodeDialog } from '../SNSAdaptor/WalletConnectQRCodeDialog'
+import { ExtensionSite, getSiteType } from '@masknet/shared-base'
 
 const dashboard: Plugin.Dashboard.Definition = {
     ...base,
@@ -24,7 +25,9 @@ const dashboard: Plugin.Dashboard.Definition = {
                 <ConnectWalletDialog />
                 <WalletRiskWarningDialog />
                 <GasSettingDialog />
-                <TransactionSnackbar pluginID={NetworkPluginID.PLUGIN_EVM} />
+                {getSiteType() !== ExtensionSite.Popup ? (
+                    <TransactionSnackbar pluginID={NetworkPluginID.PLUGIN_EVM} />
+                ) : null}
                 <WalletConnectQRCodeDialog />
             </>
         )
diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionSnackbar/index.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionSnackbar/index.tsx
index b7a48c8f336f..1272f1ca625f 100644
--- a/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionSnackbar/index.tsx
+++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/TransactionSnackbar/index.tsx
@@ -34,8 +34,6 @@ export function TransactionSnackbar<T extends NetworkPluginID>({ pluginID }: Tra
 
     useEffect(() => {
         const off = TransactionWatcher?.emitter.on('error', (error) => {
-            console.log('DEBUG: error')
-            console.log(error)
             setError(error)
         })
         return () => {
diff --git a/packages/mask/src/plugins/Wallet/services/account.ts b/packages/mask/src/plugins/Wallet/services/account.ts
index 38472d565b24..e48f83445a68 100644
--- a/packages/mask/src/plugins/Wallet/services/account.ts
+++ b/packages/mask/src/plugins/Wallet/services/account.ts
@@ -27,7 +27,10 @@ export async function updateMaskAccount(options: { account?: string; chainId?: C
     const { account, chainId, networkType } = options
     if (chainId) currentMaskWalletChainIdSettings.value = chainId
     if (networkType) currentMaskWalletNetworkSettings.value = networkType
-    if (account && EthereumAddress.isValid(account)) currentMaskWalletAccountSettings.value = account
+    if (account && EthereumAddress.isValid(account)) {
+        currentMaskWalletAccountSettings.value = account
+        await resolveMaskAccount([account])
+    }
 }
 
 export async function resetMaskAccount() {
diff --git a/packages/mask/src/plugins/dHEDGE/hooks/useInvestCallback.ts b/packages/mask/src/plugins/dHEDGE/hooks/useInvestCallback.ts
index 09e1c9ba595c..ebe15d59e376 100644
--- a/packages/mask/src/plugins/dHEDGE/hooks/useInvestCallback.ts
+++ b/packages/mask/src/plugins/dHEDGE/hooks/useInvestCallback.ts
@@ -1,7 +1,7 @@
+import { useAsyncFn } from 'react-use'
 import { useAccount, useChainId, useWeb3Connection } from '@masknet/plugin-infra/web3'
 import { FungibleToken, NetworkPluginID, toFixed } from '@masknet/web3-shared-base'
-import { ChainId, encodeTransaction, SchemaType } from '@masknet/web3-shared-evm'
-import { useAsyncFn } from 'react-use'
+import { ChainId, encodeContractTransaction, SchemaType } from '@masknet/web3-shared-evm'
 import { useDHedgePoolV1Contract, useDHedgePoolV2Contract } from '../contracts/useDHedgePool'
 import { Pool, PoolType } from '../types'
 
@@ -28,8 +28,12 @@ export function useInvestCallback(pool: Pool | undefined, amount: string, token?
 
         const tx =
             pool?.poolType === PoolType.v1
-                ? await encodeTransaction(poolV1Contract, poolV1Contract.methods.deposit(amount), config)
-                : await encodeTransaction(poolV2Contract, poolV2Contract.methods.deposit(token.address, amount), config)
+                ? await encodeContractTransaction(poolV1Contract, poolV1Contract.methods.deposit(amount), config)
+                : await encodeContractTransaction(
+                      poolV2Contract,
+                      poolV2Contract.methods.deposit(token.address, amount),
+                      config,
+                  )
 
         return connection.sendTransaction(tx)
     }, [pool, account, amount, token, connection])
diff --git a/packages/mask/src/settings/settings.ts b/packages/mask/src/settings/settings.ts
index 65dc13f60ddd..9f7fdddf64a0 100644
--- a/packages/mask/src/settings/settings.ts
+++ b/packages/mask/src/settings/settings.ts
@@ -15,7 +15,7 @@ export const appearanceSettings = createGlobalSettings<Appearance>('appearance',
 export const languageSettings = createGlobalSettings<LanguageOptions>('language', LanguageOptions.__auto__)
 languageSettings.addListener(updateLanguage)
 export const pluginIDSettings = createComplexGlobalSettings<Record<EnhanceableSite | ExtensionSite, NetworkPluginID>>(
-    'pluginID',
+    'PluginIdBySite',
     {
         [EnhanceableSite.Twitter]: NetworkPluginID.PLUGIN_EVM,
         [EnhanceableSite.Facebook]: NetworkPluginID.PLUGIN_EVM,
diff --git a/packages/mask/src/social-network-adaptor/index.ts b/packages/mask/src/social-network-adaptor/index.ts
index 746a58d0bde5..13e823f032d6 100644
--- a/packages/mask/src/social-network-adaptor/index.ts
+++ b/packages/mask/src/social-network-adaptor/index.ts
@@ -2,4 +2,4 @@ import './facebook.com'
 import './twitter.com'
 import './instagram.com'
 import './minds.com'
-import './opensea.io'
+// TODO: add opensea
diff --git a/packages/mask/src/social-network-adaptor/instagram.com/injection/NFT/ProfileNFTAvatar.tsx b/packages/mask/src/social-network-adaptor/instagram.com/injection/NFT/ProfileNFTAvatar.tsx
index 4b3fd6fc0e95..ee1f7d0dcf91 100644
--- a/packages/mask/src/social-network-adaptor/instagram.com/injection/NFT/ProfileNFTAvatar.tsx
+++ b/packages/mask/src/social-network-adaptor/instagram.com/injection/NFT/ProfileNFTAvatar.tsx
@@ -1,14 +1,19 @@
 import { MutationObserverWatcher } from '@dimensiondev/holoflows-kit'
-import { searchInstagramAvatarListSelector } from '../../utils/selector'
+import { searchInstagramAvatarEditPageSettingDialog, searchInstagramAvatarListSelector } from '../../utils/selector'
 import { createReactRootShadowed, MaskMessages, startWatch, useI18N, useLocationChange } from '../../../../utils'
 import { makeStyles } from '@masknet/theme'
 import { useCallback, useLayoutEffect, useState } from 'react'
 import { useLocation } from 'react-use'
+import { NFTAvatarSettingDialog } from './NFTAvatarSettingDialog'
 
 export async function injectProfileNFTAvatarInInstagram(signal: AbortSignal) {
     const watcher = new MutationObserverWatcher(searchInstagramAvatarListSelector())
     startWatch(watcher, signal)
     createReactRootShadowed(watcher.firstDOMProxy.afterShadow, { signal }).render(<NFTAvatarButtonInDialog />)
+
+    const dialogWatcher = new MutationObserverWatcher(searchInstagramAvatarEditPageSettingDialog())
+    startWatch(dialogWatcher, signal)
+    createReactRootShadowed(dialogWatcher.firstDOMProxy.afterShadow, { signal }).render(<NFTAvatarSettingDialog />)
 }
 
 const useStyles = makeStyles<StyleProps>()((theme, props) => ({
diff --git a/packages/mask/src/social-network-adaptor/instagram.com/utils/selector.ts b/packages/mask/src/social-network-adaptor/instagram.com/utils/selector.ts
index 384765459c04..9bfb792a37a2 100644
--- a/packages/mask/src/social-network-adaptor/instagram.com/utils/selector.ts
+++ b/packages/mask/src/social-network-adaptor/instagram.com/utils/selector.ts
@@ -41,7 +41,7 @@ export const searchUserIdSelector = () =>
     querySelector('#ssrb_root_start').closest(1).querySelector<HTMLHeadingElement>('section main header section h2')
 
 export const searchUserIdInEditPageSelector = () =>
-    querySelector('#ssrb_root_start').closest(1).querySelector('button > img').closest(4).querySelector('h1')
+    querySelector('#react-root').querySelector('button > img').closest(4).querySelector('h1')
 
 export const searchProfileTabArticlePageSelector = () =>
     querySelector('#ssrb_root_start').closest(1).querySelector<E>('section main div[role="tablist"]')
@@ -63,6 +63,8 @@ export const searchInstagramProfileAvatarButtonSelector = () =>
 
 export const searchInstagramAvatarSettingDialog = () => querySelector('#ssrb_root_start').closest<E>(1)
 
+export const searchInstagramAvatarEditPageSettingDialog = () => querySelector('#react-root')
+
 export const searchInstagramProfileSettingButtonSelector = () =>
     querySelector('#ssrb_root_start')
         .closest(1)
@@ -75,5 +77,5 @@ export const searchInstagramProfileEditButton = () =>
 
 export const searchInstagramPostAvatarSelector = () =>
     new LiveSelector<HTMLImageElement, false>().querySelectorAll<HTMLImageElement>(
-        '[role="button"] > a > img[data-testid="user-avatar"]',
+        '[role="button"] > a > img[crossorigin="anonymous"]',
     )
diff --git a/packages/mask/src/social-network-adaptor/twitter.com/collecting/identity.ts b/packages/mask/src/social-network-adaptor/twitter.com/collecting/identity.ts
index b521ae9440d3..c9f1759efde2 100644
--- a/packages/mask/src/social-network-adaptor/twitter.com/collecting/identity.ts
+++ b/packages/mask/src/social-network-adaptor/twitter.com/collecting/identity.ts
@@ -125,24 +125,18 @@ function resolveCurrentVisitingIdentityInner(
     const assign = async () => {
         await delay(5000)
         const bio = getBio()
-        const homepage = getPersonalHomepage()
         const nickname = getNickname()
         const handle = getTwitterId()
         const avatar = getAvatar()
+        const homepage = await Services.Helper.resolveTCOLink(getPersonalHomepage())
 
         ref.value = {
             identifier: ProfileIdentifier.of(twitterBase.networkIdentifier, handle).unwrapOr(undefined),
             nickname,
             avatar,
             bio,
+            homepage: homepage ?? '',
         }
-        Services.Helper.resolveTCOLink(homepage).then((link) => {
-            if (cancel?.aborted || !link) return
-            ref.value = {
-                ...ref.value,
-                homepage: link,
-            }
-        })
     }
     const createWatcher = (selector: LiveSelector<HTMLElement, boolean>) => {
         new MutationObserverWatcher(selector)
diff --git a/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts b/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts
index bc9174c4d2b4..8db5eb98b6c2 100644
--- a/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts
+++ b/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts
@@ -57,6 +57,9 @@ const useInjectedDialogClassesOverwriteTwitter = makeStyles()((theme) => {
                 display: 'block !important',
                 margin: 12,
             },
+            '&::-webkit-scrollbar': {
+                display: 'none',
+            },
         },
         dialogTitle: {
             display: 'grid',
diff --git a/packages/mask/src/social-network-adaptor/twitter.com/utils/user.ts b/packages/mask/src/social-network-adaptor/twitter.com/utils/user.ts
index d0f6a1f62a6e..2279ed63689c 100644
--- a/packages/mask/src/social-network-adaptor/twitter.com/utils/user.ts
+++ b/packages/mask/src/social-network-adaptor/twitter.com/utils/user.ts
@@ -49,7 +49,7 @@ export const getBio = () => {
 
 export const getPersonalHomepage = () => {
     const node = personalHomepageSelector().evaluate()
-    return node?.getAttribute('href') || ''
+    return node?.getAttribute('href') ?? ''
 }
 
 export const getAvatar = () => {
diff --git a/packages/mask/src/web3/UI/ChainBoundary.tsx b/packages/mask/src/web3/UI/ChainBoundary.tsx
index 6135eeb03b8a..b2c63246abb6 100644
--- a/packages/mask/src/web3/UI/ChainBoundary.tsx
+++ b/packages/mask/src/web3/UI/ChainBoundary.tsx
@@ -24,6 +24,7 @@ import { WalletMessages } from '../../plugins/Wallet/messages'
 import { WalletIcon } from '@masknet/shared'
 import { PluginWalletConnectIcon } from '@masknet/icons'
 import { NetworkPluginID } from '@masknet/web3-shared-base'
+import { useActivatedPlugin } from '@masknet/plugin-infra/dom'
 
 const useStyles = makeStyles()((theme) => ({
     action: {
@@ -71,15 +72,18 @@ export function ChainBoundary<T extends NetworkPluginID>(props: ChainBoundaryPro
     const classes = useStylesExtends(useStyles(), props)
 
     const actualPluginID = useCurrentWeb3NetworkPluginID()
+    const plugin = useActivatedPlugin(actualPluginID, 'any')
+
     const { Others: actualOthers } = useWeb3State(actualPluginID)
     const actualChainId = useChainId(actualPluginID)
     const actualProviderType = useProviderType(actualPluginID)
     const actualChainName = actualOthers?.chainResolver.chainName(actualChainId)
+    const account = useAccount(actualPluginID)
 
     const { Others: expectedOthers } = useWeb3State(expectedPluginID)
     const expectedConnection = useWeb3Connection(expectedPluginID)
     const expectedAllowTestnet = useAllowTestnet(expectedPluginID)
-    const expectedAccount = useAccount(expectedPluginID)
+
     const expectedChainName = expectedOthers?.chainResolver.chainName(expectedChainId)
     const expectedNetworkDescriptor = useNetworkDescriptor(NetworkPluginID.PLUGIN_EVM, expectedChainId)
     const expectedChainAllowed = expectedOthers?.chainResolver.isValid(expectedChainId, expectedAllowTestnet)
@@ -151,7 +155,7 @@ export function ChainBoundary<T extends NetworkPluginID>(props: ChainBoundaryPro
         )
     }
 
-    if (!expectedAccount)
+    if (!account)
         return renderBox(
             <>
                 {!props.hiddenConnectButton ? (
@@ -171,6 +175,54 @@ export function ChainBoundary<T extends NetworkPluginID>(props: ChainBoundaryPro
 
     if (isMatched) return <>{props.children}</>
 
+    if (actualPluginID !== expectedPluginID) {
+        return renderBox(
+            <>
+                {!noSwitchNetworkTip ? (
+                    <Typography color={MaskColorVar.errorPlugin}>
+                        <span>
+                            {t('plugin_wallet_not_available_on', {
+                                network: plugin?.name?.fallback ?? 'Unknown Plugin',
+                            })}
+                        </span>
+                    </Typography>
+                ) : null}
+                {expectedChainAllowed ? (
+                    <ActionButtonPromise
+                        fullWidth
+                        className={classes.switchButton}
+                        startIcon={
+                            <WalletIcon
+                                mainIcon={expectedNetworkDescriptor?.icon} // switch the icon to meet design
+                                size={18}
+                            />
+                        }
+                        sx={props.ActionButtonPromiseProps?.sx}
+                        style={{ borderRadius: 10 }}
+                        init={
+                            <span>
+                                {t('plugin_wallet_connect_network', {
+                                    network: 'EVM',
+                                })}
+                            </span>
+                        }
+                        waiting={t('plugin_wallet_connect_network_under_going', {
+                            network: 'EVM',
+                        })}
+                        complete={t('plugin_wallet_connect_network', {
+                            network: 'EVM',
+                        })}
+                        failed={t('retry')}
+                        executor={onSwitchChain}
+                        completeOnClick={onSwitchChain}
+                        failedOnClick="use executor"
+                        {...buttonProps}
+                    />
+                ) : null}
+            </>,
+        )
+    }
+
     return renderBox(
         <>
             {!noSwitchNetworkTip ? (
diff --git a/packages/mask/src/web3/UI/SelectTokenChip.tsx b/packages/mask/src/web3/UI/SelectTokenChip.tsx
index ec8f5bd5ff7d..11635b3e028e 100644
--- a/packages/mask/src/web3/UI/SelectTokenChip.tsx
+++ b/packages/mask/src/web3/UI/SelectTokenChip.tsx
@@ -66,7 +66,14 @@ export function SelectTokenChip(props: SelectTokenChipProps) {
         return (
             <Chip
                 className={classes.chip}
-                icon={<TokenIcon address={token.address} name={token.name} logoURL={token.logoURL} />}
+                icon={
+                    <TokenIcon
+                        address={token.address}
+                        chainId={token.chainId}
+                        name={token.name}
+                        logoURL={token.logoURL}
+                    />
+                }
                 deleteIcon={<ErrorIcon className={classes.icon} />}
                 label={token.symbol}
                 color="default"
@@ -86,6 +93,7 @@ export function SelectTokenChip(props: SelectTokenChipProps) {
                     classes={{ icon: classes.tokenIcon }}
                     address={token.address}
                     name={token.name}
+                    chainId={token.chainId}
                     logoURL={token.logoURL}
                 />
             }
diff --git a/packages/plugin-infra/src/web3-helpers/index.ts b/packages/plugin-infra/src/web3-helpers/index.ts
index b0eb1e1cd1f9..e6139a76b455 100644
--- a/packages/plugin-infra/src/web3-helpers/index.ts
+++ b/packages/plugin-infra/src/web3-helpers/index.ts
@@ -206,8 +206,7 @@ export declare namespace Web3Helper {
     export type Web3HubAll = Hub<
         Definition[NetworkPluginID]['ChainId'],
         Definition[NetworkPluginID]['SchemaType'],
-        Definition[NetworkPluginID]['GasOption'],
-        Definition[NetworkPluginID]['Transaction']
+        Definition[NetworkPluginID]['GasOption']
     >
 
     export type Web3StateAll = Web3Plugin.ObjectCapabilities.Capabilities<
diff --git a/packages/plugin-infra/src/web3-state/Identity.ts b/packages/plugin-infra/src/web3-state/Identity.ts
index 0b58535c59b5..e5c95779c1c0 100644
--- a/packages/plugin-infra/src/web3-state/Identity.ts
+++ b/packages/plugin-infra/src/web3-state/Identity.ts
@@ -14,7 +14,7 @@ export class IdentityServiceState implements Web3SocialIdentityState {
 
     private getIdentityID(identity: SocialIdentity) {
         if (!identity.identifier) return ''
-        return `${identity.identifier.network}_${identity.identifier.userId}`
+        return `${identity.identifier.network}_${identity.identifier.userId}_${identity.bio}_${identity.homepage}`
     }
 
     protected getFromCache(identity: SocialIdentity): Promise<Array<SocialAddress<NetworkPluginID>>> {
diff --git a/packages/plugin-infra/src/web3-state/Provider.ts b/packages/plugin-infra/src/web3-state/Provider.ts
index ae34590eaa5c..080adc4b39ef 100644
--- a/packages/plugin-infra/src/web3-state/Provider.ts
+++ b/packages/plugin-infra/src/web3-state/Provider.ts
@@ -115,6 +115,7 @@ export class ProviderState<
     }
 
     private async setAccount(providerType: ProviderType, account: Partial<Account<ChainId>>) {
+        if (this.storage.providerType.value !== providerType) return
         const siteType = getSiteType()
         if (!siteType) return
 
@@ -130,7 +131,6 @@ export class ProviderState<
         const needToUpdateChainId = accountCopied.chainId && account_.chainId !== accountCopied.chainId
 
         if (needToUpdateAccount || needToUpdateChainId) {
-            await this.storage.providerType.setValue(providerType)
             await this.storage.account.setValue({
                 ...account_,
                 ...accountCopied,
@@ -179,8 +179,8 @@ export class ProviderState<
         }
 
         // update local storage
-        await this.setAccount(providerType, account)
         await this.setProvider(providerType)
+        await this.setAccount(providerType, account)
 
         provider.emitter.emit('connect', account)
         return account
diff --git a/packages/plugin-infra/src/web3/EVM/useMulticall.ts b/packages/plugin-infra/src/web3/EVM/useMulticall.ts
index b5093df0d75e..f256e369e1ff 100644
--- a/packages/plugin-infra/src/web3/EVM/useMulticall.ts
+++ b/packages/plugin-infra/src/web3/EVM/useMulticall.ts
@@ -5,8 +5,8 @@ import { ChainId, decodeOutputString, UnboxTransactionObject } from '@masknet/we
 import type { BaseContract, NonPayableTx } from '@masknet/web3-contracts/types/types'
 import { useMulticallContract } from './useMulticallContract'
 import { useChainId } from '../useChainId'
-import { useBlockNumber } from '../useBlockNumber'
 import { useWeb3 } from '../useWeb3'
+import { useWeb3Connection } from '../useWeb3Connection'
 
 // #region types
 // [target, gasLimit, callData]
@@ -103,10 +103,8 @@ export type MulticallState =
  * @param calls
  */
 export function useMulticallCallback(targetChainId?: ChainId, targetBlockNumber?: number) {
-    const currentChainId = useChainId(NetworkPluginID.PLUGIN_EVM)
-    const chainId = targetChainId ?? currentChainId
-    const { value: defaultBlockNumber = 0 } = useBlockNumber(NetworkPluginID.PLUGIN_EVM)
-    const blockNumber = targetBlockNumber ?? defaultBlockNumber
+    const chainId = useChainId(NetworkPluginID.PLUGIN_EVM, targetChainId)
+    const connection = useWeb3Connection(NetworkPluginID.PLUGIN_EVM)
     const multicallContract = useMulticallContract(chainId)
     const [multicallState, setMulticallState] = useState<MulticallState>({
         type: MulticallStateType.UNKNOWN,
@@ -119,6 +117,9 @@ export function useMulticallCallback(targetChainId?: ChainId, targetBlockNumber?
                 })
                 return
             }
+
+            const blockNumber = targetBlockNumber ?? (await connection.getBlockNumber())
+
             try {
                 setMulticallState({
                     type: MulticallStateType.PENDING,
@@ -153,7 +154,7 @@ export function useMulticallCallback(targetChainId?: ChainId, targetBlockNumber?
                 throw error
             }
         },
-        [chainId, blockNumber, multicallContract],
+        [chainId, targetBlockNumber, multicallContract],
     )
     return [multicallState, multicallCallback] as const
 }
diff --git a/packages/plugin-infra/src/web3/useSocialAddressListAll.ts b/packages/plugin-infra/src/web3/useSocialAddressListAll.ts
index 0fa5e1930d00..98986eeddd4e 100644
--- a/packages/plugin-infra/src/web3/useSocialAddressListAll.ts
+++ b/packages/plugin-infra/src/web3/useSocialAddressListAll.ts
@@ -1,8 +1,17 @@
-import { useAsyncRetry } from 'react-use'
 import { EMPTY_LIST } from '@masknet/shared-base'
 import { NetworkPluginID, SocialAddress, SocialIdentity } from '@masknet/web3-shared-base'
+import LRUCache from 'lru-cache'
+import { useAsyncRetry } from 'react-use'
 import { useWeb3State } from './useWeb3State'
 
+type AddressList = Array<SocialAddress<NetworkPluginID>>
+type CacheValue = Promise<Array<PromiseSettledResult<AddressList>>>
+
+const addressCache = new LRUCache<string, CacheValue>({
+    max: 500,
+    ttl: 2 * 60 * 1000,
+})
+
 /**
  * Get all social addresses under of all networks.
  */
@@ -18,9 +27,14 @@ export function useSocialAddressListAll(
         const userId = identity?.identifier?.userId
         if (!userId || userId === '$unknown') return EMPTY_LIST
 
-        const allSettled = await Promise.allSettled<Array<SocialAddress<NetworkPluginID>>>(
-            [EVM_IdentityService, SolanaIdentityService].map((x) => x?.lookup(identity) ?? []),
-        )
+        let cached = addressCache.get(userId)
+        if (!cached) {
+            cached = Promise.allSettled<AddressList>(
+                [EVM_IdentityService, SolanaIdentityService].map((x) => x?.lookup(identity) ?? []),
+            )
+            addressCache.set(userId, cached)
+        }
+        const allSettled = await cached
         const listOfAddress = allSettled.flatMap((x) => (x.status === 'fulfilled' ? x.value : []))
         return sorter && listOfAddress.length ? listOfAddress.sort(sorter) : listOfAddress
     }, [identity, sorter, EVM_IdentityService?.lookup, SolanaIdentityService?.lookup])
diff --git a/packages/plugins/EVM/src/state/Connection/connection.ts b/packages/plugins/EVM/src/state/Connection/connection.ts
index 00dc70d240a7..fd11069e8fac 100644
--- a/packages/plugins/EVM/src/state/Connection/connection.ts
+++ b/packages/plugins/EVM/src/state/Connection/connection.ts
@@ -34,6 +34,7 @@ import {
     getEthereumConstants,
     isValidAddress,
     resolveIPFSLinkFromURL,
+    encodeTransaction,
 } from '@masknet/web3-shared-evm'
 import {
     Account,
@@ -57,7 +58,7 @@ import { Providers } from './provider'
 import type { ERC1155Metadata, ERC721Metadata, EVM_Connection, EVM_Web3ConnectionOptions } from './types'
 import { getReceiptStatus } from './utils'
 import { Web3StateSettings } from '../../settings'
-import { getSubscriptionCurrentValue } from '@masknet/shared-base'
+import { getSubscriptionCurrentValue, PartialRequired } from '@masknet/shared-base'
 
 const EMPTY_STRING = () => Promise.resolve('')
 const ZERO = () => Promise.resolve(0)
@@ -109,14 +110,10 @@ class Connection implements EVM_Connection {
 
     // Hijack RPC requests and process them with koa like middleware
     private get hijackedRequest() {
-        return <T extends unknown>(requestArguments: RequestArguments, options?: EVM_Web3ConnectionOptions) => {
+        return <T extends unknown>(requestArguments: RequestArguments, initial?: EVM_Web3ConnectionOptions) => {
             return new Promise<T>(async (resolve, reject) => {
-                const context = createContext(this, requestArguments, {
-                    account: this.account,
-                    chainId: this.chainId,
-                    providerType: this.providerType,
-                    ...options,
-                })
+                const options = this.getOptions(initial)
+                const context = createContext(this, requestArguments, options)
 
                 try {
                     await dispatch(context, async () => {
@@ -126,24 +123,24 @@ class Connection implements EVM_Connection {
                                 case EthereumMethodType.MASK_LOGIN:
                                     context.write(
                                         await Web3StateSettings.value.Provider?.connect(
-                                            context.chainId,
-                                            context.providerType,
+                                            options.chainId,
+                                            options.providerType,
                                         ),
                                     )
                                     break
                                 case EthereumMethodType.MASK_LOGOUT:
                                     context.write(
-                                        await Web3StateSettings.value.Provider?.disconnect(context.providerType),
+                                        await Web3StateSettings.value.Provider?.disconnect(options.providerType),
                                     )
                                     break
                                 default:
                                     const web3Provider = await Providers[
                                         isReadOnlyMethod(context.method)
                                             ? ProviderType.MaskWallet
-                                            : context.providerType
+                                            : options.providerType
                                     ].createWeb3Provider({
-                                        account: context.account,
-                                        chainId: context.chainId,
+                                        account: options.account,
+                                        chainId: options.chainId,
                                     })
 
                                     // send request and set result in the context
@@ -163,36 +160,56 @@ class Connection implements EVM_Connection {
         }
     }
 
-    getWeb3(options?: EVM_Web3ConnectionOptions) {
+    private getOptions(
+        initial?: EVM_Web3ConnectionOptions,
+        overrides?: Partial<EVM_Web3ConnectionOptions>,
+    ): PartialRequired<EVM_Web3ConnectionOptions, 'account' | 'chainId' | 'providerType'> {
+        return {
+            account: this.account,
+            chainId: this.chainId,
+            providerType: this.providerType,
+            ...initial,
+            overrides: {
+                from: this.account,
+                chainId: this.chainId,
+                ...initial?.overrides,
+                ...overrides?.overrides,
+            },
+        }
+    }
+
+    getWeb3(initial?: EVM_Web3ConnectionOptions) {
         const web3 = createWeb3(
-            createWeb3Provider((requestArguments: RequestArguments) => this.hijackedRequest(requestArguments, options)),
+            createWeb3Provider((requestArguments: RequestArguments) =>
+                this.hijackedRequest(requestArguments, this.getOptions(initial)),
+            ),
         )
         return Promise.resolve(web3)
     }
 
-    getWeb3Provider(options?: EVM_Web3ConnectionOptions) {
+    getWeb3Provider(initial?: EVM_Web3ConnectionOptions) {
         const web3Provider = createWeb3Provider((requestArguments: RequestArguments) =>
-            this.hijackedRequest(requestArguments, options),
+            this.hijackedRequest(requestArguments, this.getOptions(initial)),
         )
         return Promise.resolve(web3Provider)
     }
 
-    async connect(options?: EVM_Web3ConnectionOptions): Promise<Account<ChainId>> {
+    async connect(initial?: EVM_Web3ConnectionOptions): Promise<Account<ChainId>> {
         return this.hijackedRequest<Account<ChainId>>(
             {
                 method: EthereumMethodType.MASK_LOGIN,
                 params: [],
             },
-            options,
+            this.getOptions(initial),
         )
     }
-    async disconnect(options?: EVM_Web3ConnectionOptions): Promise<void> {
+    async disconnect(initial?: EVM_Web3ConnectionOptions): Promise<void> {
         await this.hijackedRequest<void>(
             {
                 method: EthereumMethodType.MASK_LOGOUT,
                 params: [],
             },
-            options,
+            this.getOptions(initial),
         )
     }
     async transferFungibleToken(
@@ -200,12 +217,13 @@ class Connection implements EVM_Connection {
         recipient: string,
         amount: string,
         memo?: string,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ): Promise<string> {
+        const options = this.getOptions(initial)
         // Native
-        if (!address || isNativeTokenAddress(options?.chainId ?? this.chainId, address)) {
+        if (!address || isNativeTokenAddress(options.chainId, address)) {
             const tx: Transaction = {
-                from: options?.account ?? this.account,
+                from: options.account,
                 to: recipient,
                 value: toHex(amount),
                 data: memo ? toHex(memo) : undefined,
@@ -214,7 +232,6 @@ class Connection implements EVM_Connection {
                 {
                     ...tx,
                     gas: await this.estimateTransaction(tx, 50000, options),
-                    ...options?.overrides,
                 },
                 options,
             )
@@ -223,7 +240,7 @@ class Connection implements EVM_Connection {
         // ERC20
         const contract = await this.getERC20Contract(address, options)
         const tx = contract?.methods.transfer(recipient, toHex(amount))
-        return sendTransaction(contract, tx, options?.overrides)
+        return sendTransaction(contract, tx, options.overrides)
     }
     async transferNonFungibleToken(
         address: string,
@@ -231,50 +248,52 @@ class Connection implements EVM_Connection {
         tokenId: string,
         amount?: string,
         schema?: SchemaType,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ): Promise<string> {
-        const account = options?.account ?? this.account
+        const options = this.getOptions(initial)
         const actualSchema = schema ?? (await this.getSchemaType(address, options))
 
         // ERC1155
         if (actualSchema === SchemaType.ERC1155) {
             const contract = await this.getERC1155Contract(address, options)
-            const tx = contract?.methods.safeTransferFrom(account, recipient, tokenId, amount ?? '', '0x')
-            return sendTransaction(contract, tx, options?.overrides)
+            const tx = contract?.methods.safeTransferFrom(options.account, recipient, tokenId, amount ?? '', '0x')
+            return sendTransaction(contract, tx, options.overrides)
         }
 
         // ERC721
         const contract = await this.getERC721Contract(address, options)
-        const tx = contract?.methods.transferFrom(account, recipient, tokenId)
-        return sendTransaction(contract, tx, options?.overrides)
+        const tx = contract?.methods.transferFrom(options.account, recipient, tokenId)
+        return sendTransaction(contract, tx, options.overrides)
     }
 
-    async getGasPrice(options?: EVM_Web3ConnectionOptions): Promise<string> {
+    async getGasPrice(initial?: EVM_Web3ConnectionOptions): Promise<string> {
         return this.hijackedRequest<string>(
             {
                 method: EthereumMethodType.ETH_GAS_PRICE,
             },
-            options,
+            this.getOptions(initial),
         )
     }
-    async getSchemaType(address: string, options?: EVM_Web3ConnectionOptions): Promise<SchemaType | undefined> {
+    async getSchemaType(address: string, initial?: EVM_Web3ConnectionOptions): Promise<SchemaType | undefined> {
+        const options = this.getOptions(initial)
         const ERC165_INTERFACE_ID = '0x01ffc9a7'
         const ERC721_ENUMERABLE_INTERFACE_ID = '0x780e9d63'
         const ERC1155_ENUMERABLE_INTERFACE_ID = '0xd9b67a26'
 
-        const account = options?.account ?? this.account
         const erc165Contract = await this.getWeb3Contract<ERC165>(address, ERC165ABI as AbiItem[], options)
 
-        const isERC165 = await erc165Contract?.methods.supportsInterface(ERC165_INTERFACE_ID).call({ from: account })
+        const isERC165 = await erc165Contract?.methods
+            .supportsInterface(ERC165_INTERFACE_ID)
+            .call({ from: options.account })
 
         const isERC721 = await erc165Contract?.methods
             .supportsInterface(ERC721_ENUMERABLE_INTERFACE_ID)
-            .call({ from: account })
+            .call({ from: options.account })
         if (isERC165 && isERC721) return SchemaType.ERC721
 
         const isERC1155 = await erc165Contract?.methods
             .supportsInterface(ERC1155_ENUMERABLE_INTERFACE_ID)
-            .call({ from: account })
+            .call({ from: options.account })
         if (isERC165 && isERC1155) return SchemaType.ERC1155
 
         const isERC20 = (await this.getCode(address, options)) !== '0x'
@@ -286,9 +305,9 @@ class Connection implements EVM_Connection {
         address: string,
         tokenId: string,
         schema?: SchemaType,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ): Promise<NonFungibleToken<ChainId, SchemaType>> {
-        const actualChainId = options?.chainId ?? this.chainId
+        const options = this.getOptions(initial)
         const actualSchema = schema ?? (await this.getSchemaType(address, options))
         const allSettled = await Promise.allSettled([
             this.getNonFungibleTokenMetadata(address, tokenId, schema, options),
@@ -309,7 +328,7 @@ class Connection implements EVM_Connection {
         }
 
         return createNonFungibleToken<ChainId, SchemaType>(
-            actualChainId,
+            options.chainId,
             address,
             actualSchema ?? SchemaType.ERC721,
             tokenId,
@@ -324,8 +343,9 @@ class Connection implements EVM_Connection {
         owner: string,
         tokenId: string,
         schema?: SchemaType,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ) {
+        const options = this.getOptions(initial)
         const actualSchema = schema ?? (await this.getSchemaType(address, options))
 
         // ERC1155
@@ -343,7 +363,7 @@ class Connection implements EVM_Connection {
         address: string,
         tokenId?: string,
         schema?: SchemaType,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ) {
         const processURI = (uri: string) => {
             // e.g,
@@ -359,7 +379,7 @@ class Connection implements EVM_Connection {
 
             return uri
         }
-        const actualChainId = options?.chainId ?? this.chainId
+        const options = this.getOptions(initial)
         const actualSchema = schema ?? (await this.getSchemaType(address, options))
 
         // ERC1155
@@ -372,7 +392,7 @@ class Connection implements EVM_Connection {
                 fetch: this.context?.fetch,
             })
             return createNonFungibleTokenMetadata(
-                actualChainId,
+                options.chainId,
                 response.name,
                 '',
                 response.description,
@@ -390,7 +410,7 @@ class Connection implements EVM_Connection {
             fetch: this.context?.fetch,
         })
         return createNonFungibleTokenMetadata(
-            actualChainId,
+            options.chainId,
             response.name,
             '',
             response.description,
@@ -402,9 +422,9 @@ class Connection implements EVM_Connection {
     async getNonFungibleTokenContract(
         address: string,
         schema?: SchemaType,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ): Promise<NonFungibleTokenContract<ChainId, SchemaType>> {
-        const actualChainId = options?.chainId ?? this.chainId
+        const options = this.getOptions(initial)
         const actualSchema = schema ?? (await this.getSchemaType(address, options))
 
         // ERC1155
@@ -420,7 +440,7 @@ class Connection implements EVM_Connection {
             ) as string[]
 
             return createNonFungibleTokenContract(
-                actualChainId,
+                options.chainId,
                 SchemaType.ERC1155,
                 address,
                 name ?? 'Unknown Token',
@@ -438,7 +458,7 @@ class Connection implements EVM_Connection {
         const [name, symbol] = results.map((result) => (result.status === 'fulfilled' ? result.value : '')) as string[]
 
         return createNonFungibleTokenContract<ChainId, SchemaType.ERC721>(
-            actualChainId,
+            options.chainId,
             SchemaType.ERC721,
             address,
             name ?? 'Unknown Token',
@@ -448,9 +468,9 @@ class Connection implements EVM_Connection {
     async getNonFungibleTokenCollection(
         address: string,
         schema?: SchemaType,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ): Promise<NonFungibleTokenCollection<ChainId>> {
-        const actualChainId = options?.chainId ?? this.chainId
+        const options = this.getOptions(initial)
         const actualSchema = schema ?? (await this.getSchemaType(address, options))
 
         // ERC1155
@@ -462,60 +482,59 @@ class Connection implements EVM_Connection {
         const contract = await this.getERC721Contract(address, options)
         const results = await Promise.allSettled([contract?.methods.name().call() ?? EMPTY_STRING])
         const [name] = results.map((result) => (result.status === 'fulfilled' ? result.value : '')) as string[]
-        return createNonFungibleTokenCollection(actualChainId, address, name ?? 'Unknown Token', '')
+        return createNonFungibleTokenCollection(options.chainId, address, name ?? 'Unknown Token', '')
     }
-    async switchChain(options?: EVM_Web3ConnectionOptions): Promise<void> {
-        await Providers[options?.providerType ?? this.providerType].switchChain(options?.chainId)
+    async switchChain(initial?: EVM_Web3ConnectionOptions): Promise<void> {
+        const options = this.getOptions(initial)
+        await Providers[options.providerType].switchChain(options.chainId)
     }
-    async getNativeTokenBalance(options?: EVM_Web3ConnectionOptions): Promise<string> {
-        const account = options?.account ?? this.account
-        if (!isValidAddress(account)) return '0'
-        return this.getBalance(options?.account ?? this.account, options)
+    async getNativeTokenBalance(initial?: EVM_Web3ConnectionOptions): Promise<string> {
+        const options = this.getOptions(initial)
+        if (!isValidAddress(options.account)) return '0'
+        return this.getBalance(options.account, options)
     }
-    async getFungibleTokenBalance(address: string, options?: EVM_Web3ConnectionOptions): Promise<string> {
-        const actualAccount = options?.account ?? this.account
-        const actualChainId = options?.chainId ?? this.chainId
+    async getFungibleTokenBalance(address: string, initial?: EVM_Web3ConnectionOptions): Promise<string> {
+        const options = this.getOptions(initial)
 
         // Native
-        if (!address || isNativeTokenAddress(actualChainId, address)) return this.getNativeTokenBalance(options)
+        if (!address || isNativeTokenAddress(options.chainId, address)) return this.getNativeTokenBalance(options)
 
         // ERC20
         const contract = await this.getERC20Contract(address, options)
-        return contract?.methods.balanceOf(actualAccount).call() ?? '0'
+        return contract?.methods.balanceOf(options.account).call() ?? '0'
     }
     async getNonFungibleTokenBalance(
         address: string,
         tokenId?: string,
         schema?: SchemaType,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ): Promise<string> {
-        const actualAccount = options?.account ?? this.account
+        const options = this.getOptions(initial)
         const actualSchema = schema ?? (await this.getSchemaType(address, options))
 
         // ERC1155
         if (actualSchema === SchemaType.ERC1155) {
             const contract = await this.getERC1155Contract(address, options)
-            return contract?.methods?.balanceOf(actualAccount, tokenId ?? '').call() ?? '0'
+            return contract?.methods?.balanceOf(options.account, tokenId ?? '').call() ?? '0'
         }
 
         // ERC721
         const contract = await this.getERC721Contract(address, options)
-        return contract?.methods.balanceOf(actualAccount).call() ?? '0'
+        return contract?.methods.balanceOf(options.account).call() ?? '0'
     }
     async getFungibleTokensBalance(
         listOfAddress: string[],
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ): Promise<Record<string, string>> {
         if (!listOfAddress.length) return {}
 
-        const account = options?.account ?? this.account
-        const actualChainId = options?.chainId ?? this.chainId
-        const { NATIVE_TOKEN_ADDRESS = '' } = getTokenConstants(actualChainId)
-        const { BALANCE_CHECKER_ADDRESS } = getEthereumConstants(actualChainId)
+        const options = this.getOptions(initial)
+        const { NATIVE_TOKEN_ADDRESS = '' } = getTokenConstants(options.chainId)
+        const { BALANCE_CHECKER_ADDRESS } = getEthereumConstants(options.chainId)
         const entities: Array<[string, string]> = []
 
         if (listOfAddress.some(currySameAddress(NATIVE_TOKEN_ADDRESS))) {
-            entities.push([NATIVE_TOKEN_ADDRESS, await this.getBalance(this.account, options)])
+            entities.push([NATIVE_TOKEN_ADDRESS, await this.getBalance(options.account, options)])
         }
 
         const listOfNonNativeAddress = listOfAddress.filter((x) => !isSameAddress(NATIVE_TOKEN_ADDRESS, x))
@@ -526,10 +545,10 @@ class Connection implements EVM_Connection {
                 BalanceCheckerABI as AbiItem[],
                 options,
             )
-            const balances = await contract?.methods.balances([account], listOfNonNativeAddress).call({
+            const balances = await contract?.methods.balances([options.account], listOfNonNativeAddress).call({
                 // cannot check the sender's balance in the same contract
                 from: undefined,
-                chainId: numberToHex(actualChainId),
+                chainId: numberToHex(options.account),
             })
 
             listOfNonNativeAddress.forEach((x, i) => {
@@ -541,39 +560,42 @@ class Connection implements EVM_Connection {
 
     async getNonFungibleTokensBalance(
         listOfAddress: string[],
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ): Promise<Record<string, string>> {
         if (!listOfAddress.length) return {}
 
-        const { BALANCE_CHECKER_ADDRESS } = getEthereumConstants(this.chainId)
+        const options = this.getOptions(initial)
+        const { BALANCE_CHECKER_ADDRESS } = getEthereumConstants(options.chainId)
         const contract = await this.getWeb3Contract<BalanceChecker>(
             BALANCE_CHECKER_ADDRESS ?? '',
             BalanceCheckerABI as AbiItem[],
             options,
         )
-        const result = await contract?.methods.balances([options?.account ?? this.account], listOfAddress).call({
+        const result = await contract?.methods.balances([options.account], listOfAddress).call({
             // cannot check the sender's balance in the same contract
             from: undefined,
-            chainId: numberToHex(options?.chainId ?? this.chainId),
+            chainId: numberToHex(options.chainId),
         })
 
         if (result?.length !== listOfAddress.length) return {}
         return Object.fromEntries(listOfAddress.map<[string, string]>((x, i) => [x, result[i]]))
     }
 
-    getNativeToken(options?: EVM_Web3ConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>> {
-        const token = createNativeToken(options?.chainId ?? this.chainId)
+    getNativeToken(initial?: EVM_Web3ConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>> {
+        const options = this.getOptions(initial)
+        const token = createNativeToken(options.chainId)
         if (!token) throw new Error('Failed to create native token.')
         return Promise.resolve(token)
     }
 
     async getFungibleToken(
         address: string,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ): Promise<FungibleToken<ChainId, SchemaType>> {
+        const options = this.getOptions(initial)
+
         // Native
-        if (!address || isNativeTokenAddress(options?.chainId ?? this.chainId, address))
-            return this.getNativeToken(options)
+        if (!address || isNativeTokenAddress(options.chainId, address)) return this.getNativeToken(options)
 
         // ERC20
         const contract = await this.getERC20Contract(address, options)
@@ -589,7 +611,7 @@ class Connection implements EVM_Connection {
             result.status === 'fulfilled' ? result.value : '',
         ) as string[]
         return createERC20Token(
-            options?.chainId ?? this.chainId,
+            options.chainId,
             address,
             parseStringOrBytes32(name, nameBytes32, 'Unknown Token'),
             parseStringOrBytes32(symbol, symbolBytes32, 'UNKNOWN'),
@@ -600,25 +622,30 @@ class Connection implements EVM_Connection {
     async getWeb3Contract<T extends BaseContract>(
         address: string,
         ABI: AbiItem[],
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ) {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         return createContract<T>(web3, address, ABI)
     }
 
-    async getERC20Contract(address: string, options?: EVM_Web3ConnectionOptions) {
+    async getERC20Contract(address: string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.getWeb3Contract<ERC20>(address, ERC20ABI as AbiItem[], options)
     }
 
-    async getERC721Contract(address: string, options?: EVM_Web3ConnectionOptions) {
+    async getERC721Contract(address: string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.getWeb3Contract<ERC721>(address, ERC721ABI as AbiItem[], options)
     }
 
-    async getERC1155Contract(address: string, options?: EVM_Web3ConnectionOptions) {
+    async getERC1155Contract(address: string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.getWeb3Contract<ERC1155>(address, ERC1155ABI as AbiItem[], options)
     }
 
-    async getAccount(options?: EVM_Web3ConnectionOptions) {
+    async getAccount(initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         const accounts = await this.hijackedRequest<string[]>(
             {
                 method: EthereumMethodType.ETH_ACCOUNTS,
@@ -628,7 +655,8 @@ class Connection implements EVM_Connection {
         return first(accounts) ?? ''
     }
 
-    async getChainId(options?: EVM_Web3ConnectionOptions) {
+    async getChainId(initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         const chainId = await this.hijackedRequest<string>(
             {
                 method: EthereumMethodType.ETH_CHAIN_ID,
@@ -638,7 +666,8 @@ class Connection implements EVM_Connection {
         return Number.parseInt(chainId, 16)
     }
 
-    getBlock(noOrId: number | string, options?: EVM_Web3ConnectionOptions) {
+    getBlock(noOrId: number | string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<Block>(
             {
                 method: EthereumMethodType.ETH_GET_BLOCK_BY_NUMBER,
@@ -648,7 +677,8 @@ class Connection implements EVM_Connection {
         )
     }
 
-    getBlockNumber(options?: EVM_Web3ConnectionOptions) {
+    getBlockNumber(initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<number>(
             {
                 method: EthereumMethodType.ETH_BLOCK_NUMBER,
@@ -657,13 +687,15 @@ class Connection implements EVM_Connection {
         )
     }
 
-    async getBlockTimestamp(options?: EVM_Web3ConnectionOptions): Promise<number> {
+    async getBlockTimestamp(initial?: EVM_Web3ConnectionOptions): Promise<number> {
+        const options = this.getOptions(initial)
         const blockNumber = await this.getBlockNumber(options)
         const block = await this.getBlock(blockNumber)
         return Number.parseInt(block.timestamp, 16)
     }
 
-    getBalance(address: string, options?: EVM_Web3ConnectionOptions) {
+    getBalance(address: string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<string>(
             {
                 method: EthereumMethodType.ETH_GET_BALANCE,
@@ -673,7 +705,8 @@ class Connection implements EVM_Connection {
         )
     }
 
-    getCode(address: string, options?: EVM_Web3ConnectionOptions) {
+    getCode(address: string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<string>(
             {
                 method: EthereumMethodType.ETH_GET_CODE,
@@ -683,7 +716,8 @@ class Connection implements EVM_Connection {
         )
     }
 
-    async getTransaction(hash: string, options?: EVM_Web3ConnectionOptions) {
+    async getTransaction(hash: string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<TransactionDetailed>(
             {
                 method: EthereumMethodType.ETH_GET_TRANSACTION_BY_HASH,
@@ -693,14 +727,15 @@ class Connection implements EVM_Connection {
         )
     }
 
-    async estimateTransaction(transaction: Transaction, fallback = 21000, options?: EVM_Web3ConnectionOptions) {
+    async estimateTransaction(transaction: Transaction, fallback = 21000, initial?: EVM_Web3ConnectionOptions) {
         try {
+            const options = this.getOptions(initial)
             return this.hijackedRequest<string>(
                 {
                     method: EthereumMethodType.ETH_ESTIMATE_GAS,
                     params: [
                         {
-                            from: options?.account ?? this.account,
+                            from: options.account,
                             ...transaction,
                         },
                     ],
@@ -712,7 +747,8 @@ class Connection implements EVM_Connection {
         }
     }
 
-    getTransactionReceipt(hash: string, options?: EVM_Web3ConnectionOptions) {
+    getTransactionReceipt(hash: string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<TransactionReceipt | null>(
             {
                 method: EthereumMethodType.ETH_GET_TRANSACTION_RECEIPT,
@@ -722,11 +758,13 @@ class Connection implements EVM_Connection {
         )
     }
 
-    async getTransactionStatus(id: string, options?: EVM_Web3ConnectionOptions): Promise<TransactionStatusType> {
+    async getTransactionStatus(id: string, initial?: EVM_Web3ConnectionOptions): Promise<TransactionStatusType> {
+        const options = this.getOptions(initial)
         return getReceiptStatus(await this.getTransactionReceipt(id, options))
     }
 
-    async getTransactionNonce(address: string, options?: EVM_Web3ConnectionOptions) {
+    async getTransactionNonce(address: string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         const count = await this.hijackedRequest<string>(
             {
                 method: EthereumMethodType.ETH_GET_TRANSACTION_COUNT,
@@ -740,17 +778,17 @@ class Connection implements EVM_Connection {
     signMessage(
         dataToSign: string,
         signType?: 'personalSign' | 'typedDataSign' | Omit<string, 'personalSign' | 'typedDataSign'>,
-        options?: EVM_Web3ConnectionOptions,
+        initial?: EVM_Web3ConnectionOptions,
     ) {
-        const account = options?.account ?? this.account
-        if (!account) throw new Error('Unknown account.')
+        const options = this.getOptions(initial)
+        if (!options.account) throw new Error('Unknown account.')
 
         switch (signType) {
             case 'personalSign':
                 return this.hijackedRequest<string>(
                     {
                         method: EthereumMethodType.PERSONAL_SIGN,
-                        params: [dataToSign, account, ''].filter((x) => typeof x !== 'undefined'),
+                        params: [dataToSign, options.account, ''].filter((x) => typeof x !== 'undefined'),
                     },
                     options,
                 )
@@ -758,7 +796,7 @@ class Connection implements EVM_Connection {
                 return this.hijackedRequest<string>(
                     {
                         method: EthereumMethodType.ETH_SIGN_TYPED_DATA,
-                        params: [account, dataToSign],
+                        params: [options.account, dataToSign],
                     },
                     options,
                 )
@@ -771,14 +809,16 @@ class Connection implements EVM_Connection {
         dataToVerify: string,
         signature: string,
         signType?: string,
-        options?: ConnectionOptions<ChainId, ProviderType, Transaction>,
+        initial?: ConnectionOptions<ChainId, ProviderType, Transaction>,
     ) {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         const dataToSign = await web3.eth.personal.ecRecover(dataToVerify, signature)
         return dataToSign === dataToVerify
     }
 
-    async signTransaction(transaction: Transaction, options?: EVM_Web3ConnectionOptions) {
+    async signTransaction(transaction: Transaction, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         const signed = await this.hijackedRequest<SignedTransaction>(
             {
                 method: EthereumMethodType.ETH_SIGN_TRANSACTION,
@@ -789,35 +829,37 @@ class Connection implements EVM_Connection {
         return signed.rawTransaction ?? ''
     }
 
-    signTransactions(transactions: Transaction[], options?: EVM_Web3ConnectionOptions) {
-        return Promise.all(transactions.map((x) => this.signTransaction(x)))
+    signTransactions(transactions: Transaction[], initial?: EVM_Web3ConnectionOptions) {
+        return Promise.all(transactions.map((x) => this.signTransaction(x, initial)))
     }
 
-    callTransaction(transaction: Transaction, options?: EVM_Web3ConnectionOptions) {
+    callTransaction(transaction: Transaction, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<string>(
             {
                 method: EthereumMethodType.ETH_CALL,
                 params: [
-                    {
+                    encodeTransaction({
                         ...transaction,
-                        ...options?.overrides,
-                    },
+                        ...options.overrides,
+                    }),
                     'latest',
                 ],
             },
             options,
         )
     }
-    async sendTransaction(transaction: Transaction, options?: EVM_Web3ConnectionOptions) {
+    async sendTransaction(transaction: Transaction, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         // send a transaction which will add into the internal transaction list and start to watch it for confirmation
         const hash = await this.hijackedRequest<string>(
             {
                 method: EthereumMethodType.ETH_SEND_TRANSACTION,
                 params: [
-                    {
+                    encodeTransaction({
                         ...transaction,
-                        ...options?.overrides,
-                    },
+                        ...options.overrides,
+                    }),
                 ],
             },
             options,
@@ -840,7 +882,8 @@ class Connection implements EVM_Connection {
         })
     }
 
-    sendSignedTransaction(signature: string, options?: EVM_Web3ConnectionOptions) {
+    sendSignedTransaction(signature: string, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<string>(
             {
                 method: EthereumMethodType.ETH_SEND_RAW_TRANSACTION,
@@ -850,7 +893,8 @@ class Connection implements EVM_Connection {
         )
     }
 
-    replaceRequest(hash: string, transaction: Transaction, options?: EVM_Web3ConnectionOptions) {
+    replaceRequest(hash: string, transaction: Transaction, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<void>(
             {
                 method: EthereumMethodType.MASK_REPLACE_TRANSACTION,
@@ -860,7 +904,8 @@ class Connection implements EVM_Connection {
         )
     }
 
-    cancelRequest(hash: string, transaction: Transaction, options?: EVM_Web3ConnectionOptions) {
+    cancelRequest(hash: string, transaction: Transaction, initial?: EVM_Web3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.hijackedRequest<void>(
             {
                 method: EthereumMethodType.MASK_REPLACE_TRANSACTION,
diff --git a/packages/plugins/EVM/src/state/Connection/middleware/TransactionWatcher.ts b/packages/plugins/EVM/src/state/Connection/middleware/TransactionWatcher.ts
index c00053e6ec9f..d82268610157 100644
--- a/packages/plugins/EVM/src/state/Connection/middleware/TransactionWatcher.ts
+++ b/packages/plugins/EVM/src/state/Connection/middleware/TransactionWatcher.ts
@@ -7,8 +7,6 @@ export class TransactionWatcher implements Middleware<Context> {
         await next()
 
         if (context.method === EthereumMethodType.ETH_SEND_TRANSACTION && context.error) {
-            console.log('DEBUG: context error')
-            console.log(context)
             Web3StateSettings.value.TransactionWatcher?.notifyError(context.error)
         }
     }
diff --git a/packages/plugins/EVM/src/state/Connection/providers/WalletConnect.ts b/packages/plugins/EVM/src/state/Connection/providers/WalletConnect.ts
index d4368343bedb..9d4662ae35e3 100644
--- a/packages/plugins/EVM/src/state/Connection/providers/WalletConnect.ts
+++ b/packages/plugins/EVM/src/state/Connection/providers/WalletConnect.ts
@@ -4,7 +4,7 @@ import type { RequestArguments } from 'web3-core'
 import { defer } from '@dimensiondev/kit'
 import WalletConnect from '@walletconnect/client'
 import type { ITxData } from '@walletconnect/types'
-import { ChainId, chainResolver, EthereumMethodType, ProviderType } from '@masknet/web3-shared-evm'
+import { ChainId, chainResolver, EthereumMethodType, isValidAddress, ProviderType } from '@masknet/web3-shared-evm'
 import { BaseProvider } from './Base'
 import type { EVM_Provider } from '../types'
 import type { Account } from '@masknet/web3-shared-base'
@@ -122,15 +122,31 @@ export default class WalletConnectProvider extends BaseProvider implements EVM_P
 
         this.connector = this.createConnector()
 
-        await this.connector.createSession({
-            chainId,
-        })
-
         this.connection = {
             resolve,
             reject,
         }
 
+        if (this.connector.connected) {
+            const { chainId, accounts } = this.connector
+            const account = first(accounts)
+            if (chainId !== 0 && account && isValidAddress(account)) {
+                this.connection.resolve({
+                    chainId,
+                    account,
+                })
+            } else {
+                await this.connector.killSession()
+                await this.connector.createSession({
+                    chainId,
+                })
+            }
+        } else {
+            await this.connector.createSession({
+                chainId,
+            })
+        }
+
         return deferred.finally(() => {
             this.connection = null
         })
diff --git a/packages/plugins/EVM/src/state/Hub/hub.ts b/packages/plugins/EVM/src/state/Hub/hub.ts
index 9fd4a6219b44..652a5652cc53 100644
--- a/packages/plugins/EVM/src/state/Hub/hub.ts
+++ b/packages/plugins/EVM/src/state/Hub/hub.ts
@@ -1,3 +1,4 @@
+import type { PartialRequired } from '@masknet/shared-base'
 import {
     Alchemy_EVM,
     CoinGecko,
@@ -45,79 +46,94 @@ import type { EVM_Hub } from './types'
 
 class Hub implements EVM_Hub {
     constructor(
-        private chainId?: ChainId,
-        private account?: string,
+        private chainId: ChainId,
+        private account: string,
         private sourceType?: SourceType,
         private currencyType?: CurrencyType,
     ) {}
 
+    private getOptions(
+        initial?: HubOptions<ChainId>,
+        overrides?: Partial<HubOptions<ChainId>>,
+    ): PartialRequired<HubOptions<ChainId>, 'chainId' | 'account'> {
+        return {
+            chainId: this.chainId,
+            account: this.account,
+            sourceType: this.sourceType,
+            currencyType: this.currencyType,
+            ...initial,
+            ...overrides,
+        }
+    }
+
     async getFungibleTokensFromTokenList(
         chainId: ChainId,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Array<FungibleToken<ChainId, SchemaType>>> {
-        const expectedChainId = options?.chainId ?? chainId
-        const { FUNGIBLE_TOKEN_LISTS = [] } = getTokenListConstants(expectedChainId)
-        return TokenList.fetchFungibleTokensFromTokenLists(expectedChainId, FUNGIBLE_TOKEN_LISTS)
+        const options = this.getOptions(initial, {
+            chainId,
+        })
+        const { FUNGIBLE_TOKEN_LISTS = [] } = getTokenListConstants(options.chainId)
+        return TokenList.fetchFungibleTokensFromTokenLists(options.chainId, FUNGIBLE_TOKEN_LISTS)
     }
     async getNonFungibleTokensFromTokenList(
         chainId: ChainId,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Array<NonFungibleToken<ChainId, SchemaType>>> {
         throw new Error('Method not implemented.')
     }
-    async getGasOptions(
-        chainId: ChainId,
-        options?: HubOptions<ChainId> | undefined,
-    ): Promise<Record<GasOptionType, GasOption>> {
-        const expectedChainId = options?.chainId ?? chainId
-
+    async getGasOptions(chainId: ChainId, initial?: HubOptions<ChainId>): Promise<Record<GasOptionType, GasOption>> {
+        const options = this.getOptions(initial, {
+            chainId,
+        })
         try {
-            const isEIP1559 = chainResolver.isSupport(expectedChainId, 'EIP1559')
-            if (isEIP1559) return await MetaSwap.getGasOptions(expectedChainId)
-            return await DeBank.getGasOptions(expectedChainId)
+            const isEIP1559 = chainResolver.isSupport(options.chainId, 'EIP1559')
+            if (isEIP1559) return await MetaSwap.getGasOptions(options.chainId)
+            return await DeBank.getGasOptions(options.chainId)
         } catch (error) {
-            return EthereumWeb3.getGasOptions(expectedChainId)
+            return EthereumWeb3.getGasOptions(options.chainId)
         }
     }
-    getFungibleAsset(
-        address: string,
-        options?: HubOptions<ChainId> | undefined,
-    ): Promise<FungibleAsset<ChainId, SchemaType>> {
+    getFungibleAsset(address: string, initial?: HubOptions<ChainId>): Promise<FungibleAsset<ChainId, SchemaType>> {
         throw new Error('Method not implemented.')
     }
     async getFungibleAssets(
         account: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Pageable<FungibleAsset<ChainId, SchemaType>>> {
-        const { indicator, sourceType } = options ?? {}
+        const options = this.getOptions(initial, {
+            account,
+        })
 
         // only the first page is available
-        if ((indicator ?? 0) > 0) return createPageable([], createIndicator(options?.indicator))
+        if ((options.indicator ?? 0) > 0) return createPageable([], createIndicator(options.indicator))
 
         const providers = {
             [SourceType.DeBank]: DeBank,
             [SourceType.Zerion]: Zerion,
         }
         const predicate = createPredicate(Object.keys(providers) as Array<keyof typeof providers>)
-        const filteredProviders = predicate(sourceType) ? [providers[sourceType]] : [DeBank, Zerion]
+        const filteredProviders = predicate(options.sourceType) ? [providers[options.sourceType]] : [DeBank, Zerion]
         return attemptUntil(
-            filteredProviders.map((x) => () => x.getAssets(account, { chainId: this.chainId, ...options })),
-            createPageable([], createIndicator(options?.indicator)),
+            filteredProviders.map((x) => () => x.getAssets(options.account, options)),
+            createPageable([], createIndicator(options.indicator)),
         )
     }
     async getNonFungibleAsset(
         address: string,
         tokenId: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<NonFungibleAsset<ChainId, SchemaType> | undefined> {
-        const { sourceType } = options ?? {}
+        const options = this.getOptions(initial)
         const providers = {
             [SourceType.OpenSea]: OpenSea,
             [SourceType.Rarible]: Rarible,
             [SourceType.Alchemy_EVM]: Alchemy_EVM,
         }
         const predicate = createPredicate(Object.keys(providers) as Array<keyof typeof providers>)
-        const filteredProviders = predicate(sourceType) ? [providers[sourceType]] : [Alchemy_EVM, OpenSea, Rarible]
+        const defaultProviders =
+            options.chainId === ChainId.Mainnet ? [OpenSea, Alchemy_EVM, Rarible] : [Alchemy_EVM, OpenSea, Rarible]
+        const filteredProviders = predicate(options.sourceType) ? [providers[options.sourceType]] : defaultProviders
         return attemptUntil(
             filteredProviders.map((x) => () => x.getAsset(address, tokenId, options)),
             undefined,
@@ -125,9 +141,11 @@ class Hub implements EVM_Hub {
     }
     async getNonFungibleTokens(
         account: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Pageable<NonFungibleAsset<ChainId, SchemaType>>> {
-        const { sourceType } = options ?? {}
+        const options = this.getOptions(initial, {
+            account,
+        })
         const providers = {
             [SourceType.OpenSea]: OpenSea,
             [SourceType.Rarible]: Rarible,
@@ -135,53 +153,54 @@ class Hub implements EVM_Hub {
         }
         const predicate = createPredicate(Object.keys(providers) as Array<keyof typeof providers>)
         const defaultProviders =
-            options?.chainId === ChainId.Mainnet ? [OpenSea, Alchemy_EVM, Rarible] : [Alchemy_EVM, OpenSea, Rarible]
-        const filteredProviders = predicate(sourceType) ? [providers[sourceType]] : defaultProviders
+            options.chainId === ChainId.Mainnet ? [OpenSea, Alchemy_EVM, Rarible] : [Alchemy_EVM, OpenSea, Rarible]
+        const filteredProviders = predicate(options.sourceType) ? [providers[options.sourceType]] : defaultProviders
 
         return attemptUntil(
-            filteredProviders.map((x) => () => x.getAssets(account, { chainId: this.chainId, ...options })),
-            createPageable([], createIndicator(options?.indicator)),
+            filteredProviders.map((x) => () => x.getAssets(options.account, options)),
+            createPageable([], createIndicator(options.indicator)),
         )
     }
     getNonFungibleCollections(
         account: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Pageable<NonFungibleTokenCollection<ChainId>>> {
-        return OpenSea.getCollections(account, { ...options, chainId: options?.chainId ?? this.chainId })
+        const options = this.getOptions(initial, {
+            account,
+        })
+        return OpenSea.getCollections(options.account, options)
     }
-    getFungibleTokenPrice(
-        chainId: ChainId,
-        address: string,
-        options?: HubOptions<ChainId> | undefined,
-    ): Promise<number> {
-        const expectedChainId = options?.chainId ?? chainId
-        const expectedCurrencyType = options?.currencyType ?? this.currencyType
-        const { PLATFORM_ID = '', COIN_ID = '' } = getCoinGeckoConstants(expectedChainId)
+    getFungibleTokenPrice(chainId: ChainId, address: string, initial?: HubOptions<ChainId>): Promise<number> {
+        const options = this.getOptions(initial, {
+            chainId,
+        })
+        const { PLATFORM_ID = '', COIN_ID = '' } = getCoinGeckoConstants(options.chainId)
 
         if (isNativeTokenAddress(address)) {
-            return CoinGecko.getTokenPriceByCoinId(COIN_ID, expectedCurrencyType)
+            return CoinGecko.getTokenPriceByCoinId(COIN_ID, options.currencyType)
         }
-
-        return CoinGecko.getTokenPrice(PLATFORM_ID, address, expectedCurrencyType)
+        return CoinGecko.getTokenPrice(PLATFORM_ID, address, options.currencyType)
     }
     getNonFungibleTokenPrice(
         chainId: ChainId,
         address: string,
         tokenId: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<never> {
         throw new Error('Method not implemented.')
     }
     async getFungibleTokenIconURLs(
         chainId: ChainId,
         address: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<string[]> {
-        const expectedChainId = options?.chainId ?? chainId
-        const { TOKEN_ASSET_BASE_URI = [] } = getTokenAssetBaseURLConstants(expectedChainId)
+        const options = this.getOptions(initial, {
+            chainId,
+        })
+        const { TOKEN_ASSET_BASE_URI = [] } = getTokenAssetBaseURLConstants(options.chainId)
         const checkSummedAddress = formatEthereumAddress(address)
 
-        if (isSameAddress(getTokenConstants().NATIVE_TOKEN_ADDRESS, checkSummedAddress)) {
+        if (isSameAddress(getTokenConstants(chainId).NATIVE_TOKEN_ADDRESS, checkSummedAddress)) {
             return TOKEN_ASSET_BASE_URI.map((x) => `${x}/info/logo.png`)
         }
 
@@ -195,20 +214,28 @@ class Hub implements EVM_Hub {
         chainId: ChainId,
         address: string,
         tokenId?: string | undefined,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<string[]> {
         throw new Error('Method not implemented.')
     }
     async getTransactions(
         chainId: ChainId,
         account: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Array<Transaction<ChainId, SchemaType>>> {
-        const expectedChainId = options?.chainId ?? chainId
-        return DeBank.getTransactions(account, { chainId: expectedChainId })
+        const options = this.getOptions(initial, {
+            account,
+            chainId,
+        })
+        return DeBank.getTransactions(options.account, options)
     }
 }
 
-export function createHub(chainId?: ChainId, account?: string, sourceType?: SourceType, currencyType?: CurrencyType) {
+export function createHub(
+    chainId = ChainId.Mainnet,
+    account = '',
+    sourceType?: SourceType,
+    currencyType?: CurrencyType,
+) {
     return new Hub(chainId, account, sourceType, currencyType)
 }
diff --git a/packages/plugins/Flow/src/state/Connection/connection.ts b/packages/plugins/Flow/src/state/Connection/connection.ts
index f4b794a18554..5c5d3ecd7408 100644
--- a/packages/plugins/Flow/src/state/Connection/connection.ts
+++ b/packages/plugins/Flow/src/state/Connection/connection.ts
@@ -2,22 +2,35 @@ import getUnixTime from 'date-fns/getUnixTime'
 import { first } from 'lodash-unified'
 import { unreachable } from '@dimensiondev/kit'
 import type { BlockHeaderObject, BlockObject, MutateOptions, QueryOptions } from '@blocto/fcl'
-import { ChainId, ProviderType, SchemaType, TransactionStatusCode } from '@masknet/web3-shared-flow'
+import {
+    ChainId,
+    createNativeToken,
+    getTokenConstants,
+    ProviderType,
+    SchemaType,
+    TransactionStatusCode,
+} from '@masknet/web3-shared-flow'
 import {
     Account,
     FungibleToken,
+    isSameAddress,
     NonFungibleToken,
     NonFungibleTokenCollection,
     NonFungibleTokenContract,
     NonFungibleTokenMetadata,
     TransactionStatusType,
 } from '@masknet/web3-shared-base'
-import { toHex } from '@masknet/shared-base'
+import { PartialRequired, toHex } from '@masknet/shared-base'
 import { Providers } from './provider'
 import type { FlowWeb3Connection as BaseConnection, FlowConnectionOptions } from './types'
 import { Web3StateSettings } from '../../settings'
 import type { Plugin } from '@masknet/plugin-infra'
 
+function isNativeTokenAddress(chainId: ChainId, address: string) {
+    const { FLOW_ADDRESS } = getTokenConstants(chainId)
+    return isSameAddress(address, FLOW_ADDRESS)
+}
+
 class Connection implements BaseConnection {
     constructor(
         private chainId: ChainId,
@@ -26,60 +39,71 @@ class Connection implements BaseConnection {
         private context?: Plugin.Shared.SharedContext,
     ) {}
 
-    private _getWeb3Provider(options?: FlowConnectionOptions) {
-        return Providers[options?.providerType ?? this.providerType]
+    private getOptions(
+        initial?: FlowConnectionOptions,
+        overrides?: Partial<FlowConnectionOptions>,
+    ): PartialRequired<FlowConnectionOptions, 'account' | 'chainId' | 'providerType'> {
+        return {
+            account: this.account,
+            chainId: this.chainId,
+            providerType: this.providerType,
+            ...initial,
+            ...overrides,
+        }
+    }
+
+    private _getWeb3Provider(initial?: FlowConnectionOptions) {
+        const options = this.getOptions(initial)
+        return Providers[options.providerType]
     }
 
-    getWeb3(options?: FlowConnectionOptions) {
-        return this._getWeb3Provider(options).createWeb3({
-            account: options?.account ?? this.account,
-            chainId: options?.chainId ?? this.chainId,
-        })
-    }
-    getWeb3Provider(options?: FlowConnectionOptions) {
-        return this._getWeb3Provider(options).createWeb3Provider({
-            account: options?.account ?? this.account,
-            chainId: options?.chainId ?? this.chainId,
-        })
-    }
-    async connect(options?: FlowConnectionOptions): Promise<Account<ChainId>> {
+    getWeb3(initial?: FlowConnectionOptions) {
+        const options = this.getOptions(initial)
+        return this._getWeb3Provider(options).createWeb3(options)
+    }
+    getWeb3Provider(initial?: FlowConnectionOptions) {
+        const options = this.getOptions(initial)
+        return this._getWeb3Provider(options).createWeb3Provider(options)
+    }
+    async connect(initial?: FlowConnectionOptions): Promise<Account<ChainId>> {
+        const options = this.getOptions(initial)
         return {
             account: '',
             chainId: ChainId.Mainnet,
-            ...(await Web3StateSettings.value.Provider?.connect(
-                options?.chainId ?? this.chainId,
-                options?.providerType ?? this.providerType,
-            )),
+            ...(await Web3StateSettings.value.Provider?.connect(options.chainId, options.providerType)),
         }
     }
-    async disconnect(options?: FlowConnectionOptions): Promise<void> {
-        await Web3StateSettings.value.Provider?.disconnect(options?.providerType ?? this.providerType)
+    async disconnect(initial?: FlowConnectionOptions): Promise<void> {
+        const options = this.getOptions(initial)
+        await Web3StateSettings.value.Provider?.disconnect(options.providerType)
     }
-    getGasPrice(options?: FlowConnectionOptions): Promise<string> {
+    getGasPrice(initial?: FlowConnectionOptions): Promise<string> {
         throw new Error('Method not implemented.')
     }
-    getSchemaType(address: string, options?: FlowConnectionOptions): Promise<SchemaType> {
+    getSchemaType(address: string, initial?: FlowConnectionOptions): Promise<SchemaType> {
         throw new Error('Method not implemented.')
     }
     getNonFungibleTokenContract(
         address: string,
         schemaType?: SchemaType,
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<NonFungibleTokenContract<ChainId, SchemaType>> {
         throw new Error('Method not implemented.')
     }
     getNonFungibleTokenCollection(
         address: string,
         schemaType?: SchemaType,
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<NonFungibleTokenCollection<ChainId>> {
         throw new Error('Method not implemented.')
     }
-    async getBlock(no: number, options?: FlowConnectionOptions): Promise<BlockObject | null> {
+    async getBlock(no: number, initial?: FlowConnectionOptions): Promise<BlockObject | null> {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         return web3.send([web3.getBlock(), web3.atBlockHeight(no)]).then(web3.decode)
     }
-    async getBlockTimestamp(options?: FlowConnectionOptions): Promise<number> {
+    async getBlockTimestamp(initial?: FlowConnectionOptions): Promise<number> {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         const blockHeader: BlockHeaderObject = await web3.send([web3.getBlockHeader()]).then(web3.decode)
         return getUnixTime(new Date(blockHeader.timestamp as unknown as string))
@@ -89,7 +113,7 @@ class Connection implements BaseConnection {
         recipient: string,
         amount: string,
         memo?: string,
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<string> {
         throw new Error('Method not implemented.')
     }
@@ -99,51 +123,62 @@ class Connection implements BaseConnection {
         tokenId: string,
         amount: string,
         schemaType?: SchemaType,
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<string> {
         throw new Error('Method not implemented.')
     }
-    getNativeToken(options?: FlowConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>> {
-        throw new Error('Method not implemented.')
+    getNativeToken(initial?: FlowConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>> {
+        const options = this.getOptions(initial)
+        const token = createNativeToken(options.chainId)
+        return Promise.resolve(token)
     }
-    getNativeTokenBalance(options?: FlowConnectionOptions): Promise<string> {
+    getNativeTokenBalance(initial?: FlowConnectionOptions): Promise<string> {
         throw new Error('Method not implemented.')
     }
-    getFungibleTokenBalance(address: string, options?: FlowConnectionOptions): Promise<string> {
-        throw new Error('Method not implemented.')
+    getFungibleTokenBalance(address: string, initial?: FlowConnectionOptions): Promise<string> {
+        const options = this.getOptions(initial)
+        if (!address || isNativeTokenAddress(options.chainId, address)) {
+            return this.getNativeTokenBalance(options)
+        }
+        // TODO
+        return Promise.resolve('0')
     }
     getNonFungibleTokenBalance(
         address: string,
         tokenId?: string,
         schemaType?: SchemaType,
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<string> {
         throw new Error('Method not implemented.')
     }
     getFungibleTokensBalance(
         listOfAddress: string[],
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<Record<string, string>> {
         throw new Error('Method not implemented.')
     }
     getNonFungibleTokensBalance(
         listOfAddress: string[],
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<Record<string, string>> {
         throw new Error('Method not implemented.')
     }
-    getCode(address: string, options?: FlowConnectionOptions): Promise<string> {
+    getCode(address: string, initial?: FlowConnectionOptions): Promise<string> {
         throw new Error('Method not implemented.')
     }
 
-    getFungibleToken(address: string, options?: FlowConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>> {
+    getFungibleToken(address: string, initial?: FlowConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>> {
+        const options = this.getOptions(initial)
+        if (!address || isNativeTokenAddress(options.chainId, address)) {
+            return this.getNativeToken(options)
+        }
         throw new Error('Method not implemented.')
     }
     getNonFungibleToken(
         address: string,
         tokenId: string,
         schemaType?: SchemaType,
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<NonFungibleToken<ChainId, SchemaType>> {
         throw new Error('Method not implemented.')
     }
@@ -152,7 +187,7 @@ class Connection implements BaseConnection {
         owner: string,
         tokenId: string,
         schema?: SchemaType | undefined,
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<boolean> {
         throw new Error('Method not implemented.')
     }
@@ -160,36 +195,42 @@ class Connection implements BaseConnection {
         address: string,
         tokenId: string,
         schemaType?: SchemaType,
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<NonFungibleTokenMetadata<ChainId>> {
         throw new Error('Method not implemented.')
     }
 
-    async getAccount(options?: FlowConnectionOptions): Promise<string> {
+    async getAccount(initial?: FlowConnectionOptions): Promise<string> {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         return web3.currentUser().addr ?? ''
     }
-    async getChainId(options?: FlowConnectionOptions): Promise<ChainId> {
-        return options?.chainId ?? this.chainId
+    async getChainId(initial?: FlowConnectionOptions): Promise<ChainId> {
+        const options = this.getOptions(initial)
+        return options.chainId
     }
-    async getBlockNumber(options?: FlowConnectionOptions): Promise<number> {
+    async getBlockNumber(initial?: FlowConnectionOptions): Promise<number> {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         const blockHeader = await web3.send([web3.getBlockHeader()]).then(web3.decode)
         return blockHeader.height
     }
-    async getBalance(address: string, options?: FlowConnectionOptions): Promise<string> {
+    async getBalance(address: string, initial?: FlowConnectionOptions): Promise<string> {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         const account = await web3.send([web3.getAccount(address)]).then(web3.decode)
         return account.balance.toFixed()
     }
-    async getTransaction(id: string, options?: FlowConnectionOptions) {
+    async getTransaction(id: string, initial?: FlowConnectionOptions) {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         return web3.getTransaction(id)
     }
-    async getTransactionReceipt(id: string, options?: FlowConnectionOptions) {
+    async getTransactionReceipt(id: string, initial?: FlowConnectionOptions) {
         return null
     }
-    async getTransactionStatus(id: string, options?: FlowConnectionOptions): Promise<TransactionStatusType> {
+    async getTransactionStatus(id: string, initial?: FlowConnectionOptions): Promise<TransactionStatusType> {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         const { status } = web3.getTransactionStatus(id)
         const status_ = status as TransactionStatusCode
@@ -208,16 +249,19 @@ class Connection implements BaseConnection {
                 unreachable(status_)
         }
     }
-    async getTransactionNonce(address: string, options?: FlowConnectionOptions): Promise<number> {
+    async getTransactionNonce(address: string, initial?: FlowConnectionOptions): Promise<number> {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         const account = web3.getAccount(address)
         const key = first(account.keys)
         return key?.sequenceNumber ?? 0
     }
-    async switchChain(options?: FlowConnectionOptions): Promise<void> {
-        await Providers[options?.providerType ?? this.providerType].switchChain(options?.chainId)
+    async switchChain(initial?: FlowConnectionOptions): Promise<void> {
+        const options = this.getOptions(initial)
+        await Providers[options.providerType].switchChain(options.chainId)
     }
-    async signMessage(dataToSign: string, signType?: string, options?: FlowConnectionOptions) {
+    async signMessage(dataToSign: string, signType?: string, initial?: FlowConnectionOptions) {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         const data = new TextEncoder().encode(dataToSign)
         const signed = first(await web3.currentUser.signUserMessage(toHex(data)))
@@ -228,41 +272,44 @@ class Connection implements BaseConnection {
         dataToVerify: string,
         signature: string,
         signType?: string,
-        options?: FlowConnectionOptions,
+        initial?: FlowConnectionOptions,
     ): Promise<boolean> {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
-        if (!options?.account) throw new Error('No account found.')
+        if (!options.account) throw new Error('No account found.')
         return web3.verifyUserSignatures(dataToVerify, [
             {
-                addr: options?.account,
+                addr: options.account,
                 keyId: 1,
                 signature,
             },
         ])
     }
-    async callTransaction(query: QueryOptions, options?: FlowConnectionOptions) {
+    async callTransaction(query: QueryOptions, initial?: FlowConnectionOptions) {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         return web3.query(query)
     }
-    async sendTransaction(mutation: MutateOptions, options?: FlowConnectionOptions): Promise<string> {
+    async sendTransaction(mutation: MutateOptions, initial?: FlowConnectionOptions): Promise<string> {
+        const options = this.getOptions(initial)
         const web3 = await this.getWeb3(options)
         const id = await web3.mutate(mutation)
         await web3.tx(id).onceSealed()
         return id
     }
-    signTransaction(mutation: MutateOptions, options?: FlowConnectionOptions): Promise<never> {
+    signTransaction(mutation: MutateOptions, initial?: FlowConnectionOptions): Promise<never> {
         throw new Error('Method not implemented.')
     }
-    signTransactions(mutations: MutateOptions[], options?: FlowConnectionOptions): Promise<never> {
+    signTransactions(mutations: MutateOptions[], initial?: FlowConnectionOptions): Promise<never> {
         throw new Error('Method not implemented.')
     }
-    sendSignedTransaction(signature: never, options?: FlowConnectionOptions): Promise<string> {
+    sendSignedTransaction(signature: never, initial?: FlowConnectionOptions): Promise<string> {
         throw new Error('Method not implemented.')
     }
-    replaceRequest(hash: string, config: MutateOptions, options?: FlowConnectionOptions): Promise<void> {
+    replaceRequest(hash: string, config: MutateOptions, initial?: FlowConnectionOptions): Promise<void> {
         throw new Error('Method not implemented.')
     }
-    cancelRequest(hash: string, config: MutateOptions, options?: FlowConnectionOptions): Promise<void> {
+    cancelRequest(hash: string, config: MutateOptions, initial?: FlowConnectionOptions): Promise<void> {
         throw new Error('Method not implemented.')
     }
 }
diff --git a/packages/plugins/Flow/src/state/Hub/hub.ts b/packages/plugins/Flow/src/state/Hub/hub.ts
index 7c13489558ab..ed5b828afe30 100644
--- a/packages/plugins/Flow/src/state/Hub/hub.ts
+++ b/packages/plugins/Flow/src/state/Hub/hub.ts
@@ -1,3 +1,4 @@
+import type { PartialRequired } from '@masknet/shared-base'
 import { Alchemy_FLOW } from '@masknet/web3-providers'
 import type {
     FungibleToken,
@@ -24,15 +25,31 @@ class Hub implements FlowHub {
         private currencyType?: CurrencyType,
     ) {}
 
+    private getOptions(
+        initial?: HubOptions<ChainId>,
+        overrides?: Partial<HubOptions<ChainId>>,
+    ): PartialRequired<HubOptions<ChainId>, 'chainId' | 'account'> {
+        return {
+            chainId: this.chainId,
+            account: this.account,
+            sourceType: this.sourceType,
+            currencyType: this.currencyType,
+            ...initial,
+            ...overrides,
+        }
+    }
+
     async getFungibleTokensFromTokenList(
         chainId: ChainId,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Array<FungibleToken<ChainId, SchemaType>>> {
-        const expectedChainId = options?.chainId ?? chainId
-        const { FLOW_ADDRESS = '', FUSD_ADDRESS = '', TETHER_ADDRESS = '' } = getTokenConstants(expectedChainId)
+        const options = this.getOptions(initial, {
+            chainId,
+        })
+        const { FLOW_ADDRESS = '', FUSD_ADDRESS = '', TETHER_ADDRESS = '' } = getTokenConstants(options.chainId)
         return [
             createFungibleToken(
-                expectedChainId,
+                options.chainId,
                 FLOW_ADDRESS,
                 'Flow',
                 'FLOW',
@@ -40,7 +57,7 @@ class Hub implements FlowHub {
                 new URL('../../assets/flow.png', import.meta.url).toString(),
             ),
             createFungibleToken(
-                expectedChainId,
+                options.chainId,
                 FUSD_ADDRESS,
                 'Flow USD',
                 'FUSD',
@@ -48,7 +65,7 @@ class Hub implements FlowHub {
                 new URL('../../assets/FUSD.png', import.meta.url).toString(),
             ),
             createFungibleToken(
-                expectedChainId,
+                options.chainId,
                 TETHER_ADDRESS,
                 'Tether USD',
                 'tUSD',
@@ -59,49 +76,45 @@ class Hub implements FlowHub {
     }
     async getNonFungibleTokensFromTokenList(
         chainId: ChainId,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Array<NonFungibleToken<ChainId, SchemaType>>> {
         throw new Error('Method not implemented.')
     }
-    getGasOptions(
-        chainId: ChainId,
-        options?: HubOptions<ChainId> | undefined,
-    ): Promise<Record<GasOptionType, GasOption>> {
+    getGasOptions(chainId: ChainId, initial?: HubOptions<ChainId>): Promise<Record<GasOptionType, GasOption>> {
         throw new Error('Method not implemented.')
     }
-    getFungibleAsset(
-        address: string,
-        options?: HubOptions<ChainId> | undefined,
-    ): Promise<FungibleAsset<ChainId, SchemaType>> {
+    getFungibleAsset(address: string, initial?: HubOptions<ChainId>): Promise<FungibleAsset<ChainId, SchemaType>> {
         throw new Error('Method not implemented.')
     }
     async getFungibleAssets(
         account: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Pageable<FungibleAsset<ChainId, SchemaType>>> {
-        const expectedChainId = options?.chainId ?? this.chainId
-        return FlowRPC.getFungibleAssets(expectedChainId, account)
+        const options = this.getOptions(initial, {
+            account,
+        })
+        return FlowRPC.getFungibleAssets(options.chainId, options.account)
     }
     async getNonFungibleAsset(
         address: string,
         tokenId: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
         ownerAddress?: string,
         contractName?: string,
     ): Promise<NonFungibleAsset<ChainId, SchemaType> | undefined> {
+        const options = this.getOptions(initial)
         return Alchemy_FLOW.getAsset(address, tokenId, options, ownerAddress, contractName)
     }
     getNonFungibleTokens(
         account: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Pageable<NonFungibleAsset<ChainId, SchemaType>>> {
-        return Alchemy_FLOW.getAssets(account, options)
+        const options = this.getOptions(initial, {
+            account,
+        })
+        return Alchemy_FLOW.getAssets(options.account, options)
     }
-    getFungibleTokenPrice(
-        chainId: ChainId,
-        address: string,
-        options?: HubOptions<ChainId> | undefined,
-    ): Promise<number> {
+    getFungibleTokenPrice(chainId: ChainId, address: string, initial?: HubOptions<ChainId>): Promise<number> {
         // The Flow chain is unlisted in CoinGecko.
         throw new Error('Method not implemented.')
     }
@@ -109,14 +122,14 @@ class Hub implements FlowHub {
         chainId: ChainId,
         address: string,
         tokenId: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<never> {
         throw new Error('Method not implemented.')
     }
     async getFungibleTokenIconURLs(
         chainId: ChainId,
         address: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<string[]> {
         throw new Error('Method not implemented.')
     }
@@ -124,14 +137,14 @@ class Hub implements FlowHub {
         chainId: ChainId,
         address: string,
         tokenId?: string | undefined,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<string[]> {
         throw new Error('Method not implemented.')
     }
     getTransactions(
         chainId: ChainId,
         account: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Array<Transaction<ChainId, SchemaType>>> {
         throw new Error('Method not implemented.')
     }
diff --git a/packages/plugins/Flow/src/state/Others.ts b/packages/plugins/Flow/src/state/Others.ts
index 361c3b606350..ce48f6938a5f 100644
--- a/packages/plugins/Flow/src/state/Others.ts
+++ b/packages/plugins/Flow/src/state/Others.ts
@@ -18,7 +18,7 @@ import {
 export class Others extends OthersState<ChainId, SchemaType, ProviderType, NetworkType> {
     constructor(context: Plugin.Shared.SharedContext) {
         super(context, {
-            defaultAddress: '',
+            defaultAddress: '0x1654653399040a61',
             defaultBlockDelay: 15,
             chainDescriptors: CHAIN_DESCRIPTORS,
             networkDescriptors: NETWORK_DESCRIPTORS,
diff --git a/packages/plugins/Solana/src/apis/shared.ts b/packages/plugins/Solana/src/apis/shared.ts
index 73be8f30a80e..a1876f942e5a 100644
--- a/packages/plugins/Solana/src/apis/shared.ts
+++ b/packages/plugins/Solana/src/apis/shared.ts
@@ -72,6 +72,7 @@ export interface ProgramAccount {
 export type GetProgramAccountsResponse = RpcResponse<ProgramAccount[]>
 
 let id = 0
+
 export async function requestRPC<T = unknown>(chainId: ChainId, options: RpcOptions): Promise<T> {
     const endpoint = NETWORK_ENDPOINTS[chainId]
     id += 1
diff --git a/packages/plugins/Solana/src/state/Connection/connection.ts b/packages/plugins/Solana/src/state/Connection/connection.ts
index ed21206d568f..dd7a28e48c74 100644
--- a/packages/plugins/Solana/src/state/Connection/connection.ts
+++ b/packages/plugins/Solana/src/state/Connection/connection.ts
@@ -27,6 +27,7 @@ import { isNativeTokenAddress } from '../../utils'
 import { Providers } from './provider'
 import { createTransferInstruction, getOrCreateAssociatedTokenAccount } from './spl-token'
 import type { SolanaConnection as BaseConnection, SolanaWeb3ConnectionOptions } from './types'
+import type { PartialRequired } from '@masknet/shared-base'
 
 class Connection implements BaseConnection {
     private connections: Map<ChainId, SolConnection> = new Map()
@@ -38,47 +39,58 @@ class Connection implements BaseConnection {
         private context?: Plugin.Shared.SharedContext,
     ) {}
 
-    private _getWeb3Provider(options?: SolanaWeb3ConnectionOptions) {
-        return Providers[options?.providerType ?? this.providerType]
+    private getOptions(
+        initial?: SolanaWeb3ConnectionOptions,
+        overrides?: Partial<SolanaWeb3ConnectionOptions>,
+    ): PartialRequired<SolanaWeb3ConnectionOptions, 'account' | 'chainId' | 'providerType'> {
+        return {
+            account: this.account,
+            chainId: this.chainId,
+            providerType: this.providerType,
+            ...initial,
+            ...overrides,
+        }
+    }
+
+    private _getWeb3Provider(initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        return Providers[options.providerType]
     }
 
-    private async _attachRecentBlockHash(transaction: Transaction, options?: SolanaWeb3ConnectionOptions) {
-        const chainId = options?.chainId ?? ChainId.Mainnet
-        const connection = this.connections.get(chainId) ?? new SolConnection(NETWORK_ENDPOINTS[chainId])
+    private async _attachRecentBlockHash(transaction: Transaction, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        const connection =
+            this.connections.get(options.chainId) ?? new SolConnection(NETWORK_ENDPOINTS[options.chainId])
         const blockHash = await connection.getRecentBlockhash()
         transaction.recentBlockhash = blockHash.blockhash
         return transaction
     }
 
-    async getWeb3(options?: SolanaWeb3ConnectionOptions) {
-        return this._getWeb3Provider(options).createWeb3({
-            account: options?.account ?? this.account,
-            chainId: options?.chainId ?? this.chainId,
-        })
+    async getWeb3(initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        return this._getWeb3Provider(options).createWeb3(options)
     }
 
-    getWeb3Provider(options?: SolanaWeb3ConnectionOptions) {
-        return this._getWeb3Provider(options).createWeb3Provider({
-            account: options?.account ?? this.account,
-            chainId: options?.chainId ?? this.chainId,
-        })
+    getWeb3Provider(initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        return this._getWeb3Provider(options).createWeb3Provider(options)
     }
 
-    async connect(options?: SolanaWeb3ConnectionOptions): Promise<Account<ChainId>> {
+    async connect(initial?: SolanaWeb3ConnectionOptions): Promise<Account<ChainId>> {
+        const options = this.getOptions(initial)
         return {
             account: '',
             chainId: ChainId.Mainnet,
-            ...(await Web3StateSettings.value.Provider?.connect(
-                options?.chainId ?? this.chainId,
-                options?.providerType ?? this.providerType,
-            )),
+            ...(await Web3StateSettings.value.Provider?.connect(options.chainId, options.providerType)),
         }
     }
-    async disconnect(options?: SolanaWeb3ConnectionOptions): Promise<void> {
-        await Web3StateSettings.value.Provider?.disconnect(options?.providerType ?? this.providerType)
+    async disconnect(initial?: SolanaWeb3ConnectionOptions): Promise<void> {
+        const options = this.getOptions(initial)
+        await Web3StateSettings.value.Provider?.disconnect(options.providerType)
     }
-    private async transferSol(recipient: string, amount: string, options?: SolanaWeb3ConnectionOptions) {
-        if (!options?.account) throw new Error('No payer provides.')
+    private async transferSol(recipient: string, amount: string, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        if (!options.account) throw new Error('No payer provides.')
         const payerPubkey = new PublicKey(options.account)
         const recipientPubkey = new PublicKey(recipient)
         const transaction = new Transaction().add(
@@ -97,11 +109,12 @@ class Connection implements BaseConnection {
         address: string,
         recipient: string,
         amount: string,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<string> {
-        if (!options?.account) throw new Error('No payer provides.')
-        const chainId = options.chainId ?? ChainId.Mainnet
-        const connection = this.connections.get(chainId) ?? new SolConnection(NETWORK_ENDPOINTS[chainId])
+        const options = this.getOptions(initial)
+        if (!options.account) throw new Error('No payer provides.')
+        const connection =
+            this.connections.get(options.chainId) ?? new SolConnection(NETWORK_ENDPOINTS[options.chainId])
 
         const payerPubkey = new PublicKey(options.account)
         const recipientPubkey = new PublicKey(recipient)
@@ -141,8 +154,9 @@ class Connection implements BaseConnection {
         recipient: string,
         amount: string,
         memo?: string,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<string> {
+        const options = this.getOptions(initial)
         if (isNativeTokenAddress(address)) {
             return this.transferSol(recipient, amount, options)
         }
@@ -154,63 +168,69 @@ class Connection implements BaseConnection {
         mintAddress: string,
         amount: string,
         schema?: SchemaType,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<string> {
+        const options = this.getOptions(initial)
         return this.transferSplToken(mintAddress, recipient, amount, options)
     }
-    getGasPrice(options?: SolanaWeb3ConnectionOptions): Promise<string> {
+    getGasPrice(initial?: SolanaWeb3ConnectionOptions): Promise<string> {
         throw new Error('Method not implemented.')
     }
-    getSchemaType(address: string, options?: SolanaWeb3ConnectionOptions): Promise<SchemaType> {
+    getSchemaType(address: string, initial?: SolanaWeb3ConnectionOptions): Promise<SchemaType> {
         throw new Error('Method not implemented.')
     }
     getNonFungibleTokenContract(
         address: string,
         schemaType?: SchemaType,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<NonFungibleTokenContract<ChainId, SchemaType>> {
         throw new Error('Method not implemented.')
     }
     getNonFungibleTokenCollection(
         address: string,
         schemaType?: SchemaType,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<NonFungibleTokenCollection<ChainId>> {
         throw new Error('Method not implemented.')
     }
-    async switchChain(options?: SolanaWeb3ConnectionOptions) {
-        await Providers[options?.providerType ?? this.providerType].switchChain(options?.chainId)
+    async switchChain(initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        await Providers[options.providerType].switchChain(options.chainId)
     }
-    getNativeToken(options?: SolanaWeb3ConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>> {
-        const token = createNativeToken(options?.chainId ?? ChainId.Mainnet)
+    getNativeToken(initial?: SolanaWeb3ConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>> {
+        const options = this.getOptions(initial)
+        const token = createNativeToken(options.chainId)
         return Promise.resolve(token)
     }
-    async getNativeTokenBalance(options?: SolanaWeb3ConnectionOptions): Promise<string> {
-        if (!options?.account) return '0'
+    async getNativeTokenBalance(initial?: SolanaWeb3ConnectionOptions): Promise<string> {
+        const options = this.getOptions(initial)
+        if (!options.account) return '0'
         const connection = this.getWeb3Connection(options)
         const balance = await connection.getBalance(new PublicKey(options.account))
         return balance.toString()
     }
-    async getFungibleTokenBalance(address: string, options?: SolanaWeb3ConnectionOptions): Promise<string> {
-        if (!options?.account) return '0'
+    async getFungibleTokenBalance(address: string, initial?: SolanaWeb3ConnectionOptions): Promise<string> {
+        const options = this.getOptions(initial)
+        if (!options.account) return '0'
         if (isNativeTokenAddress(address)) {
             return this.getNativeTokenBalance(options)
         }
-        return SolanaRPC.getSplTokenBalance(options?.chainId ?? ChainId.Mainnet, options.account, address)
+        return SolanaRPC.getSplTokenBalance(options.chainId, options.account, address)
     }
     getNonFungibleTokenBalance(
         address: string,
         tokenId?: string,
         schemaType?: SchemaType,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<string> {
         throw new Error('Method not implemented.')
     }
     async getFungibleTokensBalance(
         listOfAddress: string[],
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<Record<string, string>> {
-        if (!options?.chainId || !options.account) return {}
+        const options = this.getOptions(initial)
+        if (!options.account) return {}
         const splTokens = await SolanaRPC.getSplTokenList(options.chainId, options.account)
         const records = splTokens.reduce(
             (map: Record<string, string>, asset) => ({ ...map, [asset.address]: asset.balance }),
@@ -223,68 +243,81 @@ class Connection implements BaseConnection {
     }
     getNonFungibleTokensBalance(
         listOfAddress: string[],
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<Record<string, string>> {
         throw new Error('Method not implemented.')
     }
-    getCode(address: string, options?: SolanaWeb3ConnectionOptions): Promise<string> {
+    getCode(address: string, initial?: SolanaWeb3ConnectionOptions): Promise<string> {
         throw new Error('Method not implemented.')
     }
 
-    getWeb3Connection(options?: SolanaWeb3ConnectionOptions) {
-        const chainId = options?.chainId ?? this.chainId
-        const connection = this.connections.get(chainId) ?? new SolConnection(NETWORK_ENDPOINTS[chainId])
-        this.connections.set(chainId, connection)
+    getWeb3Connection(initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        const connection =
+            this.connections.get(options.chainId) ?? new SolConnection(NETWORK_ENDPOINTS[options.chainId])
+        this.connections.set(options.chainId, connection)
         return connection
     }
 
-    getAccount(options?: SolanaWeb3ConnectionOptions) {
-        return Promise.resolve(options?.account ?? this.account)
+    getAccount(initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        return Promise.resolve(options.account)
     }
 
-    getAccountInfo(account: string, options?: SolanaWeb3ConnectionOptions) {
+    getAccountInfo(account: string, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial, {
+            account,
+        })
         return this.getWeb3Connection(options).getAccountInfo(decodeAddress(account))
     }
 
-    getChainId(options?: SolanaWeb3ConnectionOptions) {
-        return Promise.resolve(options?.chainId ?? this.chainId)
+    getChainId(initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        return Promise.resolve(options.chainId)
     }
 
-    async getBlock(no: number, options?: SolanaWeb3ConnectionOptions): Promise<BlockResponse | null> {
+    async getBlock(no: number, initial?: SolanaWeb3ConnectionOptions): Promise<BlockResponse | null> {
+        const options = this.getOptions(initial)
         return this.getWeb3Connection(options).getBlock(no)
     }
 
-    async getBlockNumber(options?: SolanaWeb3ConnectionOptions) {
+    async getBlockNumber(initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.getWeb3Connection(options).getSlot()
     }
 
-    async getBlockTimestamp(options?: SolanaWeb3ConnectionOptions): Promise<number> {
+    async getBlockTimestamp(initial?: SolanaWeb3ConnectionOptions): Promise<number> {
+        const options = this.getOptions(initial)
         const slot = await this.getBlockNumber(options)
         const response = await this.getWeb3Connection(options).getBlockTime(slot)
         return response ?? 0
     }
 
-    async getBalance(account: string, options?: SolanaWeb3ConnectionOptions) {
+    async getBalance(account: string, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
         const balance = await this.getWeb3Connection(options).getBalance(decodeAddress(account))
         return balance.toFixed()
     }
 
-    getTransaction(id: string, options?: SolanaWeb3ConnectionOptions) {
+    getTransaction(id: string, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this.getWeb3Connection(options).getTransaction(id)
     }
 
-    async getTransactionReceipt(id: string, options?: SolanaWeb3ConnectionOptions) {
+    async getTransactionReceipt(id: string, initial?: SolanaWeb3ConnectionOptions) {
         return null
     }
 
-    async getTransactionStatus(id: string, options?: SolanaWeb3ConnectionOptions) {
+    async getTransactionStatus(id: string, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
         const response = await this.getWeb3Connection(options).getSignatureStatus(id)
         if (response.value?.err) return TransactionStatusType.FAILED
         if (response.value?.confirmations && response.value.confirmations > 0) return TransactionStatusType.SUCCEED
         return TransactionStatusType.NOT_DEPEND
     }
 
-    async signMessage(dataToSign: string, signType?: string, options?: SolanaWeb3ConnectionOptions) {
+    async signMessage(dataToSign: string, signType?: string, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this._getWeb3Provider(options).signMessage(dataToSign)
     }
 
@@ -292,41 +325,50 @@ class Connection implements BaseConnection {
         dataToVerify: string,
         signature: string,
         signType?: string,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<boolean> {
+        const options = this.getOptions(initial)
         return this._getWeb3Provider(options).verifyMessage(dataToVerify, signature)
     }
 
-    async signTransaction(transaction: Transaction, options?: SolanaWeb3ConnectionOptions) {
+    async signTransaction(transaction: Transaction, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return this._getWeb3Provider(options).signTransaction(transaction)
     }
 
-    signTransactions(transactions: Transaction[], options?: SolanaWeb3ConnectionOptions) {
-        return Promise.all(transactions.map((x) => this.signTransaction(x)))
+    signTransactions(transactions: Transaction[], initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
+        return Promise.all(transactions.map((x) => this.signTransaction(x, options)))
     }
 
-    callTransaction(transaction: Transaction, options?: SolanaWeb3ConnectionOptions): Promise<string> {
+    callTransaction(transaction: Transaction, initial?: SolanaWeb3ConnectionOptions): Promise<string> {
         throw new Error('Method not implemented.')
     }
 
-    async sendTransaction(transaction: Transaction, options?: SolanaWeb3ConnectionOptions) {
+    async sendTransaction(transaction: Transaction, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
         const signedTransaction = await this.signTransaction(transaction)
         return sendAndConfirmRawTransaction(this.getWeb3Connection(options), signedTransaction.serialize())
     }
 
-    sendSignedTransaction(signature: Transaction, options?: SolanaWeb3ConnectionOptions) {
+    sendSignedTransaction(signature: Transaction, initial?: SolanaWeb3ConnectionOptions) {
+        const options = this.getOptions(initial)
         return sendAndConfirmRawTransaction(this.getWeb3Connection(options), signature.serialize())
     }
 
-    async getTransactionNonce(account: string, options?: SolanaWeb3ConnectionOptions): Promise<number> {
+    async getTransactionNonce(account: string, initial?: SolanaWeb3ConnectionOptions): Promise<number> {
+        const options = this.getOptions(initial, {
+            account,
+        })
         const response = await this.getWeb3Connection(options).getNonce(decodeAddress(account))
         return response?.nonce ? Number.parseInt(response.nonce, 10) : 0
     }
 
     async getFungibleToken(
         address: string,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<FungibleToken<ChainId, SchemaType>> {
+        const options = this.getOptions(initial)
         if (!address || isNativeTokenAddress(address)) {
             return this.getNativeToken()
         }
@@ -336,7 +378,7 @@ class Connection implements BaseConnection {
             token ??
             ({
                 address,
-                chainId: options?.chainId,
+                chainId: options.chainId,
             } as FungibleToken<ChainId, SchemaType>)
         )
     }
@@ -344,12 +386,12 @@ class Connection implements BaseConnection {
         address: string,
         tokenId: string,
         schemaType?: SchemaType,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<NonFungibleToken<ChainId, SchemaType>> {
+        const options = this.getOptions(initial)
         const asset = await MagicEden.getAsset(address, tokenId, options)
-        const chainId = options?.chainId ?? ChainId.Mainnet
         return createNonFungibleToken(
-            chainId,
+            options.chainId,
             address,
             SchemaType.NonFungible,
             tokenId,
@@ -364,7 +406,7 @@ class Connection implements BaseConnection {
         owner: string,
         tokenId: string,
         schema?: SchemaType | undefined,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<boolean> {
         throw new Error('Method not implemented.')
     }
@@ -372,7 +414,7 @@ class Connection implements BaseConnection {
         address: string,
         tokenId: string,
         schemaType?: SchemaType,
-        options?: SolanaWeb3ConnectionOptions,
+        initial?: SolanaWeb3ConnectionOptions,
     ): Promise<NonFungibleTokenMetadata<ChainId>> {
         throw new Error('Method not implemented.')
     }
diff --git a/packages/plugins/Solana/src/state/Hub/hub.ts b/packages/plugins/Solana/src/state/Hub/hub.ts
index 1352ebd06058..f4005e4ac5fe 100644
--- a/packages/plugins/Solana/src/state/Hub/hub.ts
+++ b/packages/plugins/Solana/src/state/Hub/hub.ts
@@ -1,3 +1,4 @@
+import type { PartialRequired } from '@masknet/shared-base'
 import { CoinGecko, MagicEden } from '@masknet/web3-providers'
 import {
     CurrencyType,
@@ -23,91 +24,102 @@ class Hub implements SolanaHub {
         private account: string,
         private sourceType?: SourceType,
         private currencyType?: CurrencyType,
-        private sizePerPage = 50,
-        private maxPageSize = 25,
     ) {}
 
+    private getOptions(
+        initial?: HubOptions<ChainId>,
+        overrides?: Partial<HubOptions<ChainId>>,
+    ): PartialRequired<HubOptions<ChainId>, 'chainId' | 'account'> {
+        return {
+            chainId: this.chainId,
+            account: this.account,
+            sourceType: this.sourceType,
+            currencyType: this.currencyType,
+            ...initial,
+            ...overrides,
+        }
+    }
+
     async getFungibleTokensFromTokenList(
         chainId: ChainId,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Array<FungibleToken<ChainId, SchemaType>>> {
         return SolanaRPC.getAllSplTokens()
     }
     async getNonFungibleTokensFromTokenList(
         chainId: ChainId,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Array<NonFungibleToken<ChainId, SchemaType>>> {
         throw new Error('Method not implemented.')
     }
-    getGasOptions(
-        chainId: ChainId,
-        options?: HubOptions<ChainId> | undefined,
-    ): Promise<Record<GasOptionType, GasOption>> {
+    getGasOptions(chainId: ChainId, initial?: HubOptions<ChainId>): Promise<Record<GasOptionType, GasOption>> {
         throw new Error('Method not implemented.')
     }
-    getFungibleAsset(
-        address: string,
-        options?: HubOptions<ChainId> | undefined,
-    ): Promise<FungibleAsset<ChainId, SchemaType>> {
+    getFungibleAsset(address: string, initial?: HubOptions<ChainId>): Promise<FungibleAsset<ChainId, SchemaType>> {
         throw new Error('Method not implemented.')
     }
     async getNonFungibleAsset(
         address: string,
         tokenId: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<NonFungibleAsset<ChainId, SchemaType> | undefined> {
+        const options = this.getOptions(initial)
         return MagicEden.getAsset(address, tokenId, options)
     }
     async getFungibleAssets(
         account: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Pageable<FungibleAsset<ChainId, SchemaType>>> {
-        return SolanaRPC.getFungibleAssets(account, options)
+        const options = this.getOptions(initial, {
+            account,
+        })
+        return SolanaRPC.getFungibleAssets(options.account, options)
     }
     getNonFungibleTokens(
         account: string,
-        options?: HubOptions<ChainId>,
+        initial?: HubOptions<ChainId>,
     ): Promise<Pageable<NonFungibleAsset<ChainId, SchemaType>>> {
+        const options = this.getOptions(initial, {
+            account,
+        })
         try {
-            return MagicEden.getTokens(account, options)
+            return MagicEden.getTokens(options.account, options)
         } catch {
-            return SolanaRPC.getNonFungibleAssets(account, options)
+            return SolanaRPC.getNonFungibleAssets(options.account, options)
         }
     }
     getNonFungibleCollections(
         account: string,
-        options?: HubOptions<ChainId>,
+        initial?: HubOptions<ChainId>,
     ): Promise<Pageable<NonFungibleTokenCollection<ChainId>>> {
-        return MagicEden.getCollections(account, options)
+        const options = this.getOptions(initial, {
+            account,
+        })
+        return MagicEden.getCollections(options.account, options)
     }
-    getFungibleTokenPrice(
-        chainId: ChainId,
-        address: string,
-        options?: HubOptions<ChainId> | undefined,
-    ): Promise<number> {
-        const expectedChainId = options?.chainId ?? chainId
-        const expectedCurrencyType = options?.currencyType ?? this.currencyType
-        const { PLATFORM_ID = '', COIN_ID = '' } = getCoinGeckoConstants(expectedChainId)
-        const { SOL_ADDRESS } = getTokenConstants(expectedChainId)
+    getFungibleTokenPrice(chainId: ChainId, address: string, initial?: HubOptions<ChainId>): Promise<number> {
+        const options = this.getOptions(initial)
+        const { PLATFORM_ID = '', COIN_ID = '' } = getCoinGeckoConstants(options.chainId)
+        const { SOL_ADDRESS } = getTokenConstants(options.chainId)
 
         if (isSameAddress(address, SOL_ADDRESS)) {
-            return CoinGecko.getTokenPriceByCoinId(COIN_ID, expectedCurrencyType)
+            return CoinGecko.getTokenPriceByCoinId(COIN_ID, options.currencyType)
         }
 
-        return CoinGecko.getTokenPrice(PLATFORM_ID, address, expectedCurrencyType)
+        return CoinGecko.getTokenPrice(PLATFORM_ID, address, options.currencyType)
     }
     getNonFungibleTokenPrice(
         chainId: ChainId,
         address: string,
         tokenId: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<never> {
         throw new Error('Method not implemented.')
     }
     async getFungibleTokenIconURLs(
         chainId: ChainId,
         address: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<string[]> {
         return []
     }
@@ -115,14 +127,14 @@ class Hub implements SolanaHub {
         chainId: ChainId,
         address: string,
         tokenId?: string | undefined,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<string[]> {
         throw new Error('Method not implemented.')
     }
     getTransactions(
         chainId: ChainId,
         account: string,
-        options?: HubOptions<ChainId> | undefined,
+        initial?: HubOptions<ChainId>,
     ): Promise<Array<Transaction<ChainId, SchemaType>>> {
         throw new Error('Method not implemented.')
     }
@@ -133,8 +145,6 @@ export function createHub(
     account = '',
     sourceType?: SourceType,
     currencyType?: CurrencyType,
-    sizePerPage?: number,
-    maxPageSize?: number,
 ) {
-    return new Hub(chainId, account, sourceType, currencyType, sizePerPage, maxPageSize)
+    return new Hub(chainId, account, sourceType, currencyType)
 }
diff --git a/packages/plugins/Solana/src/state/IdentityService.ts b/packages/plugins/Solana/src/state/IdentityService.ts
index a61284790b4d..cc3926cf6f3d 100644
--- a/packages/plugins/Solana/src/state/IdentityService.ts
+++ b/packages/plugins/Solana/src/state/IdentityService.ts
@@ -1,7 +1,7 @@
 import type { Plugin } from '@masknet/plugin-infra'
 import { SocialIdentity, SocialAddress, NetworkPluginID, SocialAddressType } from '@masknet/web3-shared-base'
 import { IdentityServiceState } from '@masknet/plugin-infra/web3'
-import { ChainId, formatAddress } from '@masknet/web3-shared-solana'
+import { ChainId, formatAddress, isValidAddress } from '@masknet/web3-shared-solana'
 import { SolanaRPC } from '../messages'
 
 const SOL_RE = /\S{1,256}\.sol\b/
@@ -20,14 +20,13 @@ export class IdentityService extends IdentityServiceState {
 
     protected override async getFromRemote(identity: SocialIdentity) {
         const { identifier, bio = '', nickname = '' } = identity
-        const addressMatched = identity.bio?.match(/\w{44}/)
+        const addressMatched = identity.bio?.match(/\b\w{44}\b/)
         const address = addressMatched?.[0]
         const solanaName = getSolanaName(identifier?.userId ?? '', nickname, bio)
-
         const solanaDomainAddress = await SolanaRPC.lookup(ChainId.Mainnet, solanaName)
 
         return [
-            address && !address.startsWith('0x')
+            address && !address.startsWith('0x') && isValidAddress(address)
                 ? {
                       networkSupporterPluginID: NetworkPluginID.PLUGIN_SOLANA,
                       type: SocialAddressType.ADDRESS,
diff --git a/packages/shared-base/src/utils/index.ts b/packages/shared-base/src/utils/index.ts
index f57bc7384a2a..ae4622c11e19 100644
--- a/packages/shared-base/src/utils/index.ts
+++ b/packages/shared-base/src/utils/index.ts
@@ -8,7 +8,10 @@ export * from './subscription'
 export * from './getAssetAsBlobURL'
 export * from './personas'
 export * from './createValueRefWithReady'
+
 export enum MimeTypes {
     JSON = 'application/json',
     Binary = 'application/octet-stream',
 }
+
+export type PartialRequired<T, RequiredKeys extends keyof T> = Omit<T, RequiredKeys> & Pick<Required<T>, RequiredKeys>
diff --git a/packages/shared/src/UI/components/TokenIcon/index.tsx b/packages/shared/src/UI/components/TokenIcon/index.tsx
index 040fa4f66a53..3017c6bc2155 100644
--- a/packages/shared/src/UI/components/TokenIcon/index.tsx
+++ b/packages/shared/src/UI/components/TokenIcon/index.tsx
@@ -31,11 +31,15 @@ export function TokenIcon(props: TokenIconProps) {
     const chainId = useChainId(props.pluginID, props.chainId)
     const hub = useWeb3Hub(props.pluginID)
 
-    const { value: urls = EMPTY_LIST } = useAsyncRetry(async () => {
+    const { value } = useAsyncRetry(async () => {
         const logoURLs = await hub?.getFungibleTokenIconURLs?.(chainId, address)
-        return [logoURL, ...(logoURLs ?? [])].filter(Boolean) as string[]
+        return {
+            key: `${address}_${chainId}`,
+            urls: [logoURL, ...(logoURLs ?? [])].filter(Boolean) as string[],
+        }
     }, [chainId, address, logoURL, hub])
-    const base64 = useImageBase64(`${address}_${chainId}`, first(urls))
+    const { urls = EMPTY_LIST, key } = value ?? {}
+    const base64 = useImageBase64(key, first(urls))
 
     return <TokenIconUI logoURL={base64} AvatarProps={AvatarProps} classes={classes} name={name} />
 }
diff --git a/packages/shared/src/hooks/useImageBase64.ts b/packages/shared/src/hooks/useImageBase64.ts
index 22843c94febf..609dbe819606 100644
--- a/packages/shared/src/hooks/useImageBase64.ts
+++ b/packages/shared/src/hooks/useImageBase64.ts
@@ -13,16 +13,17 @@ function readAsDataURL(blob: Blob) {
 const cache = new Map<string, string>()
 
 export function useImageBase64(
-    key: string,
+    key?: string,
     url?: string,
     options?: {
         fetch: typeof globalThis.fetch
     },
 ) {
     const fetch = options?.fetch ?? globalThis.fetch
-    const [base64, setBase64] = useState(cache.get(key) ?? '')
+    const [base64, setBase64] = useState(cache.get(key ?? '') ?? '')
 
     useAsyncRetry(async () => {
+        if (!key) return
         const hit = cache.get(key)
         if (hit) {
             setBase64(hit)
diff --git a/packages/shared/src/locales/qya-AA.json b/packages/shared/src/locales/qya-AA.json
index 506127a8d56a..4e633196123b 100644
--- a/packages/shared/src/locales/qya-AA.json
+++ b/packages/shared/src/locales/qya-AA.json
@@ -27,7 +27,5 @@
     "dialog_confirm_label": "crwdns16698:0crwdne16698:0",
     "share_dialog_transaction": "crwdns16700:0crwdne16700:0",
     "share_dialog_view_on_explorer": "crwdns16702:0crwdne16702:0",
-    "share_dialog_transaction_confirmed": "crwdns16704:0crwdne16704:0",
-    "load_failed": "crwdns17242:0crwdne17242:0",
-    "load_retry": "crwdns17244:0crwdne17244:0"
+    "share_dialog_transaction_confirmed": "crwdns16704:0crwdne16704:0"
 }
diff --git a/packages/web3-providers/src/alchemy/index.ts b/packages/web3-providers/src/alchemy/index.ts
index 602abd2d4dfa..d62d6b98908b 100644
--- a/packages/web3-providers/src/alchemy/index.ts
+++ b/packages/web3-providers/src/alchemy/index.ts
@@ -237,11 +237,7 @@ function createNFTAsset_EVM(
             slug: '',
             description: metaDataResponse.description,
         },
-        link: resolveOpenSeaLink(
-            metaDataResponse?.contract?.address,
-            Number.parseInt(metaDataResponse.id?.tokenId, 16).toString(),
-            chainId,
-        ),
+        link: resolveOpenSeaLink(metaDataResponse?.contract?.address, metaDataResponse.id?.tokenId, chainId),
         owner: {
             address: first(ownersResponse?.owners),
         },
diff --git a/packages/web3-providers/src/debank/index.ts b/packages/web3-providers/src/debank/index.ts
index 1eff214e7f8f..c897a299f2f1 100644
--- a/packages/web3-providers/src/debank/index.ts
+++ b/packages/web3-providers/src/debank/index.ts
@@ -12,6 +12,7 @@ import { formatAssets, formatTransactions } from './format'
 import type { WalletTokenRecord, HistoryResponse, GasPriceDictResponse } from './type'
 import type { FungibleTokenAPI, HistoryAPI, GasOptionAPI } from '../types'
 import { getAllEVMNativeAssets } from '../helpers'
+import { unionWith } from 'lodash-unified'
 
 const DEBANK_API = 'https://api.debank.com'
 const DEBANK_OPEN_API = 'https://openapi.debank.com'
@@ -74,20 +75,21 @@ export class DeBankAPI
             }),
         )
         const result = (await response.json()) as WalletTokenRecord[] | undefined
-        if (!result?.length) {
-            return createPageable(getAllEVMNativeAssets(), createIndicator(options?.indicator))
-        }
         try {
             return createPageable(
-                formatAssets(
-                    (result ?? []).map((x) => ({
-                        ...x,
+                unionWith(
+                    formatAssets(
+                        (result ?? []).map((x) => ({
+                            ...x,
 
-                        // rename bsc to bnb
-                        id: x.id === 'bsc' ? 'bnb' : x.id,
-                        chain: x.chain === 'bsc' ? 'bnb' : x.chain,
-                    })),
-                    options?.chainId,
+                            // rename bsc to bnb
+                            id: x.id === 'bsc' ? 'bnb' : x.id,
+                            chain: x.chain === 'bsc' ? 'bnb' : x.chain,
+                        })),
+                        options?.chainId,
+                    ),
+                    getAllEVMNativeAssets(),
+                    (a, z) => a.symbol === z.symbol,
                 ),
                 createIndicator(options?.indicator),
             )
diff --git a/packages/web3-providers/src/helpers.ts b/packages/web3-providers/src/helpers.ts
index 46d4c2353f6d..8c111aaad79f 100644
--- a/packages/web3-providers/src/helpers.ts
+++ b/packages/web3-providers/src/helpers.ts
@@ -1,5 +1,6 @@
 import urlcat from 'urlcat'
-import { createNativeToken, NETWORK_DESCRIPTORS } from '@masknet/web3-shared-evm'
+import { ChainId, createNativeToken, NETWORK_DESCRIPTORS, SchemaType } from '@masknet/web3-shared-evm'
+import type { FungibleAsset } from '@masknet/web3-shared-base'
 
 export function isProxyENV() {
     try {
@@ -20,7 +21,7 @@ export function courier(url: string) {
     return urlcat(`${CORS_PROXY}?:url`, { url })
 }
 
-export function getAllEVMNativeAssets() {
+export function getAllEVMNativeAssets(): Array<FungibleAsset<ChainId, SchemaType>> {
     return NETWORK_DESCRIPTORS.filter((x) => x.isMainnet).map((x) => ({
         ...createNativeToken(x.chainId),
         balance: '0',
diff --git a/packages/web3-providers/src/opensea/index.ts b/packages/web3-providers/src/opensea/index.ts
index b59961621531..d7d980903e41 100644
--- a/packages/web3-providers/src/opensea/index.ts
+++ b/packages/web3-providers/src/opensea/index.ts
@@ -29,7 +29,7 @@ import type {
     OpenSeaCustomAccount,
     OpenSeaResponse,
 } from './types'
-import { getOrderUSDPrice, toImage } from './utils'
+import { getOrderUnitPrice, getOrderUSDPrice, toImage } from './utils'
 import { OPENSEA_ACCOUNT_URL, OPENSEA_API_URL } from './constants'
 
 async function fetchFromOpenSea<T>(url: string, chainId: ChainId, apiKey?: string) {
@@ -123,7 +123,7 @@ function createNFTAsset(chainId: ChainId, asset: OpenSeaResponse): NonFungibleAs
     )
     return {
         ...createNFTToken(chainId, asset),
-        link: asset.opensea_link,
+        link: asset.opensea_link ?? asset.permalink,
         payment_tokens: orderTokens.concat(offerTokens),
         auction: isAfter(Date.parse(`${asset.endTime ?? ''}Z`), Date.now())
             ? {
@@ -148,6 +148,13 @@ function createNFTAsset(chainId: ChainId, asset: OpenSeaResponse): NonFungibleAs
             type: x.trait_type,
             value: x.value,
         })),
+        price: {
+            [CurrencyType.USD]: getOrderUnitPrice(
+                asset.last_sale?.total_price,
+                asset.last_sale?.payment_token.decimals,
+                asset.last_sale?.quantity ?? '1',
+            )?.toString(),
+        },
         orders: asset.orders
             ?.sort((a, z) =>
                 new BigNumber(getOrderUSDPrice(z.current_price, z.payment_token_contract?.usd_price) ?? 0)
diff --git a/packages/web3-providers/src/opensea/types.ts b/packages/web3-providers/src/opensea/types.ts
index 809d645187e2..3fb28974f5c4 100644
--- a/packages/web3-providers/src/opensea/types.ts
+++ b/packages/web3-providers/src/opensea/types.ts
@@ -60,6 +60,7 @@ export interface AssetEvent {
     payment_token: {
         decimals: number
     }
+    quantity: string
 }
 
 export interface OpenSeaAssetContract extends OpenSeaFees {
@@ -166,6 +167,7 @@ export interface OpenSeaResponse extends Asset {
     }>
     creator: OpenSeaCustomAccount
     endTime: string
+    permalink: string
 }
 
 interface Transaction {
diff --git a/packages/web3-providers/src/zerion/index.ts b/packages/web3-providers/src/zerion/index.ts
index 1d782edd53a8..45b5ca92a738 100644
--- a/packages/web3-providers/src/zerion/index.ts
+++ b/packages/web3-providers/src/zerion/index.ts
@@ -1,5 +1,5 @@
 import io from 'socket.io-client'
-import { values } from 'lodash-unified'
+import { unionWith, values } from 'lodash-unified'
 import { getEnumAsArray } from '@dimensiondev/kit'
 import { FungibleAsset, Transaction, HubOptions, createPageable, createIndicator } from '@masknet/web3-shared-base'
 import { ChainId, getZerionConstants, SchemaType } from '@masknet/web3-shared-evm'
@@ -131,8 +131,10 @@ export class ZerionAPI
             result = [...result, ...assets.flat()]
         }
 
-        if (!result.length) return createPageable(getAllEVMNativeAssets(), createIndicator(options?.indicator))
-        return createPageable(result, createIndicator(options?.indicator))
+        return createPageable(
+            unionWith(result, getAllEVMNativeAssets(), (a, z) => a.symbol === z.symbol),
+            createIndicator(options?.indicator),
+        )
     }
 
     async getTransactions(
diff --git a/packages/web3-shared/base/src/specs/index.ts b/packages/web3-shared/base/src/specs/index.ts
index 0b21d7e84fe1..cb265e957d13 100644
--- a/packages/web3-shared/base/src/specs/index.ts
+++ b/packages/web3-shared/base/src/specs/index.ts
@@ -586,94 +586,94 @@ export interface Connection<
     Web3ConnectionOptions = ConnectionOptions<ChainId, ProviderType, Transaction>,
 > {
     /** Get web3 instance */
-    getWeb3(options?: Web3ConnectionOptions): Promise<Web3>
+    getWeb3(initial?: Web3ConnectionOptions): Promise<Web3>
     /** Get web3 provider instance */
-    getWeb3Provider(options?: Web3ConnectionOptions): Promise<Web3Provider>
+    getWeb3Provider(initial?: Web3ConnectionOptions): Promise<Web3Provider>
     /** Get gas price */
-    getGasPrice(options?: Web3ConnectionOptions): Promise<string>
+    getGasPrice(initial?: Web3ConnectionOptions): Promise<string>
     /** Get schema type of given token address. */
-    getSchemaType(address: string, options?: Web3ConnectionOptions): Promise<SchemaType | undefined>
+    getSchemaType(address: string, initial?: Web3ConnectionOptions): Promise<SchemaType | undefined>
     /** Get a native fungible token. */
-    getNativeToken(options?: Web3ConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>>
+    getNativeToken(initial?: Web3ConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>>
     /** Get a fungible token. */
-    getFungibleToken(address: string, options?: Web3ConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>>
+    getFungibleToken(address: string, initial?: Web3ConnectionOptions): Promise<FungibleToken<ChainId, SchemaType>>
     /** Get an non-fungible token. */
     getNonFungibleToken(
         address: string,
         tokenId: string,
         schema?: SchemaType,
-        options?: Web3ConnectionOptions,
+        initial?: Web3ConnectionOptions,
     ): Promise<NonFungibleToken<ChainId, SchemaType>>
     getNonFungibleTokenOwnership(
         address: string,
         owner: string,
         tokenId: string,
         schema?: SchemaType,
-        options?: Web3ConnectionOptions,
+        initial?: Web3ConnectionOptions,
     ): Promise<boolean>
     getNonFungibleTokenMetadata(
         address: string,
         tokenId: string,
         schema?: SchemaType,
-        options?: Web3ConnectionOptions,
+        initial?: Web3ConnectionOptions,
     ): Promise<NonFungibleTokenMetadata<ChainId>>
     /** Get an non-fungible token contract. */
     getNonFungibleTokenContract(
         address: string,
         schema?: SchemaType,
-        options?: Web3ConnectionOptions,
+        initial?: Web3ConnectionOptions,
     ): Promise<NonFungibleTokenContract<ChainId, SchemaType>>
     /** Get an non-fungible token collection. */
     getNonFungibleTokenCollection(
         address: string,
         schema?: SchemaType,
-        options?: Web3ConnectionOptions,
+        initial?: Web3ConnectionOptions,
     ): Promise<NonFungibleTokenCollection<ChainId>>
     /** Get native fungible token balance. */
-    getNativeTokenBalance(options?: Web3ConnectionOptions): Promise<string>
+    getNativeTokenBalance(initial?: Web3ConnectionOptions): Promise<string>
     /** Get fungible token balance */
-    getFungibleTokenBalance(address: string, options?: Web3ConnectionOptions): Promise<string>
+    getFungibleTokenBalance(address: string, initial?: Web3ConnectionOptions): Promise<string>
     /** Get non-fungible token balance */
-    getNonFungibleTokenBalance(address: string, tokenId?: string, schema?: SchemaType, options?: Web3ConnectionOptions): Promise<string>
+    getNonFungibleTokenBalance(address: string, tokenId?: string, schema?: SchemaType, initial?: Web3ConnectionOptions): Promise<string>
     /** Get fungible token balance */
-    getFungibleTokensBalance(listOfAddress: string[], options?: Web3ConnectionOptions): Promise<Record<string, string>>
+    getFungibleTokensBalance(listOfAddress: string[], initial?: Web3ConnectionOptions): Promise<Record<string, string>>
     /** Get non-fungible token balance */
     getNonFungibleTokensBalance(
         listOfAddress: string[],
-        options?: Web3ConnectionOptions,
+        initial?: Web3ConnectionOptions,
     ): Promise<Record<string, string>>
     /** Get the currently connected account. */
-    getAccount(options?: Web3ConnectionOptions): Promise<string>
+    getAccount(initial?: Web3ConnectionOptions): Promise<string>
     /** Get the currently chain id. */
-    getChainId(options?: Web3ConnectionOptions): Promise<ChainId>
+    getChainId(initial?: Web3ConnectionOptions): Promise<ChainId>
     /** Get the latest block by number. */
-    getBlock(no: number, options?: Web3ConnectionOptions): Promise<Block | null>
+    getBlock(no: number, initial?: Web3ConnectionOptions): Promise<Block | null>
     /** Get the latest block number. */
-    getBlockNumber(options?: Web3ConnectionOptions): Promise<number>
+    getBlockNumber(initial?: Web3ConnectionOptions): Promise<number>
     /** Get the latest block unix timestamp. */
-    getBlockTimestamp(options?: Web3ConnectionOptions): Promise<number>
+    getBlockTimestamp(initial?: Web3ConnectionOptions): Promise<number>
     /** Get the latest balance of the account. */
-    getBalance(address: string, options?: Web3ConnectionOptions): Promise<string>
+    getBalance(address: string, initial?: Web3ConnectionOptions): Promise<string>
     /** Get the detailed of transaction by id. */
-    getTransaction(id: string, options?: Web3ConnectionOptions): Promise<TransactionDetailed | null>
+    getTransaction(id: string, initial?: Web3ConnectionOptions): Promise<TransactionDetailed | null>
     /** Get the latest transaction status. */
-    getTransactionStatus(id: string, options?: Web3ConnectionOptions): Promise<TransactionStatusType>
+    getTransactionStatus(id: string, initial?: Web3ConnectionOptions): Promise<TransactionStatusType>
     /** Get the latest transaction nonce. */
-    getTransactionNonce(address: string, options?: Web3ConnectionOptions): Promise<number>
+    getTransactionNonce(address: string, initial?: Web3ConnectionOptions): Promise<number>
     /** Get the transaction receipt. */
-    getTransactionReceipt(id: string, options?: Web3ConnectionOptions): Promise<TransactionReceipt | null>
+    getTransactionReceipt(id: string, initial?: Web3ConnectionOptions): Promise<TransactionReceipt | null>
     /** Get the source code of a on-chain program. */
-    getCode(address: string, options?: Web3ConnectionOptions): Promise<string>
+    getCode(address: string, initial?: Web3ConnectionOptions): Promise<string>
     /** Switch to sub network */
-    switchChain?: (options?: Web3ConnectionOptions) => Promise<void>
+    switchChain?: (initial?: Web3ConnectionOptions) => Promise<void>
     /** Sign message */
-    signMessage(dataToSign: string, signType?: string, options?: Web3ConnectionOptions): Promise<Signature>
+    signMessage(dataToSign: string, signType?: string, initial?: Web3ConnectionOptions): Promise<Signature>
     /** Verify message */
     verifyMessage(
         dataToVerify: string,
         signature: Signature,
         signType?: string,
-        options?: Web3ConnectionOptions,
+        initial?: Web3ConnectionOptions,
     ): Promise<boolean>
     /** Transfer fungible token to */
     transferFungibleToken(
@@ -681,7 +681,7 @@ export interface Connection<
         recipient: string,
         amount: string,
         memo?: string,
-        options?: Web3ConnectionOptions,
+        initial?: Web3ConnectionOptions,
     ): Promise<string>
     /** Transfer non-fungible token to */
     transferNonFungibleToken(
@@ -690,26 +690,26 @@ export interface Connection<
         tokenId: string,
         amount: string,
         schema?: SchemaType,
-        options?: Web3ConnectionOptions,
+        initial?: Web3ConnectionOptions,
     ): Promise<string>
     /** Sign a transaction */
-    signTransaction(transaction: Transaction, options?: Web3ConnectionOptions): Promise<TransactionSignature>
+    signTransaction(transaction: Transaction, initial?: Web3ConnectionOptions): Promise<TransactionSignature>
     /** Sign multiple transactions */
-    signTransactions(transactions: Transaction[], options?: Web3ConnectionOptions): Promise<TransactionSignature[]>
+    signTransactions(transactions: Transaction[], initial?: Web3ConnectionOptions): Promise<TransactionSignature[]>
     /** Query a transaction */
-    callTransaction(transaction: Transaction, options?: Web3ConnectionOptions): Promise<string>
+    callTransaction(transaction: Transaction, initial?: Web3ConnectionOptions): Promise<string>
     /** Send a transaction and wait for mining */
-    sendTransaction(transaction: Transaction, options?: Web3ConnectionOptions): Promise<string>
+    sendTransaction(transaction: Transaction, initial?: Web3ConnectionOptions): Promise<string>
     /** Send a signed transaction */
-    sendSignedTransaction(signature: TransactionSignature, options?: Web3ConnectionOptions): Promise<string>
+    sendSignedTransaction(signature: TransactionSignature, initial?: Web3ConnectionOptions): Promise<string>
     /** Build connection */
-    connect(options?: Web3ConnectionOptions): Promise<Account<ChainId>>
+    connect(initial?: Web3ConnectionOptions): Promise<Account<ChainId>>
     /** Break connection */
-    disconnect(options?: Web3ConnectionOptions): Promise<void>
+    disconnect(initial?: Web3ConnectionOptions): Promise<void>
     /** Replace request */
-    replaceRequest(hash: string, config: Transaction, options?: Web3ConnectionOptions): Promise<void>
+    replaceRequest(hash: string, config: Transaction, initial?: Web3ConnectionOptions): Promise<void>
     /** Cancel request */
-    cancelRequest(hash: string, config: Transaction, options?: Web3ConnectionOptions): Promise<void>
+    cancelRequest(hash: string, config: Transaction, initial?: Web3ConnectionOptions): Promise<void>
 }
 
 export interface HubIndicator {
@@ -740,74 +740,74 @@ export interface Hub<ChainId, SchemaType, GasOption, Web3HubOptions = HubOptions
     /** Get the fungible from built-in token list */
     getFungibleTokensFromTokenList?: (
         chainId: ChainId,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<Array<FungibleToken<ChainId, SchemaType>>>
     /** Get the non-fungible from built-in token list */
     getNonFungibleTokensFromTokenList?: (
         chainId: ChainId,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<Array<NonFungibleToken<ChainId, SchemaType>>>
     /** Get all gas options */
-    getGasOptions?: (chainId: ChainId, options?: Web3HubOptions) => Promise<Record<GasOptionType, GasOption>>
+    getGasOptions?: (chainId: ChainId, initial?: Web3HubOptions) => Promise<Record<GasOptionType, GasOption>>
     /** Get a fungible asset */
     getFungibleAsset?: (
         address: string,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<FungibleAsset<ChainId, SchemaType> | undefined>
     /** Get an non-fungible asset */
     getNonFungibleAsset?: (
         address: string,
         tokenId: string,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<NonFungibleAsset<ChainId, SchemaType> | undefined>
     /** Get fungible assets of given account with pagination supported. */
     getFungibleAssets?: (
         account: string,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<Pageable<FungibleAsset<ChainId, SchemaType>>>
     /** Get non-fungible assets of given account with pagination supported. */
     getNonFungibleAssets?: (
         account: string,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<Pageable<NonFungibleAsset<ChainId, SchemaType>>>
     /** Get fungible tokens of given account with pagination supported. */
     getFungibleTokens?: (
         account: string,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<Pageable<FungibleToken<ChainId, SchemaType> | Error>>
     /** Get non-fungible tokens of given account with pagination supported. */
     getNonFungibleTokens?: (
         account: string,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<Pageable<NonFungibleToken<ChainId, SchemaType>>>
     /** Get price of a fungible token */
-    getFungibleTokenPrice?: (chainId: ChainId, address: string, options?: Web3HubOptions) => Promise<number>
+    getFungibleTokenPrice?: (chainId: ChainId, address: string, initial?: Web3HubOptions) => Promise<number>
     /** Get price of an non-fungible token */
     getNonFungibleTokenPrice?: (
         chainId: ChainId,
         address: string,
         tokenId: string,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<number>
     /** Get token icon urls of a fungible token */
-    getFungibleTokenIconURLs?: (chainId: ChainId, address: string, options?: Web3HubOptions) => Promise<string[]>
+    getFungibleTokenIconURLs?: (chainId: ChainId, address: string, initial?: Web3HubOptions) => Promise<string[]>
     /** Get token icon urls of an non-fungible token */
     getNonFungibleTokenIconURLs?: (
         chainId: ChainId,
         address: string,
         tokenId?: string,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<string[]>
     /** Get non-fungible collections of given account with pagination supported */
     getNonFungibleCollections?: (
         account: string,
-        options?: Web3HubOptions
+        initial?: Web3HubOptions
     ) => Promise<Pageable<NonFungibleTokenCollection<ChainId>>>
     /** Get the most recent transactions */
     getTransactions: (
         chainId: ChainId,
         account: string,
-        options?: Web3HubOptions,
+        initial?: Web3HubOptions,
     ) => Promise<Array<Transaction<ChainId, SchemaType>>>
 }
 
@@ -985,11 +985,11 @@ export interface ConnectionState<
     >,
 > {
     /** Get web3 SDK */
-    getWeb3?: (options?: Web3ConnectionOptions) => Promise<Web3>
+    getWeb3?: (initial?: Web3ConnectionOptions) => Promise<Web3>
     /** Get web3 provider instance */
-    getWeb3Provider?: (options?: Web3ConnectionOptions) => Promise<Web3Provider>
+    getWeb3Provider?: (initial?: Web3ConnectionOptions) => Promise<Web3Provider>
     /** Get connection */
-    getConnection?: (options?: Web3ConnectionOptions) => Promise<Web3Connection>
+    getConnection?: (initial?: Web3ConnectionOptions) => Promise<Web3Connection>
 }
 export interface WalletState {
     /** The currently stored wallet by MaskWallet. */
diff --git a/packages/web3-shared/evm/constants/chains.json b/packages/web3-shared/evm/constants/chains.json
index 04742fceaa9e..afd4c0883a8a 100644
--- a/packages/web3-shared/evm/constants/chains.json
+++ b/packages/web3-shared/evm/constants/chains.json
@@ -12,7 +12,8 @@
             "chainId": 1,
             "name": "Ether",
             "symbol": "ETH",
-            "decimals": 18
+            "decimals": 18,
+            "logoURL": "https://static.debank.com/image/token/logo_url/eth/935ae4e4d1d12d59a99717a24f2540b5.png"
         },
         "infoURL": "https://ethereum.org",
         "explorers": [
@@ -36,7 +37,8 @@
             "chainId": 3,
             "name": "Ropsten Ether",
             "symbol": "ROP",
-            "decimals": 18
+            "decimals": 18,
+            "logoURL": "https://static.debank.com/image/token/logo_url/eth/935ae4e4d1d12d59a99717a24f2540b5.png"
         },
         "infoURL": "https://github.com/ethereum/ropsten",
         "explorers": [
@@ -60,7 +62,8 @@
             "chainId": 4,
             "name": "Rinkeby Ether",
             "symbol": "RIN",
-            "decimals": 18
+            "decimals": 18,
+            "logoURL": "https://static.debank.com/image/token/logo_url/eth/935ae4e4d1d12d59a99717a24f2540b5.png"
         },
         "infoURL": "https://www.rinkeby.io",
         "explorers": [
@@ -132,7 +135,8 @@
             "chainId": 56,
             "name": "Binance Chain Native Token",
             "symbol": "BNB",
-            "decimals": 18
+            "decimals": 18,
+            "logoURL": "https://static.debank.com/image/bsc_token/logo_url/bsc/8bfdeaa46fe9be8f5cd43a53b8d1eea1.png"
         },
         "infoURL": "https://www.binance.org",
         "explorers": [
@@ -180,7 +184,8 @@
             "chainId": 137,
             "name": "Matic",
             "symbol": "MATIC",
-            "decimals": 18
+            "decimals": 18,
+            "logoURL": "https://static.debank.com/image/matic_token/logo_url/matic/e5a8a2860ba5cf740a474dcab796dc63.png"
         },
         "infoURL": "https://matic.network/",
         "explorers": [
@@ -204,7 +209,8 @@
             "chainId": 80001,
             "name": "Matic",
             "symbol": "tMATIC",
-            "decimals": 18
+            "decimals": 18,
+            "logoURL": "https://static.debank.com/image/matic_token/logo_url/matic/e5a8a2860ba5cf740a474dcab796dc63.png"
         },
         "infoURL": "https://matic.network/",
         "explorers": [
@@ -228,7 +234,8 @@
             "chainId": 42161,
             "name": "Arbitrum Ether",
             "symbol": "ARETH",
-            "decimals": 18
+            "decimals": 18,
+            "logoURL": "https://assets.debank.com/static/media/arbitrum.8e326f58.svg"
         },
         "infoURL": "https://arbitrum.io",
         "explorers": [
@@ -2218,7 +2225,8 @@
             "chainId": 43114,
             "name": "Avalanche",
             "symbol": "AVAX",
-            "decimals": 18
+            "decimals": 18,
+            "logoURL": "https://static.debank.com/image/avax_token/logo_url/avax/0b9c84359c84d6bdd5bfda9c2d4c4a82.png"
         },
         "infoURL": "https://snowtrace.io/",
         "explorers": [
diff --git a/packages/web3-shared/evm/utils/contract.ts b/packages/web3-shared/evm/utils/contract.ts
index 2b52ee150843..db5966518bf0 100644
--- a/packages/web3-shared/evm/utils/contract.ts
+++ b/packages/web3-shared/evm/utils/contract.ts
@@ -1,35 +1,67 @@
 import type Web3 from 'web3'
-import type { AbiItem } from 'web3-utils'
+import { AbiItem, toHex } from 'web3-utils'
+import { identity, pickBy } from 'lodash-unified'
 import type {
     BaseContract,
     NonPayableTransactionObject,
     PayableTransactionObject,
     PayableTx,
 } from '@masknet/web3-contracts/types/types'
-import type { SendOptions } from 'web3-eth-contract'
 import type { Transaction } from '../types'
 import { isValidAddress } from './address'
 
-export async function encodeTransaction(
+export function encodeTransaction(transaction: Transaction): PayableTx & {
+    maxPriorityFeePerGas?: string
+    maxFeePerGas?: string
+} {
+    return pickBy(
+        {
+            from: transaction?.from as string | undefined,
+            to: transaction.to,
+            value: transaction?.value ? toHex(transaction.value) : undefined,
+            gas: transaction?.gas ? toHex(transaction.gas) : undefined,
+            gasPrice: transaction?.gasPrice ? toHex(transaction.gasPrice) : undefined,
+            maxPriorityFeePerGas: transaction?.maxPriorityFeePerGas
+                ? toHex(transaction.maxPriorityFeePerGas)
+                : undefined,
+            maxFeePerGas: transaction?.maxFeePerGas ? toHex(transaction.maxFeePerGas) : undefined,
+            data: transaction.data,
+            nonce: transaction?.nonce ? toHex(transaction.nonce) : undefined,
+            chainId: transaction?.chainId ? toHex(transaction.chainId) : undefined,
+        },
+        identity,
+    )
+}
+
+export async function encodeContractTransaction(
     contract: BaseContract,
     transaction: PayableTransactionObject<unknown> | NonPayableTransactionObject<unknown>,
-    options?: SendOptions & {
+    overrides?: Partial<Transaction>,
+) {
+    const tx: PayableTx & {
         maxPriorityFeePerGas?: string
         maxFeePerGas?: string
-    },
-) {
-    const encoded: Transaction = {
-        from: contract.defaultAccount ?? undefined,
+    } = {
+        from: (overrides?.from as string | undefined) ?? contract.defaultAccount ?? '',
         to: contract.options.address,
         data: transaction.encodeABI(),
-        ...options,
+        value: overrides?.value ? toHex(overrides.value) : undefined,
+        gas: overrides?.gas ? toHex(overrides.gas) : undefined,
+        gasPrice: overrides?.gasPrice ? toHex(overrides.gasPrice) : undefined,
+        maxPriorityFeePerGas: overrides?.maxPriorityFeePerGas ? toHex(overrides.maxPriorityFeePerGas) : undefined,
+        maxFeePerGas: overrides?.maxFeePerGas ? toHex(overrides.maxFeePerGas) : undefined,
+        nonce: overrides?.nonce ? toHex(overrides.nonce) : undefined,
+        chainId: overrides?.chainId ? toHex(overrides.chainId) : undefined,
     }
 
-    if (!encoded.gas) {
-        encoded.gas = await transaction.estimateGas(options)
+    if (!tx.gas) {
+        tx.gas = await transaction.estimateGas({
+            from: tx.from as string | undefined,
+            value: tx.value,
+        })
     }
 
-    return encoded
+    return encodeTransaction(tx)
 }
 
 export async function sendTransaction(
@@ -38,11 +70,8 @@ export async function sendTransaction(
     overrides?: Partial<Transaction>,
 ) {
     if (!contract || !transaction) throw new Error('Invalid contract or transaction.')
-    const tx = await encodeTransaction(contract, transaction)
-    const receipt = await transaction.send({
-        ...tx,
-        ...overrides,
-    } as PayableTx)
+    const tx = await encodeContractTransaction(contract, transaction, overrides)
+    const receipt = await transaction.send(tx as PayableTx)
     return receipt?.transactionHash ?? ''
 }
 
diff --git a/packages/web3-shared/evm/utils/events.ts b/packages/web3-shared/evm/utils/events.ts
new file mode 100644
index 000000000000..2b202d1e1a02
--- /dev/null
+++ b/packages/web3-shared/evm/utils/events.ts
@@ -0,0 +1,31 @@
+import type { EventLog } from 'web3-core'
+import { AbiItem, keccak256 } from 'web3-utils'
+import type { TransactionReceipt, Web3 } from '../types'
+
+export function decodeEvents(web3: Web3, abis: AbiItem[], receipt: TransactionReceipt) {
+    // the topic0 for identifying which abi to be used for decoding the event
+    const listOfTopic0 = abis.map((abi) => keccak256(`${abi.name}(${abi.inputs?.map((x) => x.type).join()})`))
+
+    // decode events
+    const events = receipt.logs.map((log) => {
+        const idx = listOfTopic0.indexOf(log.topics[0])
+        if (idx === -1) return
+        const abi = abis[idx]
+        const inputs = abi?.inputs ?? []
+        return {
+            // more: https://web3js.readthedocs.io/en/v1.2.11/web3-eth-abi.html?highlight=decodeLog#decodelog
+            returnValues: web3.eth.abi.decodeLog(inputs, log.data, abi.anonymous ? log.topics : log.topics.slice(1)),
+            raw: {
+                data: log.data,
+                topics: log.topics,
+            },
+            event: abi.name,
+            signature: listOfTopic0[idx],
+            ...log,
+        } as EventLog
+    })
+    return events.reduce<{ [eventName: string]: EventLog }>((accumulate, event) => {
+        if (event) accumulate[event.event] = event
+        return accumulate
+    }, {})
+}
diff --git a/packages/web3-shared/evm/utils/index.ts b/packages/web3-shared/evm/utils/index.ts
index 78b4541f1b57..37e01a4c68ff 100644
--- a/packages/web3-shared/evm/utils/index.ts
+++ b/packages/web3-shared/evm/utils/index.ts
@@ -11,3 +11,4 @@ export * from './transaction'
 export * from './domain'
 export * from './payload'
 export * from './provider'
+export * from './events'
diff --git a/packages/web3-shared/flow/utils/index.ts b/packages/web3-shared/flow/utils/index.ts
index c56c8c541787..02c613507a66 100644
--- a/packages/web3-shared/flow/utils/index.ts
+++ b/packages/web3-shared/flow/utils/index.ts
@@ -1,3 +1,4 @@
 export * from './address'
 export * from './domain'
 export * from './resolver'
+export * from './token'
diff --git a/packages/web3-shared/flow/utils/token.ts b/packages/web3-shared/flow/utils/token.ts
new file mode 100644
index 000000000000..acfebc0fa769
--- /dev/null
+++ b/packages/web3-shared/flow/utils/token.ts
@@ -0,0 +1,17 @@
+import { createFungibleToken } from '@masknet/web3-shared-base'
+import { getTokenConstants } from '../constants'
+import { ChainId, SchemaType } from '../types'
+import { chainResolver } from './resolver'
+
+export function createNativeToken(chainId: ChainId) {
+    const nativeCurrency = chainResolver.nativeCurrency(chainId)
+    return createFungibleToken<ChainId, SchemaType.Fungible>(
+        chainId,
+        SchemaType.Fungible,
+        getTokenConstants(chainId).FLOW_ADDRESS!,
+        nativeCurrency?.name ?? 'Flow',
+        nativeCurrency?.symbol ?? 'FLOW',
+        nativeCurrency?.decimals ?? 8,
+        nativeCurrency?.logoURL,
+    )
+}