Skip to content

chore(runway): cherry-pick fix: swaps network selector not scrolling on android cp-7.69.0#27302

Merged
chloeYue merged 1 commit into
release/7.69.0from
runway-cherry-pick-7.69.0-1773181212
Mar 11, 2026
Merged

chore(runway): cherry-pick fix: swaps network selector not scrolling on android cp-7.69.0#27302
chloeYue merged 1 commit into
release/7.69.0from
runway-cherry-pick-7.69.0-1773181212

Conversation

@runway-github

@runway-github runway-github Bot commented Mar 10, 2026

Copy link
Copy Markdown
Contributor

Description

The "Select Network" bottom sheet in the Bridge token selector was not
scrollable on Android.

Tested on both iOS and Android.

Changelog

CHANGELOG entry: Fixed the Bridge "Select Network" bottom sheet not
being scrollable when many networks are available on Android.

Related issues

Fixes: https://consensyssoftware.atlassian.net/browse/SWAPS-4252
Fixes: #27290

Manual testing steps

Feature: Bridge token selector network filter

  Scenario: user scrolls the network list in the Select Network bottom sheet
    Given the user is on the Bridge screen
    And many networks are available

    When user taps the network filter pill above the token list
    Then the Select Network bottom sheet opens

    When user attempts to scroll the network list
    Then the list scrolls smoothly without dismissing the sheet

    When user taps a network
    Then the sheet closes and the token list is filtered to that network

Screenshots/Recordings

Before

After

Screen.Recording.2026-03-10.at.5.07.59.PM.mov

Pre-merge author checklist

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

Low Risk
Small UI gesture-handling change limited to the Bridge network
selector; no auth, security, or data-flow logic is modified.

Overview
Fixes the Bridge token selector "Select Network" bottom sheet not
scrolling on Android by switching the network list container to
ScrollView from react-native-gesture-handler, which correctly
handles scroll gestures inside the bottom sheet.

Removes the unused BridgeNetworkSelectorBase component that
previously wrapped children in a bottom sheet + react-native
ScrollView.

Written by Cursor
Bugbot
for commit
d3b24db. This will update automatically
on new commits. Configure
here.

[c22e473](https://github.com/MetaMask/metamask-mobile/commit/c22e4737d80fc699a84a9452eefd2a7123a97de2)

…on android cp-7.69.0 (#27295)

## **Description**

The "Select Network" bottom sheet in the Bridge token selector was not
scrollable on Android.

Tested on both iOS and Android.

## **Changelog**

CHANGELOG entry: Fixed the Bridge "Select Network" bottom sheet not
being scrollable when many networks are available on Android.

## **Related issues**

Fixes: https://consensyssoftware.atlassian.net/browse/SWAPS-4252
Fixes: #27290

## **Manual testing steps**

```
Feature: Bridge token selector network filter

  Scenario: user scrolls the network list in the Select Network bottom sheet
    Given the user is on the Bridge screen
    And many networks are available

    When user taps the network filter pill above the token list
    Then the Select Network bottom sheet opens

    When user attempts to scroll the network list
    Then the list scrolls smoothly without dismissing the sheet

    When user taps a network
    Then the sheet closes and the token list is filtered to that network
```

## **Screenshots/Recordings**

### **Before**

<!-- List clipped, vertical pan dismissed the sheet instead of scrolling
-->

### **After**




https://github.com/user-attachments/assets/006154c0-b0a3-482d-8c23-be4cfbb37085





<!-- Full network list scrollable -->

## **Pre-merge author checklist**

- [ ] 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).
- [ ] 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
- [ ] 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]
> **Low Risk**
> Small UI gesture-handling change limited to the Bridge network
selector; no auth, security, or data-flow logic is modified.
> 
> **Overview**
> Fixes the Bridge token selector "Select Network" bottom sheet not
scrolling on Android by switching the network list container to
`ScrollView` from `react-native-gesture-handler`, which correctly
handles scroll gestures inside the bottom sheet.
> 
> Removes the unused `BridgeNetworkSelectorBase` component that
previously wrapped children in a bottom sheet + `react-native`
`ScrollView`.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
d3b24db. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
@runway-github runway-github Bot requested a review from a team as a code owner March 10, 2026 22:20
@github-actions

Copy link
Copy Markdown
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.

@metamaskbot metamaskbot added the team-bots Bot team (for MetaMask Bot, Runway Bot, etc.) label Mar 10, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🔍 Smart E2E Test Selection

⏭️ Smart E2E selection skipped - base branch is not main (base: release/7.69.0)

All E2E tests pre-selected.

View GitHub Actions results

@sonarqubecloud

Copy link
Copy Markdown

@github-actions

Copy link
Copy Markdown
Contributor

⚠️ E2E Fixture Validation — Structural changes detected

Category Count
New keys 68
Missing keys 11
Type mismatches 0
Value mismatches 6 (informational)

The committed fixture schema is out of date. To update, comment:

@metamaskbot update-mobile-fixture

View full details | Download diff report

@chloeYue chloeYue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@chloeYue chloeYue merged commit 9847633 into release/7.69.0 Mar 11, 2026
106 checks passed
@chloeYue chloeYue deleted the runway-cherry-pick-7.69.0-1773181212 branch March 11, 2026 08:53
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 11, 2026
@metamaskbot metamaskbot added the release-7.69.0 Issue or pull request that will be included in release 7.69.0 label Mar 11, 2026
@metamaskbot

Copy link
Copy Markdown
Collaborator

No release label on PR. Adding release label release-7.69.0 on PR, as PR was cherry-picked in branch 7.69.0.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release-7.69.0 Issue or pull request that will be included in release 7.69.0 size-S team-bots Bot team (for MetaMask Bot, Runway Bot, etc.)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants