Skip to content

feat: rewards dropdown filter on activity tab #24910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VGR-GIT merged 8 commits into from
Jan 29, 2026
Merged

feat: rewards dropdown filter on activity tab #24910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
550e757
Allow filters by activity type
sophieqgu Jan 19, 2026
ad72e67
Update skeleton
sophieqgu Jan 26, 2026
c45f0e2
pr review
VGR-GIT Jan 27, 2026
fb1d2a5
Update OptionSheet.test.tsx.snap
sophieqgu Jan 27, 2026
cde6cb2
Empty commit
sophieqgu Jan 27, 2026
9ca1373
use activityTypes from contentful for filter values
sophieqgu Jan 27, 2026
29df849
Keep All at top
sophieqgu Jan 27, 2026
049b910
Fix bug
sophieqgu Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/components/UI/Rewards/components/RewardItem/RewardItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ const RewardItem: React.FC<RewardItemProps> = ({
>
{/* Reward Icon */}
<Box
twClassName={`h-12 w-12 rounded-full bg-muted items-center justify-center`}
twClassName={`h-10 w-10 rounded-full bg-muted items-center justify-center`}
testID={REWARDS_VIEW_SELECTORS.TIER_REWARD_ICON}
>
<Icon
Expand Down
4 changes: 2 additions & 2 deletions app/components/UI/Rewards/components/Tabs/ActivityTab/ActivityEventRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export const ActivityEventRow: React.FC<{
}
>
<Box
twClassName="bg-muted rounded-full items-center justify-center size-12"
twClassName="bg-muted rounded-full items-center justify-center size-10"
flexDirection={BoxFlexDirection.Column}
alignItems={BoxAlignItems.Center}
justifyContent={BoxJustifyContent.Center}
Expand Down Expand Up @@ -172,7 +172,7 @@ export const ActivityEventRow: React.FC<{
{event.bonus?.bips && (
<Text
variant={TextVariant.BodySm}
color={TextColor.TextAlternative}
color={TextColor.SuccessDefault}
twClassName="ml-1"
testID={`${REWARDS_VIEW_SELECTORS.ACTIVITY_EVENT_ROW_BONUS}-${testID}`}
>
Expand Down
Loading
Loading