use token specific formatter for backing

This commit is contained in:
Barry Gitarts 2019-06-18 15:31:21 -04:00
parent 2c39388be8
commit 1380f88c71
1 changed files with 7 additions and 5 deletions

View File

@ -7,8 +7,8 @@ import { withDatabase } from '@nozbe/watermelondb/DatabaseProvider'
import { withStyles } from '@material-ui/core/styles' import { withStyles } from '@material-ui/core/styles'
import { useProjectData, useProfileData } from './hooks' import { useProjectData, useProfileData } from './hooks'
import {TextField, Button, MenuItem, Divider, Typography, Link} from '@material-ui/core' import {TextField, Button, MenuItem, Divider, Typography, Link} from '@material-ui/core'
import { toEther, toWei } from '../../utils/conversions' import { toEther } from '../../utils/conversions'
import { getTokenLabel } from '../../utils/currencies' import { getTokenLabel, getTokenByAddress } from '../../utils/currencies'
const { transfer } = LiquidPledging.methods const { transfer } = LiquidPledging.methods
@ -57,7 +57,8 @@ const SubmissionSection = ({ classes, profiles, delegatePledges, projectId, open
const { amount, delegateProfile, delegatePledge } = values const { amount, delegateProfile, delegatePledge } = values
const dPledge = delegatePledges.find(d => d.idPledge === delegatePledge) const dPledge = delegatePledges.find(d => d.idPledge === delegatePledge)
const pledge = await dPledge.pledge.fetch() const pledge = await dPledge.pledge.fetch()
const args = [delegateProfile.idProfile, delegatePledge, toWei(amount), projectId] const { chainReadibleFn } = getTokenByAddress(pledge.token)
const args = [delegateProfile.idProfile, delegatePledge, chainReadibleFn(amount), projectId]
console.log({values, args, pledge, delegatePledge}) console.log({values, args, pledge, delegatePledge})
const toSend = transfer(...args) const toSend = transfer(...args)
const estimatedGas = await toSend.estimateGas() const estimatedGas = await toSend.estimateGas()
@ -128,9 +129,10 @@ const SubmissionSection = ({ classes, profiles, delegatePledges, projectId, open
const numPledges = filteredPledges.length const numPledges = filteredPledges.length
const amount = filteredPledges.reduce((cv,pv) => cv + Number(pv.pledgeData.amount) ,0) const amount = filteredPledges.reduce((cv,pv) => cv + Number(pv.pledgeData.amount) ,0)
const token = numPledges ? filteredPledges[0].pledgeData.token : '' const token = numPledges ? filteredPledges[0].pledgeData.token : ''
const amountFormatter = token ? getTokenByAddress(token).humanReadibleFn : toEther
return ( return (
<MenuItem style={{display: 'flex', alignItems: 'center'}} key={`profile-${index}`} value={profile}> <MenuItem style={{display: 'flex', alignItems: 'center'}} key={`profile-${index}`} value={profile}>
{profile.name} - {numPledges} Pledges - {toEther(amount.toString())} {getTokenLabel(token)} {profile.name} - {numPledges} Pledges - {amountFormatter(amount.toString())} {getTokenLabel(token)}
</MenuItem> </MenuItem>
) )
})} })}
@ -150,7 +152,7 @@ const SubmissionSection = ({ classes, profiles, delegatePledges, projectId, open
> >
{filteredPledges.map(pledge => ( {filteredPledges.map(pledge => (
<MenuItem style={{display: 'flex', alignItems: 'center'}} key={pledge.idPledge} value={pledge.idPledge}> <MenuItem style={{display: 'flex', alignItems: 'center'}} key={pledge.idPledge} value={pledge.idPledge}>
{`Pledge no: ${pledge.idPledge} - Amount: ${toEther(pledge.pledgeData.amount)} ${getTokenLabel(pledge.pledgeData.token)}`} {`Pledge no: ${pledge.idPledge} - Amount: ${getTokenByAddress(pledge.pledgeData.token).humanReadibleFn(pledge.pledgeData.amount)} ${getTokenLabel(pledge.pledgeData.token)}`}
</MenuItem> </MenuItem>
))} ))}
</TextField>} </TextField>}