From 475abec08b0ae786bc2176a16fc3cae434a68e26 Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Thu, 31 Dec 2020 03:11:13 -0600
Subject: [PATCH] move kyc acceptance to post approval

---
 admin/src/components/ProposalDetail/index.tsx | 93 +++++++++++--------
 1 file changed, 56 insertions(+), 37 deletions(-)

diff --git a/admin/src/components/ProposalDetail/index.tsx b/admin/src/components/ProposalDetail/index.tsx
index eb182b8a..80065bf9 100644
--- a/admin/src/components/ProposalDetail/index.tsx
+++ b/admin/src/components/ProposalDetail/index.tsx
@@ -274,38 +274,28 @@ class ProposalDetailNaked extends React.Component<Props, State> {
                 description={
                   <div>
                     <p>Please review this proposal and render your judgment.</p>
-                    {!p.kycApproved ? (
+
+                    <>
                       <Button
                         className="ProposalDetail-review"
-                        loading={store.proposalDetailApprovingKyc}
+                        loading={store.proposalDetailAcceptingProposal}
                         icon="check"
                         type="primary"
-                        onClick={() => this.handleApproveKYC()}
+                        onClick={() => this.handleAcceptProposal(true, true)}
                       >
-                        KYC Approved
+                        Approve With Funding
                       </Button>
-                    ) : (
-                      <>
-                        <Button
-                          className="ProposalDetail-review"
-                          loading={store.proposalDetailAcceptingProposal}
-                          icon="check"
-                          type="primary"
-                          onClick={() => this.handleAcceptProposal(true, true)}
-                        >
-                          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
+                        className="ProposalDetail-review"
+                        loading={store.proposalDetailAcceptingProposal}
+                        icon="check"
+                        type="default"
+                        onClick={() => this.handleAcceptProposal(true, false)}
+                      >
+                        Approve Without Funding
+                      </Button>
+                    </>
+
                     <Button
                       className="ProposalDetail-review"
                       loading={store.proposalDetailMarkingChangesAsResolved}
@@ -387,17 +377,44 @@ class ProposalDetailNaked extends React.Component<Props, State> {
     const renderNominateArbiter = () =>
       needsArbiter &&
       shouldShowArbiter && (
-        <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>
-          }
-        />
+        <>
+          {!p.kycApproved ? (
+            <Alert
+              showIcon
+              type="error"
+              message="KYC approval required"
+              description={
+                <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 = () =>
@@ -514,6 +531,8 @@ class ProposalDetailNaked extends React.Component<Props, State> {
       </div>
     );
 
+    console.log(p);
+
     return (
       <div className="ProposalDetail">
         <Back to="/proposals" text="Proposals" />