Cherry-picking commits from main to release/8.0.0 for PR #32004#32097
Open
runway-github[bot] wants to merge 1 commit into
Open
Cherry-picking commits from main to release/8.0.0 for PR #32004#32097runway-github[bot] wants to merge 1 commit into
runway-github[bot] wants to merge 1 commit into
Conversation
…0.0 (#32004) <!-- 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. --> <!-- mms-check directive vocabulary — read by .github/scripts/shared/pr-template-checks.ts at module load to build the validation plan. Directives are invisible in rendered markdown and must NOT be removed or edited without updating the validator registry. type=text Section must contain non-placeholder prose. type=changelog Section must have a valid CHANGELOG entry: line. type=issue-link Section must have a Fixes:/Closes:/Refs: line with a value. type=manual-testing Section must have real testing steps or an explicit N/A. type=screenshot Section must have evidence (image/URL) or an explicit N/A. type=checklist Section must have all checkboxes consciously checked. required=true|false Whether a missing/invalid section runs the validator at all. blocking=true|false Whether a failure of this check fails the CI workflow. Default: false — failures are shown as warnings in the sticky comment but do not block the PR. Sections without a directive are checked for structural presence only. --> ## **Description** This PR updates the money activity list to show musdback transactions. It assumes a particular type for the transactions, which has not been confirmed by the accounts team yet. In the interest of speed, we plan to merge this and then make a cherry pick PR if the type needs to be changed. <!-- mms-check: type=text required=true --> <!-- 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** <!-- mms-check: type=changelog required=true blocking=true --> <!-- 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: show cashback transactions in money activity ## **Related issues** <!-- mms-check: type=issue-link required=true --> Fixes: musd-1021 ## **Manual testing steps** <!-- mms-check: type=manual-testing required=true --> ```gherkin Feature: money activity Scenario: user has cashback transactions that land in their money account Given user has cashback transactions that land in their money account When user looks at the money activity Then they see the transactions ``` ## **Screenshots/Recordings** <!-- mms-check: type=screenshot required=true --> <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** n/a <!-- [screenshots/recordings] --> ### **After** <img width="404" height="383" alt="Screenshot 2026-06-19 at 11 04 54" src="https://github.com/user-attachments/assets/e8009365-4a42-4fc1-9f6f-a19ff64bc764" /> <img width="419" height="858" alt="Screenshot 2026-06-19 at 11 05 04" src="https://github.com/user-attachments/assets/12e5b89d-0884-4297-99bd-3307236f2804" /> <img width="418" height="853" alt="Screenshot 2026-06-19 at 11 05 28" src="https://github.com/user-attachments/assets/e027171f-cf8b-4f34-ab23-bc6c3d8d404f" /> <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** <!-- mms-check: type=checklist required=true --> <!-- 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 - [x] 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 - [x] 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** > Touches money activity merging, API transaction-type assumptions (`METAMASK_CARD_CASHBACK`), and navigation for activity details; wrong parsing or bucketing could mislabel deposits vs transfers, though changes are well tested. > > **Overview** > **Money activity** now treats Accounts API data as **card spends and cashback (mUSD back)** instead of card-only rows. Parsing accepts `METAMASK_CARD_CASHBACK`, types use `AccountsApiActivity` with `kind: 'card' | 'cashback'`, and list rows go through **`AccountsApiActivityItem`** with shared display helpers. > > **Filtering and merging** move into **`useMoneyActivityItems`**: home and full activity views share the same buckets (cashback in **Deposits**, card spends in **Transfers**), mock QA data includes a sample cashback row, and merge logic dedupes by hash with stable sort tie-breaks. > > **Details UX** replaces the card bottom sheet and confirmations **`CardTransactionDetails`** with **`MoneyApiActivityDetailsView`** on the existing card-details route (`activity` param). Copy branches for spend vs earned amounts and counterparty rows; the modal sheet route is removed. > > **Tests and copy** follow the rename (`useMoneyAccountApiActivity`, `parseAccountsApiActivity`) and add coverage for cashback filtering and the new details screen. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit 6e5b192. 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. |
mm-token-exchange-service
Bot
added
the
team-bots
Contributor
🔍 Smart E2E Test Selection⏭️ Smart E2E selection skipped - PR targets a release or stable branch (release/* or stable) All E2E tests pre-selected. |
|
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 updates the money activity list to show musdback transactions.
It assumes a particular type for the transactions, which has not been
confirmed by the accounts team yet. In the interest of speed, we plan to
merge this and then make a cherry pick PR if the type needs to be
changed.
Changelog
CHANGELOG entry: show cashback transactions in money activity
Related issues
Fixes: musd-1021
Manual testing steps
Screenshots/Recordings
Before
n/a
After
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
Touches money activity merging, API transaction-type assumptions
(
METAMASK_CARD_CASHBACK), and navigation for activity details; wrongparsing or bucketing could mislabel deposits vs transfers, though
changes are well tested.
Overview
Money activity now treats Accounts API data as card spends and
cashback (mUSD back) instead of card-only rows. Parsing accepts
METAMASK_CARD_CASHBACK, types useAccountsApiActivitywithkind: 'card' | 'cashback', and list rows go throughAccountsApiActivityItemwith shared display helpers.Filtering and merging move into
useMoneyActivityItems: homeand full activity views share the same buckets (cashback in
Deposits, card spends in Transfers), mock QA data includes a
sample cashback row, and merge logic dedupes by hash with stable sort
tie-breaks.
Details UX replaces the card bottom sheet and confirmations
CardTransactionDetailswithMoneyApiActivityDetailsViewonthe existing card-details route (
activityparam). Copy branches forspend vs earned amounts and counterparty rows; the modal sheet route is
removed.
Tests and copy follow the rename (
useMoneyAccountApiActivity,parseAccountsApiActivity) and add coverage for cashback filtering andthe new details screen.
Reviewed by Cursor Bugbot for commit
6e5b192. Bugbot is set up for automated
code reviews on this repo. Configure
here.