refactor(activity): migrate non-EVM transaction mapping

[n3ps]

Description

Migrate call sites to import mapKeyringTransaction directly from @metamask/client-utils (same as extension)

Call sites apply the bridge quote for cross-chain bridge history as needed.

Related PRs:

• API mapper: refactor(activity): migrate api transaction mapping #34655
• Local mapper: refactor(activity): migrate local transaction mapping #34683

Changelog

CHANGELOG entry: null

Related issues

Refs: #34655

Manual testing steps

Feature: non-EVM activity mapping via client-utils

  Scenario: Solana send appears in activity
    Given a wallet with Solana activity

    When the user opens the Activity list
    Then Solana sends/receives/swaps render via mapKeyringTransaction from @metamask/client-utils
    And cross-chain bridges show bridge enrichment from bridge history

Screenshots/Recordings

N/A — mapper refactor; no UI design changes

Before

N/A

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
• I've tested with a power user scenario
• I've instrumented key operations with Sentry traces for production performance metrics

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.

---

Note

Medium Risk
Touches unified and multichain activity pipelines and bridge pending/success semantics; dependency bump on client-utils, but behavior is covered by new and updated tests.

Overview
Non-EVM activity rows now use mapKeyringTransaction from @metamask/client-utils (v2.0.1) instead of the removed mobile vendored mapper. ActivityListItem / ActivityKind are aligned with client-utils types, with a thin mobile layer for perps/stake and similar kinds.

Cross-chain bridge enrichment is no longer inside the keyring mapper. A new applyBridgeQuote helper rewrites mapped items to bridge with quote-derived tokens and status (pending until the dest leg completes). mapNonEvmTransactions, ActivityList, and MultichainTransactionsView call it when bridge history is cross-chain; same-chain swaps stay swaps.

Multichain asset-detail rows take a pre-built ActivityListItem and resolve the raw keyring tx from Redux only for analytics and legacy sheets. rampBuy / rampSell get buy/sell titles and icons. Token display treats missing amounts with a symbol as 0 (e.g. -0 ETH) in list/details formatting.

^{Reviewed by Cursor Bugbot for commit 812cb3a. Bugbot is set up for automated code reviews on this repo. Configure here.}

[github-actions]

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.

[socket-security]

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	npm/​@​metamask/​client-utils@​1.2.1 ⏵ 2.0.1	+1		+2	+3

View full report

[n3ps]

Point of interest

[n3ps]

Removed this

[sonarqubecloud]

Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
89.1% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit b7914ce. Configure here.}

[github-actions]

🧪 Flaky unit test detection

Run history flaky detection

View recent run history

Historical failure rate is a hint, not proof — review each suggestion in context. See the flaky-test-detection skill for the full pattern reference and manual audit workflow.

Failures / runs sampled per window:

File	7d	15d	30d
app/components/UI/ActivityListItemRow/ActivityListItemRow.test.tsx	0/138	0/178	0/378

AI-detected flaky patterns

app/components/UI/ActivityListItemRow/ActivityListItemRow.test.tsx

• J3 — Missing jest.clearAllMocks() / jest.resetAllMocks() (high)
  • The 'ActivityListItemRow — display currency conversion' describe block uses afterEach (not beforeEach) to call jest.clearAllMocks() and reset mock return values. This means the very first test in this block runs with whatever mock state was left by the last test in the preceding 'ActivityListItemRow — row content' describe block. If Jest runs tests in a different order (e.g. with --randomize) or if a test in the previous block sets a mock return value that affects currency/rate selectors, the first test in this block will see stale mock state and may produce a different result than expected. The fix is to move the mock reset into a beforeEach so every test — including the first — starts from a known baseline.
  • Suggested fix in app/components/UI/ActivityListItemRow/ActivityListItemRow.test.tsx:1:

    -describe('ActivityListItemRow — display currency conversion', () => {
    -  const mockCurrency = jest.mocked(selectCurrentCurrency);
    -  const mockConversionRate = jest.mocked(selectConversionRateByChainId);
    -  const mockUsdConversionRate = jest.mocked(selectUSDConversionRateByChainId);
    -  afterEach(() => {
    -    jest.clearAllMocks();
    -    mockCurrency.mockReturnValue('usd');
    -    mockConversionRate.mockReturnValue(2500);
    -    mockUsdConversionRate.mockReturnValue(2500);
    -    // ...
    -  });
    +describe('ActivityListItemRow — display currency conversion', () => {
    +  const mockCurrency = jest.mocked(selectCurrentCurrency);
    +  const mockConversionRate = jest.mocked(selectConversionRateByChainId);
    +  const mockUsdConversionRate = jest.mocked(selectUSDConversionRateByChainId);
    +  beforeEach(() => {
    +    jest.clearAllMocks();
    +    mockCurrency.mockReturnValue('usd');
    +    mockConversionRate.mockReturnValue(2500);
    +    mockUsdConversionRate.mockReturnValue(2500);
    +  });
    +  afterEach(() => {
    +    jest.clearAllMocks();
    +  });

• J3 — Missing jest.clearAllMocks() / jest.resetAllMocks() (high)
  • The 'ActivityListItemRow — ERC-20 fiat address casing' describe block also uses afterEach (not beforeEach) to clear mocks and reset the contract exchange rates mock. The first test in this block runs with whatever mock state was left by the last test in the preceding describe block ('ActivityListItemRow — amount display'), which has no clearAllMocks at all. If the preceding block sets selectContractExchangeRatesByChainId to a value that differs from the expected default, the first test here will see stale state. Moving the reset to beforeEach guarantees a clean baseline for every test including the first.
  • Suggested fix in app/components/UI/ActivityListItemRow/ActivityListItemRow.test.tsx:1:

    -describe('ActivityListItemRow — ERC-20 fiat address casing (TMCU-937)', () => {
    -  const mockContractExchangeRates = jest.mocked(
    -    selectContractExchangeRatesByChainId,
    -  );
    -  // ...
    -  afterEach(() => {
    -    jest.clearAllMocks();
    -    mockContractExchangeRates.mockReturnValue(ratesFor(LINEA_MUSD_ADDRESS));
    -  });
    -  it('renders fiat for an ERC-20 when market data is keyed by a checksummed address', () => {
    +describe('ActivityListItemRow — ERC-20 fiat address casing (TMCU-937)', () => {
    +  const mockContractExchangeRates = jest.mocked(
    +    selectContractExchangeRatesByChainId,
    +  );
    +  const ratesFor = (address: string) =>
    +    ({ [address]: { price: 0.0004 } }) as ReturnType<
    +      typeof selectContractExchangeRatesByChainId
    +    >;
    +  beforeEach(() => {
    +    jest.clearAllMocks();
    +    mockContractExchangeRates.mockReturnValue(ratesFor(LINEA_MUSD_ADDRESS));
    +  });
    +  afterEach(() => {
    +    jest.clearAllMocks();
    +  });

This check is informational only and does not block merging.