Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: bugfix for status bar #6857

Merged
merged 1 commit into from
Jul 22, 2022
Merged

fix: bugfix for status bar #6857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 29 additions & 20 deletions packages/mask/src/utils/components/WalletStatusBar/PluginVerifiedWalletStatusBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { WalletMessages } from '@masknet/plugin-wallet'
import { useRemoteControlledDialog } from '@masknet/shared-base-ui'
import { Box, Button, Divider, ListItemIcon, MenuItem, Typography } from '@mui/material'
import { memo, PropsWithChildren, useCallback, useState } from 'react'
import { memo, PropsWithChildren, useCallback, useMemo, useState } from 'react'
import { useI18N } from '../../i18n-next-ui'
import { Action } from './Action'
import { useStatusBarStyles } from './styles'
Expand Down Expand Up @@ -79,19 +79,32 @@ export const PluginVerifiedWalletStatusBar = memo<PluginVerifiedWalletStatusBarP
const providerDescriptor = useProviderDescriptor(defaultPluginId)
const networkDescriptor = useNetworkDescriptor(defaultPluginId)

const [descriptionProps, setDescriptionProps] = useState<WalletDescriptionProps>({
name: defaultWalletName,
networkIcon: networkDescriptor?.icon,
providerIcon: account ? providerDescriptor?.icon : undefined,
iconFilterColor: account ? providerDescriptor?.iconFilterColor : '',
formattedAddress: Others?.formatAddress(account || (defaultVerifiedWallet?.identity ?? ''), 4),
addressLink: Others?.explorerResolver.addressLink?.(
account ? chainId : defaultChainId,
account || (defaultVerifiedWallet?.identity ?? ''),
),
address: account || defaultVerifiedWallet?.identity,
verified: account ? isVerifiedAccount : true,
})
const description = useMemo(
() => ({
name: defaultWalletName,
networkIcon: networkDescriptor?.icon,
providerIcon: account ? providerDescriptor?.icon : undefined,
iconFilterColor: account ? providerDescriptor?.iconFilterColor : '',
formattedAddress: Others?.formatAddress(account || (defaultVerifiedWallet?.identity ?? ''), 4),
addressLink: Others?.explorerResolver.addressLink?.(
account ? chainId : defaultChainId,
account || (defaultVerifiedWallet?.identity ?? ''),
),
address: account || defaultVerifiedWallet?.identity,
verified: account ? isVerifiedAccount : true,
}),
[
account,
defaultWalletName,
providerDescriptor,
networkDescriptor,
defaultVerifiedWallet,
defaultChainId,
chainId,
],
)

const [descriptionProps, setDescriptionProps] = useState<WalletDescriptionProps>(description)

const onSelect = useCallback(
(props: WalletDescriptionProps, chainId: Web3Helper.ChainIdAll, pluginId: NetworkPluginID) => {
Expand Down Expand Up @@ -145,13 +158,9 @@ export const PluginVerifiedWalletStatusBar = memo<PluginVerifiedWalletStatusBarP
</MenuItem>,
)

// Because getting the domain is asynchronous, the default name will not be correctly
useUpdateEffect(() => {
setDescriptionProps((prev) => ({
...prev,
name: defaultWalletName,
}))
}, [defaultWalletName])
setDescriptionProps(description)
}, [description])

if (!account && !verifiedWallets) {
return (
Expand Down