Fix isImmediatePayout non-existant property on milestones.

This commit is contained in:
Will O'Beirne 2019-02-05 16:05:45 -05:00
parent f0303b26b4
commit 3b8d96ac51
No known key found for this signature in database
GPG Key ID: 44C190DB5DEAF9F6
4 changed files with 4 additions and 7 deletions

View File

@ -121,7 +121,7 @@ class ProposalMilestones extends React.Component<Props, State> {
message={
<span>
The team was awarded <strong>{reward}</strong>{' '}
{milestone.isImmediatePayout
{milestone.immediatePayout
? 'as an initial payout'
: // TODO: Add property for payout date on milestones
`on ${moment().format('MMM Do, YYYY')}`}
@ -164,7 +164,7 @@ class ProposalMilestones extends React.Component<Props, State> {
const statuses = (
<div className="ProposalMilestones-milestone-status">
{!milestone.isImmediatePayout && (
{!milestone.immediatePayout && (
<div>
Estimate: <strong>{estimatedDate}</strong>
</div>

View File

@ -183,6 +183,7 @@ export function makeProposalPreviewFromDraft(draft: ProposalDraft): Proposal {
payoutAddress: '0x0',
dateCreated: Date.now() / 1000,
datePublished: Date.now() / 1000,
dateApproved: Date.now() / 1000,
deadlineDuration: 86400 * 60,
target: toZat(draft.target),
funded: Zat('0'),
@ -198,7 +199,6 @@ export function makeProposalPreviewFromDraft(draft: ProposalDraft): Proposal {
amount: toZat(target * (parseInt(m.payoutPercent, 10) / 100)),
dateEstimated: m.dateEstimated,
immediatePayout: m.immediatePayout,
isImmediatePayout: m.immediatePayout,
isPaid: false,
payoutPercent: m.payoutPercent.toString(),
state: MILESTONE_STATE.WAITING,

View File

@ -117,7 +117,6 @@ export function generateProposal({
state: MILESTONE_STATE.WAITING,
amount: amountBn,
isPaid: false,
isImmediatePayout: true,
payoutPercent: '33',
};
return { ...defaults, ...overrides };
@ -128,7 +127,6 @@ export function generateProposal({
index: i,
title: genMilestoneTitle(),
immediatePayout: i === 0,
isImmediatePayout: i === 0,
payoutRequestVoteDeadline: i !== 0 ? Date.now() + 3600000 : 0,
payoutPercent: '' + (1 / milestoneCount) * 100,
};

View File

@ -12,12 +12,11 @@ export interface Milestone {
state: MILESTONE_STATE;
amount: Zat;
isPaid: boolean;
isImmediatePayout: boolean;
immediatePayout: boolean;
}
export interface ProposalMilestone extends Milestone {
content: string;
immediatePayout: boolean;
dateEstimated: string;
payoutPercent: string;
title: string;