Skip to content

fix: send/receive asset selection should handle unsupported assets (#3311) #12526

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
kaladinlight merged 9 commits into from
Aug 5, 2026
+121 −14
Merged

fix: send/receive asset selection should handle unsupported assets (#3311) #12526

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fd043c8
fix: filter unsupported assets from portfolio fallback in asset selec…
joan-bisbal Aug 4, 2026
0230ab5
fix: address CodeRabbit nitpicks for explicit typing
joan-bisbal Aug 4, 2026
bd25464
test: add regression tests for portfolio asset filtering
joan-bisbal Aug 4, 2026
abce79c
refactor: route popular assets through filterAssetsByChain, retire TODO
kaladinlight Aug 5, 2026
fa6f425
chore: lint fixes - import sort, arrow parens
kaladinlight Aug 5, 2026
6b7a35f
refactor: rename helper to filterAssetsForWallet, flatten layout
kaladinlight Aug 5, 2026
0da081b
Merge branch 'develop' into fix/unsupported-asset-selection
kaladinlight Aug 5, 2026
023e5cd
test: cover omitted allowWalletUnsupportedAssets, the send/receive case
kaladinlight Aug 5, 2026
172c8dd
chore: retrigger ci for corrected pr title
kaladinlight Aug 5, 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
16 changes: 14 additions & 2 deletions src/components/TradeAssetSearch/TradeAssetSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,24 @@ export const TradeAssetSearch: FC<TradeAssetSearchProps> = ({
}, [activeChainId, popularAssets])

const portfolioAssetsSortedByBalanceForChain = useMemo(() => {
const filteredPortfolioAssetsSortedByBalance = portfolioAssetsSortedByBalance.filter(
let filteredPortfolioAssetsSortedByBalance = portfolioAssetsSortedByBalance.filter(
asset => assetFilterPredicate?.(asset.assetId) ?? true,
)

if (hasWallet && !allowWalletUnsupportedAssets) {
filteredPortfolioAssetsSortedByBalance = filteredPortfolioAssetsSortedByBalance.filter(
asset => walletConnectedChainIds.includes(asset.chainId),
)
}

return filteredPortfolioAssetsSortedByBalance
}, [portfolioAssetsSortedByBalance, assetFilterPredicate])
}, [
portfolioAssetsSortedByBalance,
assetFilterPredicate,
hasWallet,
allowWalletUnsupportedAssets,
walletConnectedChainIds,
])

const chainIds: (ChainId | 'All')[] = useMemo(() => {
const unsortedChainIds = (() => {
Expand Down