Skip to content

[pull] main from MetaMask:main #507

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
pull merged 3 commits into from
Feb 9, 2026
Merged

[pull] main from MetaMask:main #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c602ef7
feat(perps): add lightweight position display on token details page (…
abretonc7s Feb 9, 2026
7a5ce94
feat: add bridge and swap to HyperEVM (#25769)
maxime-oe Feb 9, 2026
c6197b8
fix: flaky snaps and identity tests (#25795)
cmd-ob Feb 9, 2026
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
2 changes: 2 additions & 0 deletions app/components/UI/AssetOverview/TokenOverview.testIds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export const TokenOverviewSelectorsIDs = {
ADD_BUTTON: 'token-add-button',
CLAIM_BUTTON: 'claim-banner-claim-eth-button',
UNSTAKING_BANNER: 'unstaking-banner',
PERPS_POSITION_CARD: 'perps-position-card-touchable',
PERPS_DISCOVERY_BANNER: 'perps-discovery-banner',
LONG_BUTTON: 'token-long-button',
SHORT_BUTTON: 'token-short-button',
MORE_BUTTON: 'token-more-button',
Expand Down
61 changes: 35 additions & 26 deletions app/components/UI/Bridge/constants/default-swap-dest-tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,107 +6,116 @@ import {
} from '@metamask/keyring-api';
import { BridgeToken } from '../types';
import { CaipAssetType, Hex } from '@metamask/utils';
import { CHAIN_IDS } from '@metamask/transaction-controller';
import { NETWORK_CHAIN_ID } from '../../../../util/networks/customNetworks';

export const DefaultSwapDestTokens: Record<Hex | CaipChainId, BridgeToken> = {
[CHAIN_IDS.MAINNET]: {
[NETWORK_CHAIN_ID.MAINNET]: {
symbol: 'mUSD',
name: 'MetaMask USD',
address: '0xaca92e438df0b2401ff60da7e4337b687a2435da',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png',
chainId: CHAIN_IDS.MAINNET,
chainId: NETWORK_CHAIN_ID.MAINNET,
},
[CHAIN_IDS.OPTIMISM]: {
[NETWORK_CHAIN_ID.OPTIMISM]: {
symbol: 'USDC',
name: 'USD Coin',
address: '0x0b2c639c533813f4aa9d7837caf62653d097ff85',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/10/0x0b2c639c533813f4aa9d7837caf62653d097ff85.png',
chainId: CHAIN_IDS.OPTIMISM,
chainId: NETWORK_CHAIN_ID.OPTIMISM,
},
[CHAIN_IDS.BSC]: {
[NETWORK_CHAIN_ID.BSC]: {
symbol: 'USDT',
name: 'Tether USD',
address: '0x55d398326f99059ff775485246999027b3197955',
decimals: 18,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/56/0x55d398326f99059ff775485246999027b3197955.png',
chainId: CHAIN_IDS.BSC,
chainId: NETWORK_CHAIN_ID.BSC,
},
[CHAIN_IDS.POLYGON]: {
[NETWORK_CHAIN_ID.POLYGON]: {
symbol: 'USDT',
name: 'Tether USD',
address: '0xc2132d05d31c914a87c6611c10748aeb04b58e8f',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/137/0xc2132d05d31c914a87c6611c10748aeb04b58e8f.png',
chainId: CHAIN_IDS.POLYGON,
chainId: NETWORK_CHAIN_ID.POLYGON,
},
[CHAIN_IDS.ARBITRUM]: {
[NETWORK_CHAIN_ID.ARBITRUM]: {
symbol: 'USDC',
name: 'USD Coin',
address: '0xaf88d065e77c8cc2239327c5edb3a432268e5831',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/42161/0xaf88d065e77c8cc2239327c5edb3a432268e5831.png',
chainId: CHAIN_IDS.ARBITRUM,
chainId: NETWORK_CHAIN_ID.ARBITRUM,
},
[CHAIN_IDS.AVALANCHE]: {
[NETWORK_CHAIN_ID.AVALANCHE]: {
symbol: 'USDC',
name: 'USD Coin',
address: '0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/43114/0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e.png',
chainId: CHAIN_IDS.AVALANCHE,
chainId: NETWORK_CHAIN_ID.AVALANCHE,
},
[CHAIN_IDS.BASE]: {
[NETWORK_CHAIN_ID.BASE]: {
symbol: 'USDC',
name: 'USD Coin',
address: '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/8453/0x833589fcd6edb6e08f4c7c32d4f71b54bda02913.png',
chainId: CHAIN_IDS.BASE,
chainId: NETWORK_CHAIN_ID.BASE,
},
[CHAIN_IDS.LINEA_MAINNET]: {
[NETWORK_CHAIN_ID.LINEA_MAINNET]: {
symbol: 'mUSD',
name: 'MetaMask USD',
address: '0xaca92e438df0b2401ff60da7e4337b687a2435da',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/59144/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png',
chainId: CHAIN_IDS.LINEA_MAINNET,
chainId: NETWORK_CHAIN_ID.LINEA_MAINNET,
},
[CHAIN_IDS.ZKSYNC_ERA]: {
[NETWORK_CHAIN_ID.ZKSYNC_ERA]: {
symbol: 'USDT',
name: 'Tether USD',
address: '0x493257fd37edb34451f62edf8d2a0c418852ba4c',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/324/0x493257fd37edb34451f62edf8d2a0c418852ba4c.png',
chainId: CHAIN_IDS.ZKSYNC_ERA,
chainId: NETWORK_CHAIN_ID.ZKSYNC_ERA,
},
[CHAIN_IDS.SEI]: {
[NETWORK_CHAIN_ID.SEI]: {
symbol: 'USDC',
name: 'USD Coin',
address: '0xe15fc38f6d8c56af07bbcbe3baf5708a2bf42392',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/1329/0xe15fc38f6d8c56af07bbcbe3baf5708a2bf42392.png',
chainId: CHAIN_IDS.SEI,
chainId: NETWORK_CHAIN_ID.SEI,
},
[CHAIN_IDS.MONAD]: {
[NETWORK_CHAIN_ID.MONAD]: {
symbol: 'USDC',
name: 'USD Coin',
address: '0x754704Bc059F8C67012fEd69BC8A327a5aafb603',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/143/0x754704Bc059F8C67012fEd69BC8A327a5aafb603.png',
chainId: CHAIN_IDS.MONAD,
chainId: NETWORK_CHAIN_ID.MONAD,
},
[NETWORK_CHAIN_ID.HYPE]: {
symbol: 'USDC',
name: 'USD Coin',
address: '0xb88339CB7199b77E23DB6E890353E22632Ba630f',
decimals: 6,
image:
'https://static.cx.metamask.io/api/v1/tokenIcons/999/0xb88339cb7199b77e23db6e890353e22632ba630f.png',
chainId: NETWORK_CHAIN_ID.HYPE,
},
[SolScope.Mainnet]: {
address:
Expand Down Expand Up @@ -146,7 +155,7 @@ export const Bip44TokensForDefaultPairs: Record<CaipAssetType, BridgeToken> = {
decimals: 18,
image:
'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/slip44/60.png',
chainId: CHAIN_IDS.MAINNET,
chainId: NETWORK_CHAIN_ID.MAINNET,
},
'eip155:1/erc20:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': {
symbol: 'USDC',
Expand All @@ -155,7 +164,7 @@ export const Bip44TokensForDefaultPairs: Record<CaipAssetType, BridgeToken> = {
decimals: 6,
image:
'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.png',
chainId: CHAIN_IDS.MAINNET,
chainId: NETWORK_CHAIN_ID.MAINNET,
},
'eip155:1/erc20:0xaca92e438df0b2401ff60da7e4337b687a2435da': {
symbol: 'mUSD',
Expand All @@ -164,7 +173,7 @@ export const Bip44TokensForDefaultPairs: Record<CaipAssetType, BridgeToken> = {
decimals: 6,
image:
'https://static.cx.metamask.io/api/v2/tokenIcons/assets/eip155/1/erc20/0xaca92e438df0b2401ff60da7e4337b687a2435da.png',
chainId: CHAIN_IDS.MAINNET,
chainId: NETWORK_CHAIN_ID.MAINNET,
},
'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501': {
address: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
Expand Down
3 changes: 3 additions & 0 deletions app/components/UI/Bridge/hooks/useStablecoinsDefaultSlippage/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ const StablecoinsByChainId: Partial<Record<Hex, Set<string>>> = {
[NETWORKS_CHAIN_ID.MONAD]: new Set([
'0x754704Bc059F8C67012fEd69BC8A327a5aafb603', // USDC
]),
[NETWORKS_CHAIN_ID.HYPER_EVM]: new Set([
'0xb88339CB7199b77E23DB6E890353E22632Ba630f', // USDC
]),
};

/**
Expand Down
8 changes: 4 additions & 4 deletions app/components/UI/Bridge/utils/transaction-history.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ describe('getBridgeTxActivityTitle', () => {
assetId: 'eip155:1/erc20:0x123',
},
// eslint-disable-next-line @typescript-eslint/no-explicit-any
destChainId: 999 as any, // Non-existent chain ID
destChainId: 123456789 as any, // Non-existent chain ID
destAsset: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
chainId: 999 as any,
chainId: 123456789 as any,
address: '0x456',
decimals: 18,
symbol: 'TOKEN',
name: 'Test Token',
assetId: 'eip155:999/erc20:0x456',
assetId: 'eip155:123456789/erc20:0x456',
},
srcTokenAmount: '1000000000000000000',
destTokenAmount: '2000000000000000000',
Expand Down Expand Up @@ -79,7 +79,7 @@ describe('getBridgeTxActivityTitle', () => {
},
destChain: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
chainId: 999 as any,
chainId: 123456789 as any,
txHash: '0x456',
},
status: StatusTypes.COMPLETE,
Expand Down
Loading
Loading