Skip to content

Commit fa6840e

Browse files
authored
fix(wallet): replace wallet icon with wallet avatar (#12309)
* fixup! fix(popups): mf-6757 prevent long error codes from overflowing modal * fix(wallet): replace wallet icon with wallet avatar swap WalletIcon for WalletAvatar, update imports and use actual celebration emoji
1 parent 0197c5c commit fa6840e

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

packages/mask/popups/pages/Personas/ConnectWallet/index.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Icons } from '@masknet/icons'
2-
import { FormattedAddress, PersonaContext, PopupHomeTabType, WalletIcon } from '@masknet/shared'
2+
import { FormattedAddress, PersonaContext, PopupHomeTabType } from '@masknet/shared'
33
import {
44
MaskMessages,
55
NextIDAction,
@@ -34,6 +34,7 @@ import { BottomController } from '../../../components/BottomController/index.js'
3434
import { useModalNavigate } from '../../../components/index.js'
3535
import { LoadingMask } from '../../../components/LoadingMask/index.js'
3636
import { useTitle } from '../../../hooks/index.js'
37+
import { WalletAvatar } from '../../../components/WalletAvatar/index.js'
3738

3839
const useStyles = makeStyles()((theme) => ({
3940
provider: {
@@ -254,7 +255,7 @@ export const Component = memo(function ConnectWalletPage() {
254255
<Box p={2}>
255256
<Box className={classes.provider}>
256257
<Box className={classes.accountInfo}>
257-
<WalletIcon size={30} mainIcon={providerDescriptor?.icon} />
258+
<WalletAvatar address={account} size={30} />
258259
<Box>
259260
<Typography fontSize={14} fontWeight={700} lineHeight="18px">
260261
{walletAlias}
@@ -296,7 +297,7 @@ export const Component = memo(function ConnectWalletPage() {
296297
</Box>
297298
: <Box p={2} display="flex" flexDirection="column" alignItems="center">
298299
<Typography sx={{ mt: 3, textAlign: 'center' }} fontSize={36}>
299-
&#x1F389;
300+
🎉
300301
</Typography>
301302
<Typography fontSize={24} lineHeight="120%" fontWeight={700} my={1.5}>
302303
<Trans>Congratulations</Trans>
@@ -315,7 +316,7 @@ export const Component = memo(function ConnectWalletPage() {
315316
</Box>
316317
<Icons.Connect size={24} />
317318
<Box className={classes.info}>
318-
<WalletIcon size={30} mainIcon={providerDescriptor?.icon} />
319+
<WalletAvatar address={account} size={30} />
319320
<Typography className={classes.name}>{walletName}</Typography>
320321
</Box>
321322
</Box>

packages/mask/popups/pages/Wallet/SelectWallet/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ export const Component = memo(function SelectWallet() {
151151
<Button variant="outlined" fullWidth onClick={handleCancel}>
152152
<Trans>Cancel</Trans>
153153
</Button>
154-
<ActionButton fullWidth onClick={handleConfirm} disabled={!isVerifyWalletFlow}>
154+
<ActionButton fullWidth onClick={handleConfirm}>
155155
<Trans>Confirm</Trans>
156156
</ActionButton>
157157
</BottomController>

0 commit comments

Comments
 (0)