chore(runway): cherry-pick fix: musd money hub 7.74.0 release blockers cp-7.74.0#29266
Merged
Merged
Conversation
…s cp-7.74.0 (#29225) <!-- 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** This PR fixes various Money Hub release blockers for the 7.74.0 release. <!-- 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: fixing money hub 7.74.0 release blockers ## **Related issues** Fixes: - [MUSD-688: Money hub's primary "Convert to mUSD" button must redirect to the single convert screen](https://consensyssoftware.atlassian.net/browse/MUSD-688) - [MUSD-689: Money Hub's "Max" and "Custom" buttons aren't disabled when there's a conversion in flight.](https://consensyssoftware.atlassian.net/browse/MUSD-689) - [MUSD-690: Successful conversions are redirected to the home screen when quick convert flag disabled](https://consensyssoftware.atlassian.net/browse/MUSD-690) - [MUSD-686: Skeleton loaders misaligned with content and UX expectations](https://consensyssoftware.atlassian.net/browse/MUSD-686) - [MUSD-692: Money Hub shows two bonus claim buttons when user has bonus but doesn't hold mUSD](https://consensyssoftware.atlassian.net/browse/MUSD-692) ## **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] --> Post-conversion redirect fixes ## **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) - [ ] 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] > **Medium Risk** > Changes navigation behavior after mUSD conversions and updates Money Hub conversion CTAs/state gating, which can affect user flow and back stack behavior. Also refactors/loading-skeleton logic and empty-state actions, with moderate risk of regressions in conditional rendering and analytics-trigger timing. > > **Overview** > Fixes Money Hub mUSD post-conversion routing by updating `useMusdConfirmNavigation` to operate on the *parent* navigator stack (pop vs replace to `Routes.WALLET.CASH_TOKENS_FULL_VIEW`) when the Money Hub flag is enabled, avoiding stale confirmation screens remaining in history. > > Updates Money Hub convert UI to respect conversion-in-progress state: `MoneyConvertStablecoins` now disables row actions when there are unapproved/in-flight conversions and shows per-token pending status via `selectMusdConversionStatuses`. > > Improves Cash full view UX and metrics timing: token-list rendering is gated behind an InteractionManager “ready” signal only when the user has mUSD (showing a new content-area skeleton that mirrors the eventual layout), the primary "Convert to mUSD" CTA now launches the *custom amount* flow (`initiateCustomConversion` with `preferredPaymentToken`), and the empty state can hide the secondary Merkl "Claim bonus" button in Money Hub mode to prevent duplicate claim CTAs. Tests were updated/added accordingly. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit 1bb82ab. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
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. |
metamaskbotv2
Bot
added
the
team-bots
github-actions
Bot
added
the
risk-high
Contributor
🔍 Smart E2E Test Selection⏭️ Smart E2E selection skipped - PR targets a release branch (release/*) All E2E tests pre-selected. |
Matt561
approved these changes
Apr 23, 2026
|
Contributor
|
✅ E2E Fixture Validation — Schema is up to date |
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.
Description
This PR fixes various Money Hub release blockers for the 7.74.0 release.
Changelog
CHANGELOG entry: fixing money hub 7.74.0 release blockers
Related issues
Fixes:
to the single convert
screen
there's a conversion in
flight.
when quick convert flag
disabled
expectations
but doesn't hold
mUSD
Manual testing steps
Screenshots/Recordings
Before
After
Post-conversion redirect fixes
Pre-merge author checklist
Docs and MetaMask Mobile
Coding
Standards.
if applicable
guidelines).
Not required for external contributors.
Performance checks (if applicable)
SRPs
to import wallets with many accounts and tokens
performance metrics
trace()for usage andaddTokenfor an example
For performance guidelines and tooling, see the Performance
Guide.
Pre-merge reviewer checklist
app, test code being changed).
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
Note
Medium Risk
Changes navigation behavior after mUSD conversions and updates Money
Hub conversion CTAs/state gating, which can affect user flow and back
stack behavior. Also refactors/loading-skeleton logic and empty-state
actions, with moderate risk of regressions in conditional rendering and
analytics-trigger timing.
Overview
Fixes Money Hub mUSD post-conversion routing by updating
useMusdConfirmNavigationto operate on the parent navigator stack(pop vs replace to
Routes.WALLET.CASH_TOKENS_FULL_VIEW) when the MoneyHub flag is enabled, avoiding stale confirmation screens remaining in
history.
Updates Money Hub convert UI to respect conversion-in-progress state:
MoneyConvertStablecoinsnow disables row actions when there areunapproved/in-flight conversions and shows per-token pending status via
selectMusdConversionStatuses.Improves Cash full view UX and metrics timing: token-list rendering is
gated behind an InteractionManager “ready” signal only when the user has
mUSD (showing a new content-area skeleton that mirrors the eventual
layout), the primary "Convert to mUSD" CTA now launches the custom
amount flow (
initiateCustomConversionwithpreferredPaymentToken),and the empty state can hide the secondary Merkl "Claim bonus" button in
Money Hub mode to prevent duplicate claim CTAs. Tests were updated/added
accordingly.
Reviewed by Cursor Bugbot for commit
1bb82ab. Bugbot is set up for automated
code reviews on this repo. Configure
here.