tsc fixes

frontend/client/modules/create/utils.ts

@@ -7,10 +7,13 @@ import {
 } from 'types';
 import { User } from 'types';
 import { getAmountError, isValidAddress } from 'utils/validators';
-import { Proposal } from 'types';
 import { Zat, toZat } from 'utils/units';
 import { ONE_DAY } from 'utils/time';
 import { PROPOSAL_CATEGORY } from 'api/constants';
+import {
+  ProposalDetail,
+  PROPOSAL_DETAIL_INITIAL_STATE,
+} from 'modules/proposals/reducers';
 
 export const TARGET_ZEC_LIMIT = 1000;
 
@@ -176,7 +179,7 @@ export function proposalToContractData(form: ProposalDraft): any {
 }
 
 // This is kind of a disgusting function, sorry.
-export function makeProposalPreviewFromDraft(draft: ProposalDraft): Proposal {
+export function makeProposalPreviewFromDraft(draft: ProposalDraft): ProposalDetail {
   const { invites, ...rest } = draft;
   const target = parseFloat(draft.target);
 
@@ -202,6 +205,7 @@ export function makeProposalPreviewFromDraft(draft: ProposalDraft): Proposal {
       status: PROPOSAL_ARBITER_STATUS.ACCEPTED,
     },
     milestones: draft.milestones.map((m, idx) => ({
+      id: idx,
       index: idx,
       title: m.title,
       content: m.content,
@@ -211,5 +215,6 @@ export function makeProposalPreviewFromDraft(draft: ProposalDraft): Proposal {
       payoutPercent: m.payoutPercent.toString(),
       stage: MILESTONE_STAGE.IDLE,
     })),
+    ...PROPOSAL_DETAIL_INITIAL_STATE,
   };
 }

frontend/client/modules/proposals/reducers.ts

@@ -22,7 +22,7 @@ export interface ProposalDetail extends Proposal {
 export interface ProposalState {
   page: LoadableProposalPage;
 
-  detail: null | Proposal;
+  detail: null | ProposalDetail;
   isFetchingDetail: boolean;
   detailError: null | string;
 
@@ -45,7 +45,7 @@ export interface ProposalState {
   deleteContributionError: null | string;
 }
 
-const PROPOSAL_DETAIL_INITIAL_STATE: Partial<ProposalDetail> = {
+export const PROPOSAL_DETAIL_INITIAL_STATE = {
   isRequestingPayout: false,
   requestPayoutError: '',
   isRejectingPayout: false,

frontend/stories/ProposalMilestones.story.tsx

@@ -21,9 +21,9 @@ const msRejected = { stage: REJECTED };
 const trustee = 'z123';
 const contributor = 'z456';
 
-const geometryCases = [...Array(10).keys()].map(i =>
-  generateProposal({ milestoneCount: i + 1 }),
-);
+// const geometryCases = [...Array(10).keys()].map(i =>
+//   generateProposal({ milestoneCount: i + 1 }),
+// );
 
 const cases: { [index: string]: any } = {
   // trustee - first
@@ -149,14 +149,14 @@ for (const key of Object.keys(cases)) {
   ));
 }
 
-const geometryStories = storiesOf('Proposal/Milestones/geometry', module);
+// const geometryStories = storiesOf('Proposal/Milestones/geometry', module);
 
-geometryCases.forEach((gc, idx) =>
-  geometryStories.add(`${idx + 1} steps`, () => (
-    <div key={idx} style={{ padding: '3em', display: 'flex' }}>
-      <Provider store={storeOutsider}>
-        <Milestones {...gc} />
-      </Provider>
-    </div>
-  )),
-);
+// geometryCases.forEach((gc, idx) =>
+//   geometryStories.add(`${idx + 1} steps`, () => (
+//     <div key={idx} style={{ padding: '3em', display: 'flex' }}>
+//       <Provider store={storeOutsider}>
+//         <Milestones {...gc} />
+//       </Provider>
+//     </div>
+//   )),
+// );

frontend/stories/props.tsx

@@ -109,6 +109,7 @@ export function generateProposal({
     }
 
     const defaults: ProposalMilestone = {
+      id: 0,
       title: 'Milestone A',
       content: `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod 
            tempor incididunt ut labore et dolore magna aliqua.`,
@@ -124,6 +125,7 @@ export function generateProposal({
 
   const milestones = [...Array(milestoneCount).keys()].map(i => {
     const overrides = {
+      id: i,
       index: i,
       title: genMilestoneTitle(),
       immediatePayout: i === 0,