chore(runway): cherry-pick fix: cp-7.60.0 filter out tron staked tokens from send flow #23028
+395
−20
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ns from send flow (#22979) ## **Description** TRON staked tokens were visible in the send flow. This PR modifies some selectors so that we filter out TRON staked tokens. ## **Changelog** CHANGELOG entry: fix: filter out TRON staked tokens ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/ASSETS-1814 ## **Manual testing steps** 1. Go to send flow 2. Filter TRON 3. EXPECTED: TRON staked tokens are not visible ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <img width="316" height="720" alt="image" src="https://github.com/user-attachments/assets/d8a4656b-cf62-49e8-b6c9-1cadfb3eab4d" /> ### **After** https://www.loom.com/share/e5ca32a5434e46ab907d8832ab3af239 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Exclude Tron staked bandwidth/energy assets from token lists by introducing a filtered assets selector, wiring it into the send tokens hook and sorting selector, with accompanying tests. > > - **Selectors**: > - Add `selectFilteredAssetsBySelectedAccountGroup` to remove Tron resource symbols (`ENERGY`, `BANDWIDTH`, and staked variants) across `TrxScope` networks. > - Update `selectSortedAssetsBySelectedAccountGroup` to consume the filtered selector. > - **Hooks**: > - `useAccountTokens` now uses `selectFilteredAssetsBySelectedAccountGroup` to exclude Tron staked/resource tokens in the send flow. > - **Tests**: > - Add coverage for `selectFilteredAssetsBySelectedAccountGroup` Tron filtering. > - Update `useAccountTokens` tests to use the new selector. > - Minor assertion tweak to `toStrictEqual` for assets shape. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 8f9af0e. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
Contributor
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
| } | ||
| return true; | ||
| }); | ||
| }); |
There was a problem hiding this comment.
Bug: Incomplete filtering of Tron staked tokens
The filtering logic only processes Tron chains explicitly listed in TrxScope enum values. Tron staked tokens on custom or unlisted Tron networks would bypass the filter entirely. The code iterates Object.values(TrxScope) instead of checking all chain IDs in assetsByAccountGroup that start with 'tron:', creating a gap where staked tokens on non-enumerated Tron networks remain visible in the send flow.
Contributor
🔍 Smart E2E Test Selection
click to see 🤖 AI reasoning detailsFallback: AI analysis did not complete successfully. Running all tests. |
joaoloureirop
approved these changes
Nov 20, 2025
|
metamaskbot
added
the
release-7.60.0
Collaborator
|
No release label on PR. Adding release label release-7.60.0 on PR, as PR was cherry-picked in branch 7.60.0. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
TRON staked tokens were visible in the send flow. This PR modifies some
selectors so that we filter out TRON staked tokens.
Changelog
CHANGELOG entry: fix: filter out TRON staked tokens
Related issues
Fixes: https://consensyssoftware.atlassian.net/browse/ASSETS-1814
Manual testing steps
Screenshots/Recordings
Before
After
https://www.loom.com/share/e5ca32a5434e46ab907d8832ab3af239
Pre-merge author checklist
Docs and MetaMask Mobile
Coding
Standards.
if applicable
guidelines).
Not required for external contributors.
Pre-merge reviewer checklist
app, test code being changed).
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
Note
Introduce a filtered assets selector to exclude Tron Energy/Bandwidth (and staked variants) and wire it into send flow and sorting, with comprehensive tests.
selectFilteredAssetsBySelectedAccountGroupto remove Tron resource tokens (ENERGY,BANDWIDTH, staked-for variants) acrossTrxScopenetworks.selectSortedAssetsBySelectedAccountGroupto consume the filtered selector.useAccountTokensto useselectFilteredAssetsBySelectedAccountGroup, ensuring Tron resources are not shown.useAccountTokenstests to mock the new selector; minor expectation tweaks (e.g.,toStrictEqual).Written by Cursor Bugbot for commit 8d1ef59. This will update automatically on new commits. Configure here.
fe2980a