Skip to content

Commit dcceb02

Browse files
authored
fix: fixes token navigation button on the unavailable modal (#26720)
<!-- 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** Problem: The "Change token" button in TokenNotAvailableModal called navigation.navigate(Routes.RAMP.TOKEN_SELECTION), but the route name Routes.RAMP.TOKEN_SELECTION exists in both the RootStack (mapped to MainRoutes, the nested navigator) and the inner Stack (mapped to the actual TokenSelection screen). After the modal closed via goBack(), navigate("RampTokenSelection") matched the RootStack's screen, which was already focused, so React Navigation treated it as a no-op. Fix: Pass { screen: Routes.RAMP.TOKEN_SELECTION } as the second argument to navigate, which tells React Navigation to drill into the nested MainRoutes navigator and navigate to the TokenSelection screen within it. <!-- 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? --> ## **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: null ## **Related issues** Fixes: ## **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** ![token-button-fix](https://github.com/user-attachments/assets/a602de7f-8809-4067-b928-d3fb431a38ee) <!-- [screenshots/recordings] --> ## **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** > Low risk: small React Navigation parameter change limited to the Ramp token-unavailable modal, with an updated unit test to lock the behavior. > > **Overview** > Fixes the `TokenNotAvailableModal` **Change token** button to navigate into the nested `Routes.RAMP.TOKEN_SELECTION` screen by passing `{ screen: Routes.RAMP.TOKEN_SELECTION }`, avoiding a no-op when the parent route is already focused. > > Updates the modal’s unit test to assert the new `navigate` call signature. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 2539270. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
1 parent 12f0853 commit dcceb02

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

app/components/UI/Ramp/Views/Modals/TokenNotAvailableModal/TokenNotAvailableModal.test.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ describe('TokenNotAvailableModal', () => {
118118
fireEvent.press(getByText('Change token'));
119119

120120
expect(mockOnCloseBottomSheet).toHaveBeenCalledWith(expect.any(Function));
121-
expect(mockNavigate).toHaveBeenCalledWith(Routes.RAMP.TOKEN_SELECTION);
121+
expect(mockNavigate).toHaveBeenCalledWith(Routes.RAMP.TOKEN_SELECTION, {
122+
screen: Routes.RAMP.TOKEN_SELECTION,
123+
});
122124
});
123125

124126
it('navigates to provider picker when Change provider is pressed', () => {

app/components/UI/Ramp/Views/Modals/TokenNotAvailableModal/TokenNotAvailableModal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ function TokenNotAvailableModal() {
5151

5252
const handleChangeToken = useCallback(() => {
5353
sheetRef.current?.onCloseBottomSheet(() => {
54-
navigation.navigate(Routes.RAMP.TOKEN_SELECTION);
54+
navigation.navigate(Routes.RAMP.TOKEN_SELECTION, {
55+
screen: Routes.RAMP.TOKEN_SELECTION,
56+
});
5557
});
5658
}, [navigation]);
5759

0 commit comments

Comments
 (0)