fix: switch wallet in pfp (#10551)

DimensionDev · Aug 22, 2023 · f65c991 · f65c991
1 parent cf81fc8
commit f65c991
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/packages/plugins/Avatar/src/Application/NFTListDialog.tsx b/packages/plugins/Avatar/src/Application/NFTListDialog.tsx
@@ -16,9 +16,16 @@ import {
 import { NetworkPluginID, PopupRoutes } from '@masknet/shared-base'
 import { makeStyles, useCustomSnackbar } from '@masknet/theme'
 import type { Web3Helper } from '@masknet/web3-helpers'
-import { useChainContext, useNetworkContext, useWallets, useWeb3Connection, useWeb3Hub } from '@masknet/web3-hooks-base'
+import {
+    useAccount,
+    useChainContext,
+    useNetworkContext,
+    useWallets,
+    useWeb3Connection,
+    useWeb3Hub,
+} from '@masknet/web3-hooks-base'
 import { isGreaterThan, isSameAddress } from '@masknet/web3-shared-base'
-import { ChainId } from '@masknet/web3-shared-evm'
+import { type ChainId } from '@masknet/web3-shared-evm'
 import { Box, Button, DialogActions, DialogContent, Stack, Typography } from '@mui/material'
 import { supportPluginIds } from '../constants.js'
 import { useAvatarManagement } from '../contexts/index.js'
@@ -80,6 +87,7 @@ export function NFTListDialog() {
     const navigate = useNavigate()
 
     const { pluginID } = useNetworkContext()
+    const originAccount = useAccount()
     const { account, chainId, setChainId, setAccount } = useChainContext()
     const [assetChainId, setAssetChainId] = useState<ChainId>()
     const wallets = useWallets()
@@ -91,11 +99,6 @@ export function NFTListDialog() {
     const { openPopupWindow } = useSiteAdaptorContext()
     const targetWallet = wallets.find((x) => isSameAddress(targetAccount, x.address))
 
-    useEffect(() => {
-        setChainId(ChainId.Mainnet)
-        setSelectedToken(undefined)
-    }, [pfpType])
-
     useEffect(() => setSelectedToken(undefined), [chainId])
 
     const { showSnackbar } = useCustomSnackbar()
@@ -184,6 +187,10 @@ export function NFTListDialog() {
         setTargetAccount(account)
     }, [account])
 
+    useUpdateEffect(() => {
+        setAccount(originAccount)
+    }, [originAccount])
+
     return (
         <>
             <DialogContent className={classes.content}>