Skip to content

fix(wallet): replace wallet icon with wallet avatar #12309

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

Merged
guanbinrui merged 2 commits into from
Nov 4, 2025
Merged

fix(wallet): replace wallet icon with wallet avatar #12309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ce26e8
fixup! fix(popups): mf-6757 prevent long error codes from overflowing…
swkatmask Nov 4, 2025
9d35eee
fix(wallet): replace wallet icon with wallet avatar
swkatmask Nov 4, 2025
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
9 changes: 5 additions & 4 deletions packages/mask/popups/pages/Personas/ConnectWallet/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Icons } from '@masknet/icons'
import { FormattedAddress, PersonaContext, PopupHomeTabType, WalletIcon } from '@masknet/shared'
import { FormattedAddress, PersonaContext, PopupHomeTabType } from '@masknet/shared'
import {
MaskMessages,
NextIDAction,
Expand Down Expand Up @@ -34,6 +34,7 @@ import { BottomController } from '../../../components/BottomController/index.js'
import { useModalNavigate } from '../../../components/index.js'
import { LoadingMask } from '../../../components/LoadingMask/index.js'
import { useTitle } from '../../../hooks/index.js'
import { WalletAvatar } from '../../../components/WalletAvatar/index.js'

const useStyles = makeStyles()((theme) => ({
provider: {
Expand Down Expand Up @@ -254,7 +255,7 @@ export const Component = memo(function ConnectWalletPage() {
<Box p={2}>
<Box className={classes.provider}>
<Box className={classes.accountInfo}>
<WalletIcon size={30} mainIcon={providerDescriptor?.icon} />
<WalletAvatar address={account} size={30} />
<Box>
<Typography fontSize={14} fontWeight={700} lineHeight="18px">
{walletAlias}
Expand Down Expand Up @@ -296,7 +297,7 @@ export const Component = memo(function ConnectWalletPage() {
</Box>
: <Box p={2} display="flex" flexDirection="column" alignItems="center">
<Typography sx={{ mt: 3, textAlign: 'center' }} fontSize={36}>
&#x1F389;
🎉
</Typography>
<Typography fontSize={24} lineHeight="120%" fontWeight={700} my={1.5}>
<Trans>Congratulations</Trans>
Expand All @@ -315,7 +316,7 @@ export const Component = memo(function ConnectWalletPage() {
</Box>
<Icons.Connect size={24} />
<Box className={classes.info}>
<WalletIcon size={30} mainIcon={providerDescriptor?.icon} />
<WalletAvatar address={account} size={30} />
<Typography className={classes.name}>{walletName}</Typography>
</Box>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion packages/mask/popups/pages/Wallet/SelectWallet/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const Component = memo(function SelectWallet() {
<Button variant="outlined" fullWidth onClick={handleCancel}>
<Trans>Cancel</Trans>
</Button>
<ActionButton fullWidth onClick={handleConfirm} disabled={!isVerifyWalletFlow}>
<ActionButton fullWidth onClick={handleConfirm}>
<Trans>Confirm</Trans>
</ActionButton>
</BottomController>
Expand Down
Loading