Skip to content
This repository has been archived by the owner on Mar 11, 2022. It is now read-only.

Commit

Permalink
Merge pull request #197 from omgnetwork/inomurko/show-more-decimals
Browse files Browse the repository at this point in the history
show more decimals on Earned apy
  • Loading branch information
CAPtheorem authored Dec 1, 2021
2 parents bb7c018 + 2aa54e4 commit 7232aac
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 58 deletions.
29 changes: 0 additions & 29 deletions .github/workflows/repo-sync.yml

This file was deleted.

58 changes: 29 additions & 29 deletions packages/boba/gateway/src/components/listFarm/listFarm.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class ListFarm extends React.Component {
userReward,
L1orL2Pool
))

if (getRewardTX) {
this.props.dispatch(openAlert(`${logAmount(userReward, poolInfo.decimals, 2)} ${poolInfo.symbol} was added to your account`))
this.props.dispatch(getFarmInfo())
Expand Down Expand Up @@ -207,29 +207,29 @@ class ListFarm extends React.Component {
<CircularProgress color="secondary" />
</Box>
) : (
<S.GridContainer container
spacing={2}
direction="row"
justifyContent="flex-start"
<S.GridContainer container
spacing={2}
direction="row"
justifyContent="flex-start"
alignItems="center"
>

{isMobile &&
<S.GridItemTag item
xs={12}
md={2}
{isMobile &&
<S.GridItemTag item
xs={12}
md={2}
>
<Typography variant="overline" style={{lineHeight: '1em', fontSize: '1.2em'}}>{symbol}</Typography>
</S.GridItemTag>
}

{!isMobile &&
<S.GridItemTag item
xs={4}
md={2}
{!isMobile &&
<S.GridItemTag item
xs={4}
md={2}
style={{
justifyContent: 'flex-start',
alignItems:'center',
justifyContent: 'flex-start',
alignItems:'center',
}}
>
<div style={{display: 'flex', flexDirection: 'row', justifyContent: 'center', alignItems:'center'}}>
Expand All @@ -242,8 +242,8 @@ class ListFarm extends React.Component {
</S.GridItemTag>
}

<S.GridItemTag item
xs={4}
<S.GridItemTag item
xs={4}
md={2}
>
{isMobile ? (
Expand All @@ -256,8 +256,8 @@ class ListFarm extends React.Component {
</Typography>
</S.GridItemTag>

<S.GridItemTag item
xs={4}
<S.GridItemTag item
xs={4}
md={2}
>
{isMobile ? (
Expand All @@ -270,8 +270,8 @@ class ListFarm extends React.Component {
</Typography>
</S.GridItemTag>

<S.GridItemTag item
xs={4}
<S.GridItemTag item
xs={4}
md={1}
>
{isMobile ? (
Expand All @@ -284,8 +284,8 @@ class ListFarm extends React.Component {
</Typography>
</S.GridItemTag>

<S.GridItemTag item
xs={4}
<S.GridItemTag item
xs={4}
md={1}
>
{isMobile ? (
Expand All @@ -298,20 +298,20 @@ class ListFarm extends React.Component {
</Typography>
</S.GridItemTag>

<S.GridItemTag item
xs={4}
<S.GridItemTag item
xs={4}
md={1}
>
{isMobile ? (
<Typography variant="overline" sx={{opacity: 0.7, paddingRight: '5px'}}>Earned</Typography>
) : (null)}
<Typography variant="body1">
{userReward ? `${logAmount(userReward, decimals, 2)}` : `0`}
{userReward ? `${logAmount(userReward, decimals, 5)}` : `0`}
</Typography>
</S.GridItemTag>

<S.GridItemTag item
xs={3}
<S.GridItemTag item
xs={3}
md={1}
>
<Box
Expand All @@ -334,7 +334,7 @@ class ListFarm extends React.Component {
<S.DropdownContent>
<S.DropdownWrapper>
<Typography sx={{flex: 1}} variant="body2" component="div">{`${symbol}`} Earned</Typography>
<Typography sx={{flex: 1}} variant="body2" component="div" color="secondary">{logAmount(userReward, decimals, 2)}</Typography>
<Typography sx={{flex: 1}} variant="body2" component="div" color="secondary">{logAmount(userReward, decimals, 5)}</Typography>
<Button
variant="contained"
fullWidth
Expand Down

0 comments on commit 7232aac

Please sign in to comment.