Skip to content

Commit

Permalink
fix: alignment issues
Browse files Browse the repository at this point in the history
  • Loading branch information
therealemjy committed Mar 6, 2025
1 parent 89037a7 commit 3e2c2eb
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const ClaimRewardsContent = ({
>
{hasInternalRewards && (
<RewardGroupFrame
className={cn(hasExternalRewards && 'border-b pb-4 mb-4 md:mb-0')}
className={cn(hasExternalRewards && 'border-b pb-6 mb-4 md:mb-0')}
title={t('claimReward.modal.rewards')}
claimComponent={
<Checkbox
Expand All @@ -59,7 +59,7 @@ export const ClaimRewardsContent = ({
/>
}
>
<div data-testid={TEST_IDS.claimRewardBreakdown}>
<div data-testid={TEST_IDS.claimRewardBreakdown} className="space-y-4">
{internalRewardsGroups.map(group => (
<InternalRewardGroup
group={group}
Expand Down Expand Up @@ -90,7 +90,7 @@ export const ClaimRewardsContent = ({
)}
{hasExternalRewards && (
<RewardGroupFrame title={t('claimReward.modal.externalRewards')}>
<div data-testid={TEST_IDS.claimExternalRewardBreakdown}>
<div data-testid={TEST_IDS.claimExternalRewardBreakdown} className="space-y-4">
{externalRewardsGroups.map(group => (
<ExternalRewardGroup
group={group}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ export const RewardGroupContent: React.FC<RewardGroupContentProps> = ({
return Array.from(pendingRewardMapping.values());
}, [group.pendingRewards]);
return (
<div className="border-lightGrey mb-4 last:mb-0">
<div className="my-4">
<div>
<div className="mb-4">
<div className="flex items-center justify-between">
<p className="text-lg">{group.name}</p>

Expand All @@ -42,28 +42,30 @@ export const RewardGroupContent: React.FC<RewardGroupContentProps> = ({
{group.warningMessage}
</div>

{pendingRewards.map(pendingReward => (
<div
className="border-lightGrey mb-4 flex items-center border-b last:border-b-0 justify-between last:mb-0"
key={`reward-group-${group.name}-${pendingReward.rewardToken.address}`}
>
<div className="flex">
<TokenIconWithSymbol token={pendingReward.rewardToken} />
</div>
<div className="space-y-3">
{pendingRewards.map(pendingReward => (
<div
className="flex items-start justify-between"
key={`reward-group-${group.name}-${pendingReward.rewardToken.address}`}
>
<div className="flex">
<TokenIconWithSymbol token={pendingReward.rewardToken} />
</div>

<LayeredValues
className="text-end"
topValue={formatCentsToReadableValue({
value: pendingReward.rewardAmountCents,
})}
bottomValue={convertMantissaToTokens({
value: pendingReward.rewardAmountMantissa,
token: pendingReward.rewardToken,
returnInReadableFormat: true,
})}
/>
</div>
))}
<LayeredValues
className="text-end"
topValue={formatCentsToReadableValue({
value: pendingReward.rewardAmountCents,
})}
bottomValue={convertMantissaToTokens({
value: pendingReward.rewardAmountMantissa,
token: pendingReward.rewardToken,
returnInReadableFormat: true,
})}
/>
</div>
))}
</div>
</div>
);
};

0 comments on commit 3e2c2eb

Please sign in to comment.