chore(runway): cherry-pick fix: update logic to support all non-evm chains cp-7.60.0 #23334
+3
−2
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
…hains cp-7.60.0 (#23328) <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> Update logic to include all non-evm chains when parsing deep link urls. ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: Update logic for deeplink parsing to take into account all non-EVM chains ## **Related issues** Fixes: #23314 ## **Manual testing steps** ```gherkin Feature: my feature name Scenario: user [verb for user action] Given [describe expected initial app state] When user [verb for user action] Then [describe expected outcome] ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **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 - [ ] I’ve included tests if applicable - [ ] 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] > Generalizes asset metadata handling from Solana-only to all non-EVM chains using `isNonEvmChainId`. > > - **Bridge asset metadata utils (`app/components/UI/Bridge/hooks/useAssetMetadata/utils.ts`)**: > - Replace Solana-specific check with generic `isNonEvmChainId` for non-EVM asset handling in `fetchAssetMetadata`. > - Import `isNonEvmChainId` from `@metamask/bridge-controller` to support all non-EVM chains. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 2019411. 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. |
Contributor
🔍 Smart E2E Test Selection
click to see 🤖 AI reasoning detailsFallback: AI analysis did not complete successfully. Running all tests. |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
| // Solana | ||
| if (chainId === MultichainNetwork.Solana && assetId) { | ||
| // non-EVM | ||
| if (isNonEvmChainId(chainId) && assetId) { |
There was a problem hiding this comment.
Bug: Wrong chainId variable used in non-EVM check
The isNonEvmChainId check uses the original chainId parameter instead of chainIdInCaip. Since chainId can be either Hex or CaipChainId format, but isNonEvmChainId from @metamask/bridge-controller expects CAIP format, this causes incorrect behavior when a hex chainId is passed. The function normalizes to CAIP format in chainIdInCaip on line 85-87, so that variable should be used instead.
| import { | ||
| formatAddressToCaipReference, | ||
| formatChainIdToHex, | ||
| isNonEvmChainId, |
There was a problem hiding this comment.
Bug: Incomplete non-EVM support in toAssetId function
The toAssetId function only handles Solana chains specifically, but fetchAssetMetadata was updated to support all non-EVM chains using isNonEvmChainId. For non-Solana chains like Bitcoin or Tron, toAssetId returns undefined because their addresses aren't hex strings, causing fetchAssetMetadata to exit early. This makes the new non-EVM logic on line 108 unreachable for non-Solana chains, contradicting the PR's intent to support all non-EVM chains.
joaoloureirop
approved these changes
Nov 26, 2025
|
joaoloureirop
approved these changes
Nov 26, 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
Update logic to include all non-evm chains when parsing deep link urls.
Changelog
CHANGELOG entry: Update logic for deeplink parsing to take into account
all non-EVM chains
Related issues
Fixes: #23314
Manual testing steps
Screenshots/Recordings
Before
After
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
Generalizes asset metadata fetching to support all non-EVM chains by replacing Solana-specific logic with
isNonEvmChainId.app/components/UI/Bridge/hooks/useAssetMetadata/utils.ts):fetchAssetMetadataby replacing Solana-specific check withisNonEvmChainId.isNonEvmChainIdfrom@metamask/bridge-controllerand updates non-EVM address extraction viaparseCaipAssetType.parseCaipChainId,formatAddressToCaipReference,formatChainIdToHex).Written by Cursor Bugbot for commit 8bc891b. This will update automatically on new commits. Configure here.
3cf4f74