Skip to content

Commit

Permalink
chore: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ZakMooney committed Jun 7, 2024
2 parents 3be4c1a + 87860eb commit 164920f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/components/staking-pool/StakingRewards.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,12 @@ const StakingRewards = ({
Projected Rewards
</Typography>
<div>
<Typography variant="p">
<Typography variant="p" className="mb-2">
You can earn rewards every 24 hours after your staking period begins.
</Typography>
<Typography variant="p" className="mb-2">
Your reward rates are based on a the number of tokens you have staked.
</Typography>
{stakedSince ? (
<Typography variant="p">
Staked Since:
Expand All @@ -136,7 +139,7 @@ const StakingRewards = ({
<tr>
<th>Asset</th>
<th>Amount</th>
<th>DailyReward</th>
<th>Daily Reward Per Token</th>
</tr>
</thead>
{poolRewardsLoading ? (null) : (
Expand All @@ -155,8 +158,9 @@ const StakingRewards = ({
<td>
{ethers.formatUnits(amount, decimals)}
</td>
<td>
<td className="whitespace-nowrap">
{ethers.formatUnits(dailyReward, decimals)}
<span className="opacity-40"> / {symbol === 'EUROs' ? ('TST') : ('EUROs')}</span>
</td>
</tr>
)}
Expand Down

0 comments on commit 164920f

Please sign in to comment.