Skip to content
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

feat: APY evolution - add sample youtube link, clean up lint issues #2346

Merged
merged 1 commit into from
Sep 8, 2022
Merged

feat: APY evolution - add sample youtube link, clean up lint issues #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/components-v2/VaultApyInformation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ const VaultApyInformation = ({ open, onClose, boost, vault, projectedBoost }: Pr
}, []);

const yieldSourcesApyList: YieldValueSource[] = vault.sourcesApy
.reduce((list: any[], source) => {
.reduce((list: YieldValueSource[], source) => {
const yieldVault = getYieldBearingVaultBySourceName(source.name);
if (yieldVault !== undefined) {
list.push({ ...source, yieldVault });
Expand Down Expand Up @@ -301,10 +301,10 @@ const VaultApyInformation = ({ open, onClose, boost, vault, projectedBoost }: Pr
<Grid item>Rewards earned by our strategies on your vault deposits</Grid>
</Grid>
{yieldSourcesApyList.map((yieldSource) => (
<>
<Box key={`yieldSourcesApyList-${yieldSource.name}`}>
mrbasado marked this conversation as resolved.
Show resolved Hide resolved
<Divider className={classes.totalVaultRewardsDivider} />
<VaultApyBreakdownItem vault={vault} source={yieldSource} />
</>
</Box>
))}
</Box>

Expand All @@ -330,7 +330,7 @@ const VaultApyInformation = ({ open, onClose, boost, vault, projectedBoost }: Pr
<Grid item>These rewards continue earning rewards of their own, no claiming required </Grid>
</Grid>
{yieldBearingRewardsList.map((yieldSource) => (
<>
<Box key={`yieldBearingRewardsList-${yieldSource.name}`}>
<Divider className={classes.totalVaultRewardsDivider} />
<Grid container className={classes.totalVaultRewardsRow}>
<Grid item xs={9}>
Expand All @@ -357,7 +357,7 @@ const VaultApyInformation = ({ open, onClose, boost, vault, projectedBoost }: Pr
</Typography>
</Grid>
</Grid>
</>
</Box>
))}
</Box>
)}
Expand Down
24 changes: 20 additions & 4 deletions src/components-v2/YieldBearingVaults/YieldBearingRewards.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const useStyles = makeStyles((theme: Theme) => ({
top: theme.spacing(1),
},
video: {
display: 'flex',
background: '#CCCCCC',
width: '100%',
height: 320,
Expand All @@ -43,6 +44,12 @@ const useStyles = makeStyles((theme: Theme) => ({
margin: 0,
},
},
youtube: {
flexGrow: 1,
border: 'none',
margin: 0,
padding: 0,
},
}));

interface YieldBearingRewardsTypes {
Expand All @@ -62,15 +69,24 @@ const YieldBearingRewards = observer(({ open, onModalClose }: YieldBearingReward
aria-describedby="alert-dialog-description"
>
<DialogTitle id="alert-dialog-title" className={classes.title}>
<Typography variant="h6" color="primary" className={classes.titleText}>
<img src="assets/icons/yield-bearing-rewards.svg" alt="Yield-Bearing Rewards" /> Yield-Bearing Rewards
</Typography>
<Box className={classes.titleText}>
<img src="assets/icons/yield-bearing-rewards.svg" alt="Yield-Bearing Rewards" />
mrbasado marked this conversation as resolved.
Show resolved Hide resolved
<Typography variant="h6" color="primary">
Yield-Bearing Rewards
</Typography>
</Box>
<IconButton aria-label="close" className={classes.closeButton} onClick={onModalClose}>
<CloseIcon />
</IconButton>
</DialogTitle>
<DialogContent id="alert-dialog-description" className={classes.root}>
<Box className={classes.video}></Box>
{/* <Box className={classes.video}>
mrbasado marked this conversation as resolved.
Show resolved Hide resolved
<iframe
id="ytplayer"
className={classes.youtube}
src="https://www.youtube.com/embed/M7lc1UVf-VE?autoplay=1&origin=http://example.com"
></iframe>
</Box> */}
<Typography gutterBottom className={classes.contentText}>
Yield-Bearing Rewards automate and optimize the complex series of ongoing transactions required to make the
most of DeFi ecosystems like Aura and Convex.
Expand Down
Loading