diff --git a/app/components/dashboard/FundingSummary.jsx b/app/components/dashboard/FundingSummary.jsx index 09b7b86..b354de1 100644 --- a/app/components/dashboard/FundingSummary.jsx +++ b/app/components/dashboard/FundingSummary.jsx @@ -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 ( - - {({ vaultEvents }) => - - - - {title} - - {!!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 ( - - - {name} - - - - {Number(deposits) - Number(withdraws || 0)} - - - Remaining In Pledges - - - {deposits} - - - Funded - - - {withdraws || 0} - - - Withdrawn - - - {pledgesForCommit.length} - - - Pledges that can be vetoed / approved - - - - - ) - })} - - - } - + + + + {title} + + {!!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 ( + + + {name} + + + + {Number(deposits) - Number(withdraws || 0)} + + + Remaining In Pledges + + + {deposits} + + + Funded + + + {withdraws || 0} + + + Withdrawn + + + {pledgesForCommit.length} + + + Pledges that can be vetoed / approved + + + + + ) + })} + + ) } @@ -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))