diff --git a/packages/app/components/MobileButtonRowLayout.tsx b/packages/app/components/MobileButtonRowLayout.tsx index e895f1a6c..d63e24f84 100644 --- a/packages/app/components/MobileButtonRowLayout.tsx +++ b/packages/app/components/MobileButtonRowLayout.tsx @@ -171,9 +171,12 @@ export const ActivityRewards = ({ children, ...props }: XStackProps) => { const { direction } = useScrollDirection() const isVisible = distribution !== undefined && shareAmount !== undefined && shareAmount > 0 - const distributionMonth = distribution?.qualification_end.toLocaleString('default', { - month: 'long', - }) + const distributionMonth = distribution?.timezone_adjusted_qualification_end.toLocaleString( + 'default', + { + month: 'long', + } + ) const now = new Date() const isQualificationOver = diff --git a/packages/app/features/account/rewards/activity/__snapshots__/screen.test.tsx.snap b/packages/app/features/account/rewards/activity/__snapshots__/screen.test.tsx.snap index a6270a257..b57f8420e 100644 --- a/packages/app/features/account/rewards/activity/__snapshots__/screen.test.tsx.snap +++ b/packages/app/features/account/rewards/activity/__snapshots__/screen.test.tsx.snap @@ -184,13 +184,14 @@ exports[`ActivityRewardsScreen renders: ActivityRewardsScreen 1`] = ` "marginLeft": 0, "marginRight": 0, "marginTop": 0, + "paddingRight": 7, "textTransform": "none", "userSelect": "auto", } } suppressHighlighting={true} > - 1,721,001,600,000 Rewards + July Rewards - 1,721,001,600,000 1,721,001,600,000 + July 2024 - Estimated 1,721,001,600,000 Rewards + Estimated July - 1,721,001,600,000 1,721,001,600,000 + July 2024 ({ { number: 7, chain_id: 845337, - qualification_end: Date.UTC(2024, 6, 15), + qualification_end: new Date(Date.UTC(2024, 6, 30, 11, 59, 59)), + timezone_adjusted_qualification_end: new Date(Date.UTC(2024, 6, 30, 11, 59, 59)), distribution_shares: [ { amount: 1, diff --git a/packages/app/features/account/rewards/activity/screen.tsx b/packages/app/features/account/rewards/activity/screen.tsx index 50aaea9d2..8f0a462dc 100644 --- a/packages/app/features/account/rewards/activity/screen.tsx +++ b/packages/app/features/account/rewards/activity/screen.tsx @@ -77,9 +77,9 @@ export function ActivityRewardsScreen() { const distributionDates = distributions.map( (d) => - `${d.qualification_end.toLocaleString('default', { + `${d.timezone_adjusted_qualification_end.toLocaleString('default', { month: 'long', - })} ${d.qualification_end.toLocaleString('default', { year: 'numeric' })}` + })} ${d.timezone_adjusted_qualification_end.toLocaleString('default', { year: 'numeric' })}` ) const onValueChange = (value: string) => { @@ -94,7 +94,7 @@ export function ActivityRewardsScreen() {
-

+

{`${distributionDates[selectedDistributionIndex]?.split(' ')[0]} Rewards`}