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

move kyc acceptance to post approval

This commit is contained in:
Daniel Ternyak 2020-12-31 03:11:13 -06:00
parent ed7a3343c9
commit 475abec08b
No known key found for this signature in database
GPG Key ID: DF212D2DC5D0E245
1 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,38 +274,28 @@ class ProposalDetailNaked extends React.Component<Props, State> {
description={ description={
<div> <div>
<p>Please review this proposal and render your judgment.</p> <p>Please review this proposal and render your judgment.</p>
{!p.kycApproved ? (
<>
<Button <Button
className="ProposalDetail-review" className="ProposalDetail-review"
loading={store.proposalDetailApprovingKyc} loading={store.proposalDetailAcceptingProposal}
icon="check" icon="check"
type="primary" type="primary"
onClick={() => this.handleApproveKYC()} onClick={() => this.handleAcceptProposal(true, true)}
> >
KYC Approved Approve With Funding
</Button> </Button>
) : ( <Button
<> className="ProposalDetail-review"
<Button loading={store.proposalDetailAcceptingProposal}
className="ProposalDetail-review" icon="check"
loading={store.proposalDetailAcceptingProposal} type="default"
icon="check" onClick={() => this.handleAcceptProposal(true, false)}
type="primary" >
onClick={() => this.handleAcceptProposal(true, true)} Approve Without Funding
> </Button>
Approve With Funding </>
</Button>
<Button
className="ProposalDetail-review"
loading={store.proposalDetailAcceptingProposal}
icon="check"
type="default"
onClick={() => this.handleAcceptProposal(true, false)}
>
Approve Without Funding
</Button>
</>
)}
<Button <Button
className="ProposalDetail-review" className="ProposalDetail-review"
loading={store.proposalDetailMarkingChangesAsResolved} loading={store.proposalDetailMarkingChangesAsResolved}
@ -387,17 +377,44 @@ class ProposalDetailNaked extends React.Component<Props, State> {
const renderNominateArbiter = () => const renderNominateArbiter = () =>
needsArbiter && needsArbiter &&
shouldShowArbiter && ( shouldShowArbiter && (
<Alert <>
showIcon {!p.kycApproved ? (
type="warning" <Alert
message="No arbiter on live proposal" showIcon
description={ type="error"
<div> message="KYC approval required"
<p>An arbiter is required to review milestone payout requests.</p> description={
<ArbiterControl {...p} /> <div>
</div> <p>
} Please wait until an Admin has marked KYC approved before proceeding
/> with payouts.
</p>
<Button
className="ProposalDetail-review"
loading={store.proposalDetailApprovingKyc}
icon="check"
type="primary"
onClick={() => this.handleApproveKYC()}
>
KYC Approved
</Button>
</div>
}
/>
) : (
<Alert
showIcon
type="warning"
message="No arbiter on live proposal"
description={
<div>
<p>An arbiter is required to review milestone payout requests.</p>
<ArbiterControl {...p} />
</div>
}
/>
)}
</>
); );
const renderNominatedArbiter = () => const renderNominatedArbiter = () =>
@ -514,6 +531,8 @@ class ProposalDetailNaked extends React.Component<Props, State> {
</div> </div>
); );
console.log(p);
return ( return (
<div className="ProposalDetail"> <div className="ProposalDetail">
<Back to="/proposals" text="Proposals" /> <Back to="/proposals" text="Proposals" />