diff --git a/apps/next/pages/account/rewards/activity.tsx b/apps/next/pages/account/rewards/activity.tsx index df8d9e3e6..c5b643d84 100644 --- a/apps/next/pages/account/rewards/activity.tsx +++ b/apps/next/pages/account/rewards/activity.tsx @@ -10,7 +10,7 @@ export const Page: NextPageWithLayout = () => { return ( <> - Send | Send Rewards + Send | Activity Rewards @@ -19,20 +19,10 @@ export const Page: NextPageWithLayout = () => { export const getServerSideProps = userProtectedGetSSP() -const subheader = - 'Register at least 1 Sendtag, maintain the minimum balance, avoid selling, and refer others for a bonus multiplier. ' - Page.getLayout = (children) => ( - } + TopNav={} > {children} diff --git a/packages/app/components/TopNav.tsx b/packages/app/components/TopNav.tsx index 442684691..98f0fbcef 100644 --- a/packages/app/components/TopNav.tsx +++ b/packages/app/components/TopNav.tsx @@ -224,7 +224,6 @@ export function TopNav({ fontWeight={'300'} col="$color10" lineHeight={32} - $gtLg={{ ml: isSubRoute ? '$4' : '$0' }} display={selectedCoin ? 'none' : 'flex'} als={'center'} > @@ -239,7 +238,7 @@ export function TopNav({ fontWeight={'300'} col="$color10" lineHeight={32} - $gtLg={{ ml: isSubRoute ? '$4' : '$0' }} + //ml= {isSubRoute ? '$4' : '$0' } display={isSubRoute ? 'flex' : 'none'} als={'center'} > @@ -268,7 +267,7 @@ export function TopNav({ lineHeight={24} py="$3" $gtSm={{ py: '$6' }} - $gtLg={{ pl: '$1', pb: '$6', pt: '$0', ...{ ml: isSubRoute ? '$4' : '$1' } }} + $gtLg={{ pl: '$1', pb: '$6', pt: '$0' }} col="$color10" > {subheader} 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 a93d46336..55363ab49 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 @@ -9,7 +9,6 @@ exports[`ActivityRewardsScreen renders: ActivityRewardsScreen 1`] = ` "flexDirection": "column", "gap": 39, "paddingBottom": 88, - "paddingTop": 32, } } > @@ -110,7 +109,6 @@ exports[`ActivityRewardsScreen renders: ActivityRewardsScreen 1`] = ` style={ { "flexDirection": "column", - "maxWidth": 463, "paddingBottom": 18, "paddingLeft": 18, "paddingRight": 18, @@ -156,7 +154,9 @@ exports[`ActivityRewardsScreen renders: ActivityRewardsScreen 1`] = ` } suppressHighlighting={true} > - Register at least 1 Sendtag, maintain the minimum balance, avoid selling, and refer others for a bonus multiplier. + Register at least 1 Sendtag, maintain the minimum balance, +
+ avoid selling, and refer others for a bonus multiplier. diff --git a/packages/app/features/account/rewards/activity/screen.tsx b/packages/app/features/account/rewards/activity/screen.tsx index ca65d94c8..96cae1158 100644 --- a/packages/app/features/account/rewards/activity/screen.tsx +++ b/packages/app/features/account/rewards/activity/screen.tsx @@ -56,7 +56,7 @@ export function ActivityRewardsScreen() { if (isLoading) return ( - +
@@ -65,7 +65,7 @@ export function ActivityRewardsScreen() { ) if (!distributions || !distributions[selectedDistributionIndex]) return ( - +
@@ -91,7 +91,7 @@ export function ActivityRewardsScreen() { } return ( - +

@@ -255,7 +255,7 @@ const Header = () => ( colors={['$darkest', 'transparent', '$darkest']} /> - +

Unlock
Extra Rewards @@ -267,8 +267,8 @@ const Header = () => ( size: '$5', }} > - Register at least 1 Sendtag, maintain the minimum balance, avoid selling, and refer others - for a bonus multiplier. + Register at least 1 Sendtag, maintain the minimum balance, +
avoid selling, and refer others for a bonus multiplier. @@ -282,7 +282,7 @@ const DistributionRequirementsCard = ({ isLoading: isLoadingSnapshotBalance, error: snapshotBalanceError, } = useReadSendTokenBalanceOf({ - chainId: distribution.chain_id ?? 8453, + chainId: (distribution.chain_id ?? 8453) as keyof typeof sendTokenAddress, args: [distribution.distribution_shares.at(0)?.address ?? zeroAddress], blockNumber: distribution.snapshot_block_num ? BigInt(distribution.snapshot_block_num) @@ -395,7 +395,7 @@ const SendPerksCards = ({ distribution }: { distribution: UseDistributionsResult

{title}

- + + {verificationValues?.[verificationType]?.fixed_value.toLocaleString() ?? 0} SEND{' '} {details ?? ''} diff --git a/packages/app/features/account/rewards/screen.tsx b/packages/app/features/account/rewards/screen.tsx index 74f88da43..d06ed5f63 100644 --- a/packages/app/features/account/rewards/screen.tsx +++ b/packages/app/features/account/rewards/screen.tsx @@ -28,11 +28,17 @@ export function RewardsScreen() { }) return ( - + -

- Claim Your Network Benefits +

+ Invest Time, EARN Send

Participate in the Send Ecosystem and earn Send Tokens. Your Network! Your Rewards! @@ -80,7 +86,14 @@ const Section = ({ claimStatus?: 'Claimable' | 'Claimed' | 'Upcoming Reward' }) => { return ( - + - {title} + + {title} + - + {isLoading ? '' : claimStatus}