Skip to content

fix: cp-7.46.0 fix solana token list render #14898

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
merged 6 commits into from
Apr 28, 2025
+21 −111
Merged

fix: cp-7.46.0 fix solana token list render #14898

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5fc1164
fix: fix solana token list render
sahar-fehri Apr 25, 2025
93649f9
fix: code fence
sahar-fehri Apr 25, 2025
f89efa6
fix: code fence
sahar-fehri Apr 25, 2025
474516a
Merge branch 'main' into fix/fix-render-asset-list-on-account-creation
sahar-fehri Apr 25, 2025
e413f4d
Merge branch 'main' into fix/fix-render-asset-list-on-account-creation
sahar-fehri Apr 25, 2025
bd1e6de
Merge branch 'main' into fix/fix-render-asset-list-on-account-creation
sahar-fehri Apr 25, 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
11 changes: 8 additions & 3 deletions app/components/UI/Bridge/hooks/useLatestBalance/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import { abiERC20 } from '@metamask/metamask-eth-abis';
import { Web3Provider } from '@ethersproject/providers';
import { formatUnits, getAddress, parseUnits } from 'ethers/lib/utils';
import { useSelector } from 'react-redux';
import { selectSelectedInternalAccountFormattedAddress } from '../../../../../selectors/accountsController';
import { selectSelectedInternalAccount, selectSelectedInternalAccountFormattedAddress } from '../../../../../selectors/accountsController';
import { getProviderByChainId } from '../../../../../util/notifications/methods/common';
import { BigNumber, constants, Contract } from 'ethers';
import usePrevious from '../../../../hooks/usePrevious';
///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
import { isSolanaChainId } from '@metamask/bridge-controller';
import { selectMultichainTokenList } from '../../../../../selectors/multichain/multichain';
import { selectMultichainTokenListForAccountId } from '../../../../../selectors/multichain/multichain';
import { RootState } from '../../../../../reducers';
///: END:ONLY_INCLUDE_IF

export async function fetchAtomicTokenBalance(
Expand Down Expand Up @@ -66,10 +67,14 @@ export const useLatestBalance = (
const selectedAddress = useSelector(selectSelectedInternalAccountFormattedAddress);
const previousToken = usePrevious(token);

const selectedAccount = useSelector(selectSelectedInternalAccount);

///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
// Returns native SOL and SPL tokens, contains balance and fiat values
// Balance and fiat values are not truncated
const nonEvmTokens = useSelector(selectMultichainTokenList);
const nonEvmTokens = useSelector((state: RootState) =>
selectMultichainTokenListForAccountId(state, selectedAccount?.id),
);
///: END:ONLY_INCLUDE_IF

const chainId = token.chainId;
Expand Down
10 changes: 7 additions & 3 deletions app/components/UI/Tokens/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
selectEvmTokenFiatBalances,
selectEvmTokens,
///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
selectMultichainTokenList,
selectMultichainTokenListForAccountId,
///: END:ONLY_INCLUDE_IF
} from '../../../selectors/multichain';
import { TraceName, endTrace, trace } from '../../../util/trace';
Expand All @@ -45,6 +45,7 @@ import { selectIsEvmNetworkSelected } from '../../../selectors/multichainNetwork
import { AssetPollingProvider } from '../../hooks/AssetPolling/AssetPollingProvider';
import { TokenListControlBar } from './TokenListControlBar';
import { selectSelectedInternalAccount } from '../../../selectors/accountsController';
import { RootState } from '../../../reducers';

interface TokenListNavigationParamList {
AddAsset: { assetType: string };
Expand Down Expand Up @@ -74,12 +75,15 @@ const Tokens = memo(() => {
const [tokenToRemove, setTokenToRemove] = useState<TokenI>();
const [refreshing, setRefreshing] = useState(false);
const [isAddTokenEnabled, setIsAddTokenEnabled] = useState(true);
const selectedAccount = useSelector(selectSelectedInternalAccount);

// non-evm
///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
const nonEvmTokens = useSelector(selectMultichainTokenList);
const nonEvmTokens = useSelector((state: RootState) =>
selectMultichainTokenListForAccountId(state, selectedAccount?.id),
);
///: END:ONLY_INCLUDE_IF
const selectedAccount = useSelector(selectSelectedInternalAccount);


const tokenListData = isEvmSelected ? evmTokens : nonEvmTokens;

Expand Down
96 changes: 0 additions & 96 deletions app/selectors/multichain/multichain.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
selectMultichainBalances,
MULTICHAIN_NETWORK_TO_ASSET_TYPES,
selectMultichainTransactions,
selectMultichainTokenList,
selectSelectedAccountMultichainNetworkAggregatedBalance,
selectSolanaAccountTransactions,
selectMultichainHistoricalPrices,
Expand Down Expand Up @@ -588,101 +587,6 @@ describe('MultichainNonEvm Selectors', () => {
});
});

describe('selectMultichainTokenList', () => {
it('returns a list of tokens', () => {
const selectedInternalAccountId = 'ae247df6-3911-47f7-9e36-28e6a7d96078';
const state = getNonEvmState();
const mockBalances = {
[selectedInternalAccountId]: {
[MultichainNativeAssets.Bitcoin]: { amount: '10', unit: 'BTC' },
},
};
const mockAssets = {
[selectedInternalAccountId]: [MultichainNativeAssets.Bitcoin],
};
const mockAssetsMetadata = {
[MultichainNativeAssets.Bitcoin]: {
name: 'Bitcoin',
symbol: 'BTC',
units: [{ name: 'Bitcoin', symbol: 'BTC', decimals: 8 }],
iconUrl: 'https://example.com/btc.png',
fungible: true as const,
},
};
const mockAssetsRates = {
[MultichainNativeAssets.Bitcoin]: { rate: '2000', conversionTime: 0 },
};
state.engine.backgroundState.MultichainBalancesController.balances =
mockBalances;
state.engine.backgroundState.MultichainAssetsController.accountsAssets =
mockAssets;
state.engine.backgroundState.MultichainAssetsController.assetsMetadata =
mockAssetsMetadata;
state.engine.backgroundState.MultichainAssetsRatesController.conversionRates =
mockAssetsRates;

const tokenList = selectMultichainTokenList(state);

expect(tokenList.length).toEqual(1);
expect(tokenList[0].name).toEqual('Bitcoin');
expect(tokenList[0].symbol).toEqual('BTC');
expect(tokenList[0].balance).toEqual('10');
});

it('filters out tokens not matching nonEVM network chain ID', () => {
const selectedInternalAccountId = 'ae247df6-3911-47f7-9e36-28e6a7d96078';
const state = getNonEvmState();

const nonMatchingAssetId =
'eip155:1/erc20:0x6b175474e89094c44da98b954eedeac495271d0f'; // Ethereum Mainnet

state.engine.backgroundState.MultichainBalancesController.balances = {
[selectedInternalAccountId]: {
[nonMatchingAssetId]: { amount: '5', unit: 'DAI' },
},
};
state.engine.backgroundState.MultichainAssetsController.accountsAssets = {
[selectedInternalAccountId]: [nonMatchingAssetId],
};

const tokenList = selectMultichainTokenList(state);
expect(tokenList).toEqual([]);
});

it('returns an empty array if selected account is undefined', () => {
const state = getNonEvmState();
state.engine.backgroundState.AccountsController.internalAccounts.selectedAccount =
'foo';

const tokenList = selectMultichainTokenList(state);

expect(tokenList).toEqual([]);
});

it('uses fallback metadata when asset metadata is missing', () => {
const selectedInternalAccountId = 'ae247df6-3911-47f7-9e36-28e6a7d96078';
const state = getNonEvmState();

const btcCaip = 'bip122:000000000019d6689c085ae165831e93/slip44:0';

state.engine.backgroundState.MultichainBalancesController.balances = {
[selectedInternalAccountId]: {
[btcCaip]: { amount: '1', unit: 'BTC' },
},
};
state.engine.backgroundState.MultichainAssetsController.accountsAssets = {
[selectedInternalAccountId]: [btcCaip],
};
state.engine.backgroundState.MultichainAssetsController.assetsMetadata =
{}; // fallback will be used

const tokenList = selectMultichainTokenList(state);
expect(tokenList[0].name).toBe('BTC');
expect(tokenList[0].symbol).toBe('BTC');
expect(tokenList[0].balance).toBe('1');
});
});

describe('selectMultichainNetworkAggregatedBalance', () => {
beforeEach(() => {
jest.clearAllMocks();
Expand Down
9 changes: 0 additions & 9 deletions app/selectors/multichain/multichain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,15 +283,6 @@ export const selectMultichainTokenListForAccountId = createDeepEqualSelector(
return tokens;
},
);

export const selectMultichainTokenList = createDeepEqualSelector(
(state: RootState) => state,
selectSelectedInternalAccount,
(state, selectedAccount) => {
return selectMultichainTokenListForAccountId(state, selectedAccount?.id);
},
);

export interface MultichainNetworkAggregatedBalance {
totalNativeTokenBalance: Balance | undefined;
totalBalanceFiat: number | undefined;
Expand Down
Loading