Skip to content

Commit

Permalink
Merge pull request antonnell#21 from Yunoek/master
Browse files Browse the repository at this point in the history 
New gauges & fixes
  • Loading branch information
@antonnell
antonnell authored May 31, 2022
2 parents 3ca237c + 280256d commit 563a876
Show file tree
Hide file tree
Showing 40 changed files with 623 additions and 198 deletions.
10 changes: 5 additions & 5 deletions components/ffAssetOverview/ffAssetOverview.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ import classes from './ffAssetOverview.module.css';
function BalanceIcon(props) {
const { color, className } = props;
return (
<SvgIcon viewBox="0 0 48 48" stroke-width="1" className={className}>
<g stroke-width="2" transform="translate(0, 0)"><path data-color="color-2" fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="square" stroke-miterlimit="10" d="M28,46v-8 c0-2.2-1.8-4-4-4l0,0c-2.2,0-4,1.8-4,4v8" stroke-linejoin="miter"></path> <line fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="square" stroke-miterlimit="10" x1="2" y1="32" x2="2" y2="26" stroke-linejoin="miter"></line> <line fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="square" stroke-miterlimit="10" x1="46" y1="32" x2="46" y2="26" stroke-linejoin="miter"></line> <polyline data-cap="butt" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" points="10.8,32 2,32 2,46 8,46 " stroke-linejoin="miter" stroke-linecap="butt"></polyline> <polyline data-cap="butt" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" points="37.2,32 46,32 46,46 40,46 " stroke-linejoin="miter" stroke-linecap="butt"></polyline> <polygon fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="square" stroke-miterlimit="10" points="34,16 14,16 8,46 40,46 " stroke-linejoin="miter"></polygon> <polyline fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="square" stroke-miterlimit="10" points="40,4 40,16 8,16 8,4 " stroke-linejoin="miter"></polyline> <line fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="square" stroke-miterlimit="10" x1="16" y1="4" x2="16" y2="8" stroke-linejoin="miter"></line> <line fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="square" stroke-miterlimit="10" x1="24" y1="8" x2="24" y2="4" stroke-linejoin="miter"></line> <line fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="square" stroke-miterlimit="10" x1="32" y1="4" x2="32" y2="8" stroke-linejoin="miter"></line> <line fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="square" stroke-miterlimit="10" x1="8" y1="8" x2="40" y2="8" stroke-linejoin="miter"></line></g>
<SvgIcon viewBox="0 0 48 48" strokeWidth="1" className={className}>
<g strokeWidth="2" transform="translate(0, 0)"><path data-color="color-2" fill="none" stroke="#ffffff" strokeWidth="2" strokeLinecap="square" strokeMiterlimit="10" d="M28,46v-8 c0-2.2-1.8-4-4-4l0,0c-2.2,0-4,1.8-4,4v8" strokeLinejoin="miter"></path> <line fill="none" stroke="#ffffff" strokeWidth="2" strokeLinecap="square" strokeMiterlimit="10" x1="2" y1="32" x2="2" y2="26" strokeLinejoin="miter"></line> <line fill="none" stroke="#ffffff" strokeWidth="2" strokeLinecap="square" strokeMiterlimit="10" x1="46" y1="32" x2="46" y2="26" strokeLinejoin="miter"></line> <polyline data-cap="butt" fill="none" stroke="#ffffff" strokeWidth="2" strokeMiterlimit="10" points="10.8,32 2,32 2,46 8,46 " strokeLinejoin="miter" strokeLinecap="butt"></polyline> <polyline data-cap="butt" fill="none" stroke="#ffffff" strokeWidth="2" strokeMiterlimit="10" points="37.2,32 46,32 46,46 40,46 " strokeLinejoin="miter" strokeLinecap="butt"></polyline> <polygon fill="none" stroke="#ffffff" strokeWidth="2" strokeLinecap="square" strokeMiterlimit="10" points="34,16 14,16 8,46 40,46 " strokeLinejoin="miter"></polygon> <polyline fill="none" stroke="#ffffff" strokeWidth="2" strokeLinecap="square" strokeMiterlimit="10" points="40,4 40,16 8,16 8,4 " strokeLinejoin="miter"></polyline> <line fill="none" stroke="#ffffff" strokeWidth="2" strokeLinecap="square" strokeMiterlimit="10" x1="16" y1="4" x2="16" y2="8" strokeLinejoin="miter"></line> <line fill="none" stroke="#ffffff" strokeWidth="2" strokeLinecap="square" strokeMiterlimit="10" x1="24" y1="8" x2="24" y2="4" strokeLinejoin="miter"></line> <line fill="none" stroke="#ffffff" strokeWidth="2" strokeLinecap="square" strokeMiterlimit="10" x1="32" y1="4" x2="32" y2="8" strokeLinejoin="miter"></line> <line fill="none" stroke="#ffffff" strokeWidth="2" strokeLinecap="square" strokeMiterlimit="10" x1="8" y1="8" x2="40" y2="8" strokeLinejoin="miter"></line></g>
</SvgIcon>
);
}

function StakedIcon(props) {
const { color, className } = props;
return (
<SvgIcon viewBox="0 0 48 48" stroke-width="2" className={className}>
<g stroke-width="2" transform="translate(0, 0)"><line data-cap="butt" x1="23" y1="25" x2="45" y2="3" fill="none" stroke="#ffffff" stroke-miterlimit="10" stroke-width="2" stroke-linecap="butt" stroke-linejoin="miter"></line> <line data-color="color-2" x1="5" y1="4" x2="17" y2="16" fill="none" stroke="#ffffff" stroke-linecap="square" stroke-miterlimit="10" stroke-width="2" stroke-linejoin="miter"></line> <line data-color="color-2" x1="5" y1="16" x2="17" y2="4" fill="none" stroke="#ffffff" stroke-linecap="square" stroke-miterlimit="10" stroke-width="2" stroke-linejoin="miter"></line> <line data-color="color-2" x1="32" y1="31" x2="44" y2="43" fill="none" stroke="#ffffff" stroke-linecap="square" stroke-miterlimit="10" stroke-width="2" stroke-linejoin="miter"></line> <line data-color="color-2" x1="32" y1="43" x2="44" y2="31" fill="none" stroke="#ffffff" stroke-linecap="square" stroke-miterlimit="10" stroke-width="2" stroke-linejoin="miter"></line> <circle cx="11" cy="37" r="8" fill="none" stroke="#ffffff" stroke-linecap="square" stroke-miterlimit="10" stroke-width="2" stroke-linejoin="miter"></circle> <polyline points="31 3 45 3 45 17" fill="none" stroke="#ffffff" stroke-linecap="square" stroke-miterlimit="10" stroke-width="2" stroke-linejoin="miter"></polyline></g>
<SvgIcon viewBox="0 0 48 48" strokeWidth="2" className={className}>
<g strokeWidth="2" transform="translate(0, 0)"><line data-cap="butt" x1="23" y1="25" x2="45" y2="3" fill="none" stroke="#ffffff" strokeMiterlimit="10" strokeWidth="2" strokeLinecap="butt" strokeLinejoin="miter"></line> <line data-color="color-2" x1="5" y1="4" x2="17" y2="16" fill="none" stroke="#ffffff" strokeLinecap="square" strokeMiterlimit="10" strokeWidth="2" strokeLinejoin="miter"></line> <line data-color="color-2" x1="5" y1="16" x2="17" y2="4" fill="none" stroke="#ffffff" strokeLinecap="square" strokeMiterlimit="10" strokeWidth="2" strokeLinejoin="miter"></line> <line data-color="color-2" x1="32" y1="31" x2="44" y2="43" fill="none" stroke="#ffffff" strokeLinecap="square" strokeMiterlimit="10" strokeWidth="2" strokeLinejoin="miter"></line> <line data-color="color-2" x1="32" y1="43" x2="44" y2="31" fill="none" stroke="#ffffff" strokeLinecap="square" strokeMiterlimit="10" strokeWidth="2" strokeLinejoin="miter"></line> <circle cx="11" cy="37" r="8" fill="none" stroke="#ffffff" strokeLinecap="square" strokeMiterlimit="10" strokeWidth="2" strokeLinejoin="miter"></circle> <polyline points="31 3 45 3 45 17" fill="none" stroke="#ffffff" strokeLinecap="square" strokeMiterlimit="10" strokeWidth="2" strokeLinejoin="miter"></polyline></g>
</SvgIcon>
);
}
Expand All @@ -40,7 +40,7 @@ export default function ffAssetOverview({ asset }) {
<Grid container spacing={3} className={ classes.assetTitleContainer }>
<Grid item lg={4} md={4} sm={12} xs={12}>
<div className={ classes.assetTitle }>
<img className={ classes.assetIcon } src={ asset ? `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${asset.address}/logo-128.png` : '/unknown-logo.png'} alt='' height='60px' width='60px' />
<img className={ classes.assetIcon } src={ asset ? `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${asset.logoAddress || asset.address}/logo-128.png` : '/unknown-logo.png'} alt='' height='60px' width='60px' />
<div>
<Typography className={ classes.assetName }>{ asset ? asset.name : '' }</Typography>
<Typography className={ classes.assetPrice }>${ formatCurrency(asset ? asset.price : 0) }</Typography>
Expand Down
2 changes: 1 addition & 1 deletion components/ffAssets/ffAssetsTable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ export default function EnhancedTable({ assets }) {
<div className={classes.inline}>
<img
className={classes.imgLogo}
src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.address}/logo-128.png`}
src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.logoAddress || row.address}/logo-128.png`}
width='35'
height='35'
alt=''
Expand Down
4 changes: 2 additions & 2 deletions components/ffClaimAll/ffClaimAll.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { FIXED_FOREX_UPDATED, FIXED_FOREX_CLAIM_ALL, FIXED_FOREX_ALL_CLAIMED, ER
function NoRewardsIcon(props) {
const { color, className } = props;
return (
<SvgIcon viewBox="0 0 64 64" stroke-width="1" className={className}>
<g stroke-width="2" transform="translate(0, 0)"><path d="M15.029,48.971A24,24,0,0,1,48.971,15.029" fill="none" stroke="#686c7a" stroke-miterlimit="10" stroke-width="2" data-cap="butt" stroke-linecap="butt" stroke-linejoin="miter"></path><path d="M52.789,20A24.006,24.006,0,0,1,20,52.789" fill="none" stroke="#686c7a" stroke-linecap="square" stroke-miterlimit="10" stroke-width="2" stroke-linejoin="miter"></path><line x1="60" y1="4" x2="4" y2="60" fill="none" stroke="#686c7a" stroke-linecap="square" stroke-miterlimit="10" stroke-width="2" data-color="color-2" stroke-linejoin="miter"></line></g>
<SvgIcon viewBox="0 0 64 64" strokeWidth="1" className={className}>
<g strokeWidth="2" transform="translate(0, 0)"><path d="M15.029,48.971A24,24,0,0,1,48.971,15.029" fill="none" stroke="#686c7a" strokeMiterlimit="10" strokeWidth="2" data-cap="butt" strokeLinecap="butt" strokeLinejoin="miter"></path><path d="M52.789,20A24.006,24.006,0,0,1,20,52.789" fill="none" stroke="#686c7a" strokeLinecap="square" strokeMiterlimit="10" strokeWidth="2" strokeLinejoin="miter"></path><line x1="60" y1="4" x2="4" y2="60" fill="none" stroke="#686c7a" strokeLinecap="square" strokeMiterlimit="10" strokeWidth="2" data-color="color-2" strokeLinejoin="miter"></line></g>
</SvgIcon>
);
}
Expand Down
2 changes: 1 addition & 1 deletion components/ffClaimAll/ffClaimAllTable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ export default function EnhancedTable({ claimable, crv, ibEUR, rKP3R }) {
{
row?.type === 'Fixed Forex' && <img className={ classes.imgLogo } src={`/images/ff-icon.svg`} width='35' height='35' alt='' />}
{
row?.type !== 'Fixed Forex' && <img className={ classes.imgLogo } src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.address}/logo-128.png`} width='35' height='35' alt='' />
row?.type !== 'Fixed Forex' && <img className={ classes.imgLogo } src={`https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${row.logoAddress || row.address}/logo-128.png`} width='35' height='35' alt='' />
}
<div>
<Typography variant="h2" className={classes.textSpaced}>
Expand Down
Loading

0 comments on commit 563a876

Please sign in to comment.