Description

On a Solana (and other non-EVM) swap's activity detail screen, the "Swap again" button was missing. EVM swaps showed it; non-EVM swaps did not.

Root cause: the button is gated on toBridgeToken(...) returning a token, and that helper bailed on decimals === undefined. Non-EVM activity rows never carry decimals (the keyring adapter's getToken only sets amount/symbol/assetId), so the helper returned undefined → the gate hid the button. It would also have no-opped even if shown, because the non-EVM skeleton was keyed by the bare reference or the EVM 0x0 sentinel, but the user's held non-EVM tokens are keyed by their full CAIP-19 asset id as address (selectMultichainTokenListForAccountsAnyChain stores address: assetId), so hydration could never match.

Fix (localized to toBridgeToken):

• Only require decimals for EVM rows. For non-EVM, keep a 0 placeholder and let useActivityDetailsDoItAgain hydrate the real value from the user's held tokens (right after a swap the user holds both legs).
• Key the non-EVM skeleton by its full asset id as address, so isSameBridgeToken matches the held token and fills in the real decimals, correct Solana address, icon, and balance.
• EVM behavior is unchanged (still requires decimals, still uses the contract address / normalized native sentinel).

This mirrors the extension's "gate on the asset id, resolve the full token" approach, adapted to mobile's held-token hydration. No changes were needed in SwapDetails / BridgeDetails — they already consume the gate + hook.

Changelog

CHANGELOG entry: Fixed the "Swap again" button not appearing on Solana and other non-EVM swap activity details.

Related issues

Fixes: https://consensyssoftware.atlassian.net/browse/TMCU-993

Manual testing steps

Feature: "Swap again" on non-EVM (Solana) swap activity details

  Scenario: Button shows for a Solana swap
    Given the activity redesign flag is on
    And I have performed a swap on Solana (e.g. SOL -> USDC)
    When I open that swap from the Activity list
    Then I see the "Swap again" button

  Scenario: Button opens the swap prefilled with the same tokens
    Given I am on a Solana swap's activity detail with the "Swap again" button
    When I tap "Swap again"
    Then the Bridge opens in Swap mode
    And the source and destination tokens are prefilled with the correct
      Solana tokens (real icons, balances) and an empty amount

  Scenario: EVM swaps are unaffected
    Given the activity redesign flag is on
    And I have performed an EVM swap
    When I open that swap and tap "Swap again"
    Then it behaves exactly as before

Screenshots/Recordings

Before

After

Pre-merge author checklist

• I've followed MetaMask Contributor Docs and MetaMask Mobile Coding Standards.
• 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 format if applicable
• I've applied the right labels on the PR (see labeling guidelines). Not required for external contributors.

Performance checks (if applicable)

• I've tested on Android
  • Ideally on a mid-range device; emulator is acceptable
• I've tested with a power user scenario
  • Use these power-user SRPs to import wallets with many accounts and tokens
• I've instrumented key operations with Sentry traces for production performance metrics
  • See trace() for usage and addToken for an example

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.