zecfoundation
/
zcash-grant-system
mirror of https://github.com/ZcashFoundation/zcash-grant-system.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reject -> request changes (#107)

This commit is contained in:
Danny Skubak 2019-12-10 13:15:28 -05:00 committed by Daniel Ternyak
parent 96d0b9e30e
commit 59ebf8e971
2 changed files with 75 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
admin/src/components/ProposalDetail/index.tsx
View File

@ -182,65 +182,71 @@ class ProposalDetailNaked extends React.Component<Props, State> {
<> <>
<Row gutter={16}> <Row gutter={16}>
<Col span={isVersionTwo ? 16 : 24}> <Col span={isVersionTwo ? 16 : 24}>
<Alert <Alert
showIcon showIcon
type="warning" type="warning"
message="Review Pending" message="Review Pending"
description={ description={
<div> <div>
<p>Please review this proposal and render your judgment.</p> <p>Please review this proposal and render your judgment.</p>
<Button <Button
className="ProposalDetail-review" className="ProposalDetail-review"
loading={store.proposalDetailApproving} loading={store.proposalDetailApproving}
icon="check" icon="check"
type="primary" type="primary"
onClick={() => this.handleApprove(true)} onClick={() => this.handleApprove(true)}
> >
Approve With Funding Approve With Funding
</Button> </Button>
<Button <Button
className="ProposalDetail-review" className="ProposalDetail-review"
loading={store.proposalDetailApproving} loading={store.proposalDetailApproving}
icon="check" icon="check"
type="default" type="default"
onClick={() => this.handleApprove(false)} onClick={() => this.handleApprove(false)}
> >
Approve Without Funding Approve Without Funding
</Button> </Button>
<Button <Button
className="ProposalDetail-review" className="ProposalDetail-review"
loading={store.proposalDetailApproving} loading={store.proposalDetailApproving}
icon="close" icon="close"
type="danger" type="danger"
onClick={() => { onClick={() => {
FeedbackModal.open({ FeedbackModal.open({
title: 'Request changes to this proposal?', title: 'Request changes to this proposal?',
label: 'Please provide a reason:', label: 'Please provide a reason:',
okText: 'Reject', okText: 'Request changes',
onOk: this.handleReject, onOk: this.handleReject,
}); });
}} }}
> >
Request changes Request changes
</Button> </Button>
</div> </div>
} }
/> />
</Col> </Col>
{p.isVersionTwo && <Col span={8}> {p.isVersionTwo && (
<Alert <Col span={8}>
showIcon <Alert
type={p.rfpOptIn ? "success" : "error"} showIcon
message={p.rfpOptIn ? "KYC accepted" : "KYC rejected"} type={p.rfpOptIn ? 'success' : 'error'}
description={ message={p.rfpOptIn ? 'KYC accepted' : 'KYC rejected'}
<div> description={
{p.rfpOptIn ? <p>KYC has been accepted by the proposer.</p> : <p>KYC has been rejected. Recommend against approving with funding.</p>} <div>
{p.rfpOptIn ? (
</div>} <p>KYC has been accepted by the proposer.</p>
/> ) : (
</Col> <p>
} KYC has been rejected. Recommend against approving with funding.
</p>
)}
</div>
}
/>
</Col>
)}
</Row> </Row>
</> </>
); );
@ -458,13 +464,16 @@ class ProposalDetailNaked extends React.Component<Props, State> {
{/* RIGHT SIDE */} {/* RIGHT SIDE */}
<Col span={6}> <Col span={6}>
{p.isVersionTwo && !p.acceptedWithFunding && p.stage === PROPOSAL_STAGE.WIP && <Alert {p.isVersionTwo &&
message="Accepted without funding" !p.acceptedWithFunding &&
description="This proposal has been posted publicly, but isn't being funded by the Zcash Foundation." p.stage === PROPOSAL_STAGE.WIP && (
type="info" <Alert
showIcon message="Accepted without funding"
/> description="This proposal has been posted publicly, but isn't being funded by the Zcash Foundation."
} type="info"
showIcon
/>
)}
{/* ACTIONS */} {/* ACTIONS */}
<Card size="small" className="ProposalDetail-controls"> <Card size="small" className="ProposalDetail-controls">

2
frontend/client/components/CCRDraftList/index.tsx
View File

@ -109,7 +109,7 @@ class CCRDraftList extends React.Component<Props, State> {
title={ title={
<> <>
{d.title || <em>Untitled Request</em>} {d.title || <em>Untitled Request</em>}
{d.status === CCRSTATUS.REJECTED && <em> (rejected)</em>} {d.status === CCRSTATUS.REJECTED && <em> (changes requested)</em>}
</> </>
} }
description={d.brief || <em>No description</em>} description={d.brief || <em>No description</em>}