Skip to content

Commit 9d97e2f

Browse files
sophieqguVGR-GIT
andauthored
feat: rewards dropdown filter on activity tab (#24910)
<!-- 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** Support filter by event types in the Activity Tab <!-- 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: Support filter by event types in the Activity Tab ## **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] --> <img width="1179" height="2556" alt="Simulator Screenshot - E2E Test - 2026-01-20 at 17 15 44" src="https://github.com/user-attachments/assets/23996550-b539-4cbb-8d82-134bf6afa4d3" /> <img width="1179" height="2556" alt="Simulator Screenshot - E2E Test - 2026-01-20 at 17 15 39" src="https://github.com/user-attachments/assets/b8197292-9321-4c31-985c-8be6b574ae63" /> ## **Pre-merge author checklist** - [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. ## **Pre-merge reviewer checklist** - [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** > Medium risk because it changes the points-events fetching pipeline (new `type` query param, caching key changes, and request-cancellation logic), which could impact activity feed freshness/pagination if edge cases were missed. > > **Overview** > Adds an **Activity Tab dropdown filter** that lets users fetch points activity by earn type, driven by season-provided `activityTypes` and new i18n strings. > > Extends `usePointsEvents` and the rewards backend to support **type-filtered points events**: the hook now accepts `type` and `enabled`, cancels in-flight first-page/pagination requests when dependencies change, and the RewardsController/DataService include `type` in API requests and cache keys. > > Updates `SelectOptionSheet`/`OptionsSheet` UI (design-system icon, sorted options with `all` pinned, new close header) and tweaks a few Rewards visuals (smaller icons, bonus text color), with substantial test/snapshot updates to cover filtering and new fetch behavior. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 049b910. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: Rik Van Gulck <vangulckrik@gmail.com>
1 parent 129c314 commit 9d97e2f

19 files changed

Lines changed: 2767 additions & 923 deletions

File tree

app/components/UI/Rewards/components/RewardItem/RewardItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ const RewardItem: React.FC<RewardItemProps> = ({
377377
>
378378
{/* Reward Icon */}
379379
<Box
380-
twClassName={`h-12 w-12 rounded-full bg-muted items-center justify-center`}
380+
twClassName={`h-10 w-10 rounded-full bg-muted items-center justify-center`}
381381
testID={REWARDS_VIEW_SELECTORS.TIER_REWARD_ICON}
382382
>
383383
<Icon

app/components/UI/Rewards/components/Tabs/ActivityTab/ActivityEventRow.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export const ActivityEventRow: React.FC<{
131131
}
132132
>
133133
<Box
134-
twClassName="bg-muted rounded-full items-center justify-center size-12"
134+
twClassName="bg-muted rounded-full items-center justify-center size-10"
135135
flexDirection={BoxFlexDirection.Column}
136136
alignItems={BoxAlignItems.Center}
137137
justifyContent={BoxJustifyContent.Center}
@@ -172,7 +172,7 @@ export const ActivityEventRow: React.FC<{
172172
{event.bonus?.bips && (
173173
<Text
174174
variant={TextVariant.BodySm}
175-
color={TextColor.TextAlternative}
175+
color={TextColor.SuccessDefault}
176176
twClassName="ml-1"
177177
testID={`${REWARDS_VIEW_SELECTORS.ACTIVITY_EVENT_ROW_BONUS}-${testID}`}
178178
>

0 commit comments

Comments
 (0)