status-im
/
liquid-funding
mirror of https://github.com/status-im/liquid-funding.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

use vaultEvents in FundingSummary

This commit is contained in:
Barry Gitarts 2019-01-25 15:10:28 -05:00
parent 98c1f80942
commit de6c61ad3f
1 changed files with 62 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
app/components/dashboard/FundingSummary.jsx
View File

@ -8,7 +8,6 @@ import Card from '@material-ui/core/Card'
import CardContent from '@material-ui/core/CardContent'
import Typography from '@material-ui/core/Typography'
import LinearProgress from '@material-ui/core/LinearProgress'
import { FundingContext } from '../../context'
import { getDepositWithdrawTotals, getPledgesWaitingCommit } from '../../selectors/pledging'
import { getTokenAddress } from '../../utils/currencies'
@ -50,71 +49,67 @@ const styles = {
const getNet = (deposits, withdraws) => Number(deposits) - Number(withdraws)
const getValue = (deposits, withdraws) => (getNet(deposits, withdraws) / Number(deposits)) * 100
function SimpleCard(props) {
const { classes, title, transfers, pledges } = props
const { classes, title, transfers, pledges, vaultEvents } = props
return (
<FundingContext.Consumer>
{({ vaultEvents }) =>
<Card className={classes.card}>
<CardContent>
<Typography variant="h5" className={classes.cardTitle}>
{title}
</Typography>
{!!transfers &&
Object.entries(getDepositWithdrawTotals({ transfers, pledges, vaultEvents }))
.map(token => {
const [name, amounts] = token
const { deposits, withdraws } = amounts
const address = getTokenAddress(name)
const pledgesForCommit = getPledgesWaitingCommit({ pledges }).filter(p => p.token == address)
return (
<Card key={name}>
<Typography variant="h5" className={classes.titleText}>
{name}
</Typography>
<CardContent className={classes.fundingSummaries}>
<Typography variant="h3">
{Number(deposits) - Number(withdraws || 0)}
</Typography>
<Typography variant="h6" key={name + 'total'} className={classes.pos} color="textSecondary">
Remaining In Pledges
</Typography>
<Typography variant="h3" >
{deposits}
</Typography>
<Typography variant="h6" key={name + 'withdraw'} className={classes.pos} color="textSecondary">
Funded
</Typography>
<Typography variant="h3">
{withdraws || 0}
</Typography>
<Typography variant="h6" key={name + 'deposit'} className={classes.pos} color="textSecondary">
Withdrawn
</Typography>
<Typography variant="h3">
{pledgesForCommit.length}
</Typography>
<Typography variant="h6" key={name + 'veto/approve'} className={classes.pos} color="textSecondary">
Pledges that can be vetoed / approved
</Typography>
</CardContent>
<LinearProgress
classes={{
colorPrimary: classes.linearColorPrimary,
barColorPrimary: classes.linearBarColorPrimary,
}}
color="primary"
variant="buffer"
value={getValue(deposits, withdraws)}
valueBuffer={100}
/>
</Card>
)
})}
</CardContent>
</Card>
}
</FundingContext.Consumer>
<Card className={classes.card}>
<CardContent>
<Typography variant="h5" className={classes.cardTitle}>
{title}
</Typography>
{!!transfers &&
Object.entries(getDepositWithdrawTotals({ transfers, pledges, vaultEvents }))
.map(token => {
const [name, amounts] = token
const { deposits, withdraws } = amounts
const address = getTokenAddress(name)
const pledgesForCommit = getPledgesWaitingCommit({ pledges }).filter(p => p.token == address)
return (
<Card key={name}>
<Typography variant="h5" className={classes.titleText}>
{name}
</Typography>
<CardContent className={classes.fundingSummaries}>
<Typography variant="h3">
{Number(deposits) - Number(withdraws || 0)}
</Typography>
<Typography variant="h6" key={name + 'total'} className={classes.pos} color="textSecondary">
Remaining In Pledges
</Typography>
<Typography variant="h3" >
{deposits}
</Typography>
<Typography variant="h6" key={name + 'withdraw'} className={classes.pos} color="textSecondary">
Funded
</Typography>
<Typography variant="h3">
{withdraws || 0}
</Typography>
<Typography variant="h6" key={name + 'deposit'} className={classes.pos} color="textSecondary">
Withdrawn
</Typography>
<Typography variant="h3">
{pledgesForCommit.length}
</Typography>
<Typography variant="h6" key={name + 'veto/approve'} className={classes.pos} color="textSecondary">
Pledges that can be vetoed / approved
</Typography>
</CardContent>
<LinearProgress
classes={{
colorPrimary: classes.linearColorPrimary,
barColorPrimary: classes.linearBarColorPrimary,
}}
color="primary"
variant="buffer"
value={getValue(deposits, withdraws)}
valueBuffer={100}
/>
</Card>
)
})}
</CardContent>
</Card>
)
}
@ -122,7 +117,8 @@ SimpleCard.propTypes = {
classes: PropTypes.object.isRequired,
title: PropTypes.string,
pledges: PropTypes.array.isRequired,
transfers: PropTypes.array.isRequired
transfers: PropTypes.array.isRequired,
vaultEvents: PropTypes.array.isRequired
}
const styledCard = withStyles(styles)(SimpleCard)
@ -130,5 +126,6 @@ export default withDatabase(withObservables([], ({ database }) => ({
transfers: database.collections.get('lp_events').query(
Q.where('event', 'Transfer')
).observe(),
vaultEvents : database.collections.get('vault_events').query().observe()
}))(styledCard))