diff --git a/frontend/client/components/CreateProposal/index.tsx b/frontend/client/components/CreateProposal/index.tsx index 69ad0090..7f3d49c0 100644 --- a/frontend/client/components/CreateProposal/index.tsx +++ b/frontend/client/components/CreateProposal/index.tsx @@ -177,7 +177,6 @@ class CreateProposal extends React.Component { const milestoneAmounts = milestones.map(milestone => Wei(milestoneToMilestoneAmount(milestone, targetInWei)), ); - console.log('milestoneAmounts', milestoneAmounts); const immediateFirstMilestonePayout = milestones[0].immediatePayout; const contractData = { diff --git a/frontend/client/components/Proposal/Contributors/index.tsx b/frontend/client/components/Proposal/Contributors/index.tsx index bcff9496..028fcc4c 100644 --- a/frontend/client/components/Proposal/Contributors/index.tsx +++ b/frontend/client/components/Proposal/Contributors/index.tsx @@ -3,6 +3,9 @@ import { Spin } from 'antd'; import { CrowdFund } from 'modules/proposals/reducers'; import UserRow from 'components/UserRow'; import * as ProposalStyled from '../styled'; +import Placeholder from '../../Placeholder'; +import { fromWei } from '../../../utils/units'; +import UnitDisplay from '../../UnitDisplay'; interface Props { crowdFund: CrowdFund; @@ -16,11 +19,20 @@ const ContributorsBlock = ({ crowdFund }: Props) => { } /> )); } else { - content =
No contributors found.
; + content = ( + + ); } } else { content = ; diff --git a/frontend/client/components/UserRow/index.tsx b/frontend/client/components/UserRow/index.tsx index b481e2b8..4efa0732 100644 --- a/frontend/client/components/UserRow/index.tsx +++ b/frontend/client/components/UserRow/index.tsx @@ -2,14 +2,13 @@ import React from 'react'; import ShortAddress from 'components/ShortAddress'; import Identicon from 'components/Identicon'; import * as Styled from './styled'; -import { Wei, fromWei } from 'utils/units'; interface Props { address: string; - amount?: Wei; + secondary?: React.ReactNode; } -const UserRow = ({ address, amount }: Props) => ( +const UserRow = ({ address, secondary }: Props) => ( @@ -18,9 +17,7 @@ const UserRow = ({ address, amount }: Props) => ( - {amount && ( - {fromWei(amount, 'ether')} ETH - )} + {secondary && {secondary}} ); diff --git a/frontend/client/web3interact/crowdFund.ts b/frontend/client/web3interact/crowdFund.ts index 6bf88e01..4996edd2 100644 --- a/frontend/client/web3interact/crowdFund.ts +++ b/frontend/client/web3interact/crowdFund.ts @@ -29,7 +29,7 @@ export async function getCrowdFundState( ? 0 : balance .mul(new BN(100)) - .divRound(target) + .div(target) .toNumber(); const amountVotingForRefund = isRaiseGoalReached ? Wei(await crowdFundContract.methods.amountVotingForRefund().call({ from: account }))