[pull] main from MetaMask:main#783
Merged
Merged
Conversation
#30602) <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until this PR meets the canonical Definition of Ready For Review in `docs/readme/ready-for-review.md`. In short: the template must be materially complete (not just section titles present), all status checks must be currently passing, and the only expected follow-up commits must be reviewer-driven. --> ## **Description** Fix re-run CI on finished runs when e2e labels are modified in the PR <!-- 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: ## **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** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** <!-- Every checklist item must be consciously assessed before marking this PR as "Ready for review". A checked box means you deliberately considered that responsibility, not that you literally performed every action listed. Unchecked boxes are ambiguous: they are not an implicit "N/A" and they are not a silent "skip". See `docs/readme/ready-for-review.md` for the full checklist semantics. --> - [ ] 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. #### 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](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93) to import wallets with many accounts and tokens - [ ] I've instrumented key operations with Sentry traces for production performance metrics - See [`trace()`](/app/util/trace.ts) for usage and [`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274) for an example For performance guidelines and tooling, see the [Performance Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers). ## **Pre-merge reviewer checklist** <!-- Reviewer checklist items follow the same semantics as the author checklist: an unchecked box is ambiguous, a checked box means the reviewer consciously assessed that responsibility. See `docs/readme/ready-for-review.md`. --> - [ ] 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** > Only changes a GitHub Actions helper workflow; no app runtime, auth, or data paths. > > **Overview** > Tightens the **Rerun CI on skipped E2E labels** workflow so label changes can re-trigger CI even when the latest run has already finished, not only while runs are still active. > > The job now runs only on **open** PRs (that guard moved from the rerun step into the job `if`). Finding the run to rerun filters `ci.yml` runs with **`--event pull_request`**. After cancel, the wait step polls **that run’s** status via `gh run view` instead of counting every in-progress/queued run on the branch. The rerun step treats a failed `gh run rerun` as a soft outcome when the run isn’t retriable, instead of failing the workflow outright. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit c620e90. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
#30478) ## **Description** Migrates Earn navigation stacks from @react-navigation/stack to @react-navigation/native-stack, and replaces imperative getStakingNavbar headers on stablecoin lending deposit/withdrawal confirmation screens with declarative HeaderStandard from the design system. **Why** - Align Earn with other recently converted stacks (native stack for performance and consistency). - Remove legacy navigation.setOptions(getStakingNavbar(...)) in favor of in-view HeaderStandard, matching patterns from refactor/unstake (#30281) and refactor/headerstandard-titles-bridge (accessibility-label–based header interactions in tests). **What changed** _app/components/UI/Earn/routes/index.tsx_ - createStackNavigator → createNativeStackNavigator for EarnScreenStack and EarnModalStack. - EarnScreenStack uses transparentModalScreenOptions. - EarnModalStack uses clearNativeStackNavigatorOptions + transparentModalScreenOptions. - headerShown: false on lending deposit and withdrawal confirmation screens (headers owned by the view). _EarnLendingDepositConfirmationView_ - Renders <HeaderStandard> with dynamic title (Supply <token>). - Back via onBack + backButtonProps.accessibilityLabel: strings('navigation.back'). - Removed dead getStakingNavbar(...) call and navbar useEffect. _EarnLendingWithdrawalConfirmationView_ - Same HeaderStandard pattern with title (Withdraw <token>). - Back press preserves EARN_LENDING_WITHDRAW_CONFIRMATION_BACK_CLICKED analytics (moved from getStakingNavbar backButtonEvent into handleHeaderBackPress). _Tests_ - Added HeaderStandard coverage (title rendering, back navigation, withdrawal back analytics). - Back button queried via getByLabelText(strings('navigation.back')) (bridge header pattern), not button-icon testID. - Removed getStakingNavbar spy/import from withdrawal tests. ## **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** <img width="334" height="696" alt="Earn - Deposit" src="https://github.com/user-attachments/assets/b9a6838f-3952-4bdf-a30a-720f2dc1921b" /> <img width="346" height="738" alt="Earn - Withdraw" src="https://github.com/user-attachments/assets/6d61116e-a342-414a-86eb-94fed9a1f266" /> <img width="334" height="696" alt="earn - confirmation" src="https://github.com/user-attachments/assets/7074bc4a-f815-4f0a-b652-6a1b6f3afe8f" /> <img width="334" height="696" alt="Earn - conversion education" src="https://github.com/user-attachments/assets/1e687c54-8b3a-4e93-841c-6d7923d09faf" /> <img width="334" height="696" alt="earn - learn more modal" src="https://github.com/user-attachments/assets/ca5195fe-108f-4fcf-8f93-7d3bc54aa328" /> <img width="334" height="696" alt="earn - confirm modal" src="https://github.com/user-attachments/assets/41c191ae-6b4a-409f-b838-5297bcaf2ec3" /> Android _EarnLendingDepositConfirmationView_ and _EarnLendingWithdrawalConfirmationView_ screens after nav header changes |EarnLendingDepositConfirmationView|EarnLendingWithdrawalConfirmationView| | --- | --- | |<img width="1080" height="2316" alt="Screenshot_20260521_071052_MetaMask" src="https://github.com/user-attachments/assets/635fa65b-28a1-4d34-ab8e-8ab0781afaa6" />|<img width="1080" height="2316" alt="Screenshot_20260521_070956_MetaMask" src="https://github.com/user-attachments/assets/408d6e88-980a-4e98-ae6e-098bdb82b3ae" />| ## **Pre-merge author checklist** <!-- Every checklist item must be consciously assessed before marking this PR as "Ready for review". A checked box means you deliberately considered that responsibility, not that you literally performed every action listed. Unchecked boxes are ambiguous: they are not an implicit "N/A" and they are not a silent "skip". See `docs/readme/ready-for-review.md` for the full checklist semantics. --> - [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 - [x] I've included tests if applicable - [x] 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. #### Performance checks (if applicable) - [x] 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](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93) to import wallets with many accounts and tokens - [ ] I've instrumented key operations with Sentry traces for production performance metrics - See [`trace()`](/app/util/trace.ts) for usage and [`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274) for an example For performance guidelines and tooling, see the [Performance Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers). ## **Pre-merge reviewer checklist** <!-- Reviewer checklist items follow the same semantics as the author checklist: an unchecked box is ambiguous, a checked box means the reviewer consciously assessed that responsibility. See `docs/readme/ready-for-review.md`. --> - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] 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] > **Medium Risk** > Touches user-facing Earn confirmation navigation and header/back behavior; withdrawal back analytics are explicitly preserved, but stack presentation changes warrant manual regression on deposit/withdraw flows. > > **Overview** > Earn navigation moves from the legacy JS stack to **native stack**, with shared `transparentModalScreenOptions` / `clearNativeStackNavigatorOptions` and **`headerShown: false`** on stablecoin lending deposit and withdrawal confirmation routes so headers live in the screen. > > **Deposit and withdrawal confirmation** drop `getStakingNavbar` / `navigation.setOptions` and render in-view **`HeaderStandard`** with titles built from the routed token (ticker → symbol → name). Back uses `onBack` and the `navigation.back` accessibility label; tests query the back control via that label. > > On **withdrawal**, `EARN_LENDING_WITHDRAW_CONFIRMATION_BACK_CLICKED` analytics move from the old navbar `backButtonEvent` into **`handleHeaderBackPress`** before `goBack()`. Deposit back only navigates back (no new back analytics in this change). > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit c8a60d9. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )