From 8713c5923d30310bee5890a718d33cc016fd7a3a Mon Sep 17 00:00:00 2001
From: Andy Espagnolo <andyespagnolo@gmail.com>
Date: Fri, 20 Oct 2023 12:35:43 -0300
Subject: [PATCH 1/2] fix: disable grant and poll fields on submission vp not
 met

---
 .../GrantRequest/GrantRequestFundingSection.tsx        |  1 +
 src/components/ProjectRequest/NumberSelector.tsx       |  8 +++++---
 src/pages/submit/grant.tsx                             | 10 ++++++----
 src/pages/submit/poll.tsx                              |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/GrantRequest/GrantRequestFundingSection.tsx b/src/components/GrantRequest/GrantRequestFundingSection.tsx
index 1805f08ba..aa12a1151 100644
--- a/src/components/GrantRequest/GrantRequestFundingSection.tsx
+++ b/src/components/GrantRequest/GrantRequestFundingSection.tsx
@@ -211,6 +211,7 @@ export default function GrantRequestFundingSection({
             onChange={(value) => setValue('projectDuration', Number(value))}
             label={t('page.submit_grant.funding_section.project_duration_title')}
             unit="months"
+            disabled={isFormDisabled}
           />
         </div>
       </div>
diff --git a/src/components/ProjectRequest/NumberSelector.tsx b/src/components/ProjectRequest/NumberSelector.tsx
index 249053d02..403ff9d98 100644
--- a/src/components/ProjectRequest/NumberSelector.tsx
+++ b/src/components/ProjectRequest/NumberSelector.tsx
@@ -20,9 +20,10 @@ interface Props {
   unit: UnitTypeLongPlural | UnitTypeLongPlural[]
   subtitle?: string
   onUnitChange?: (unit: UnitTypeLongPlural) => void
+  disabled?: boolean
 }
 
-const NumberSelector = ({ value, onChange, min, max, label, unit, onUnitChange, subtitle }: Props) => {
+const NumberSelector = ({ value, onChange, min, max, label, unit, onUnitChange, subtitle, disabled }: Props) => {
   const t = useFormatMessage()
   const handleAddClick = useCallback(() => {
     if (value === max) {
@@ -66,11 +67,11 @@ const NumberSelector = ({ value, onChange, min, max, label, unit, onUnitChange,
       <div className="NumberSelector__Container">
         <div className="NumberSelector__InputContainer">
           <div className="NumberSelector__Input">
-            <button className="NumberSelector__Button" onClick={handleRemoveClick}>
+            <button className="NumberSelector__Button" onClick={handleRemoveClick} disabled={disabled}>
               <Remove />
             </button>
             <span className="NumberSelector__Value">{value}</span>
-            <button className="NumberSelector__Button" onClick={handleAddClick}>
+            <button className="NumberSelector__Button" onClick={handleAddClick} disabled={disabled}>
               <Add />
             </button>
           </div>
@@ -80,6 +81,7 @@ const NumberSelector = ({ value, onChange, min, max, label, unit, onUnitChange,
             <Dropdown
               className="NumberSelector__Dropdown"
               selection
+              disabled={disabled}
               defaultValue={unit[0]}
               options={getUnitOptions(unit)}
               onChange={(_, { value }) => handleUnitChange(value as UnitTypeLongPlural)}
diff --git a/src/pages/submit/grant.tsx b/src/pages/submit/grant.tsx
index f513d21ab..ba7eec8a8 100644
--- a/src/pages/submit/grant.tsx
+++ b/src/pages/submit/grant.tsx
@@ -255,7 +255,7 @@ export default function SubmitGrant() {
               navigate(locations.submit(ProposalType.Grant), { replace: true })
             }}
             onValidation={handleFundingSectionValidation}
-            isFormDisabled={isFormDisabled}
+            isFormDisabled={isFormDisabled || submissionVpNotMet}
             sectionNumber={getSectionNumber()}
           />
 
@@ -264,7 +264,7 @@ export default function SubmitGrant() {
               patchGrantRequest((prevState) => ({ ...prevState, ...data }))
               patchValidationState({ generalInformationSectionValid: sectionValid })
             }}
-            isFormDisabled={isFormDisabled}
+            isFormDisabled={isFormDisabled || submissionVpNotMet}
             sectionNumber={getSectionNumber()}
           />
 
@@ -274,6 +274,7 @@ export default function SubmitGrant() {
               patchValidationState({ teamSectionValid: sectionValid })
             }}
             sectionNumber={getSectionNumber()}
+            isDisabled={isFormDisabled || submissionVpNotMet}
           />
 
           <GrantRequestDueDiligenceSection
@@ -284,13 +285,14 @@ export default function SubmitGrant() {
             }}
             sectionNumber={getSectionNumber()}
             projectDuration={grantRequest.projectDuration}
+            isDisabled={isFormDisabled || submissionVpNotMet}
           />
 
           {grantRequest.category && (
             <GrantRequestCategorySection
               category={grantRequest.category}
               onValidation={handleCategorySection}
-              isFormDisabled={isFormDisabled}
+              isFormDisabled={isFormDisabled || submissionVpNotMet}
               sectionNumber={getSectionNumber()}
             />
           )}
@@ -298,7 +300,7 @@ export default function SubmitGrant() {
           <GrantRequestFinalConsentSection
             category={grantRequest.category}
             onValidation={(sectionValid) => patchValidationState({ finalConsentSectionValid: sectionValid })}
-            isFormDisabled={isFormDisabled}
+            isFormDisabled={isFormDisabled || submissionVpNotMet}
             sectionNumber={getSectionNumber()}
           />
 
diff --git a/src/pages/submit/poll.tsx b/src/pages/submit/poll.tsx
index ac61bbe98..5e4a46575 100644
--- a/src/pages/submit/poll.tsx
+++ b/src/pages/submit/poll.tsx
@@ -293,7 +293,7 @@ export default function SubmitPoll() {
           </div>
         </ContentSection>
         <ContentSection>
-          <CoAuthors setCoAuthors={setCoAuthors} isDisabled={formDisabled} />
+          <CoAuthors setCoAuthors={setCoAuthors} isDisabled={formDisabled || submissionVpNotMet} />
         </ContentSection>
         <ContentSection>
           <Button type="submit" primary disabled={formDisabled || submissionVpNotMet} loading={isSubmitting}>

From 72f13f3982b4629b347e655f21fc1397f953be77 Mon Sep 17 00:00:00 2001
From: Andy Espagnolo <andyespagnolo@gmail.com>
Date: Fri, 20 Oct 2023 12:37:55 -0300
Subject: [PATCH 2/2] fix: vp not met error position

---
 src/pages/submit/grant.css |  2 +-
 src/pages/submit/grant.tsx | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pages/submit/grant.css b/src/pages/submit/grant.css
index 46dc87f62..c371c94d5 100644
--- a/src/pages/submit/grant.css
+++ b/src/pages/submit/grant.css
@@ -60,5 +60,5 @@
 }
 
 .GrantRequest__SubmissionVpNotMetText {
-  margin-bottom: 24px !important;
+  margin-top: 24px !important;
 }
diff --git a/src/pages/submit/grant.tsx b/src/pages/submit/grant.tsx
index ba7eec8a8..51976a94f 100644
--- a/src/pages/submit/grant.tsx
+++ b/src/pages/submit/grant.tsx
@@ -305,13 +305,6 @@ export default function SubmitGrant() {
           />
 
           <Container className="ContentLayout__Container">
-            {submissionVpNotMet && (
-              <ContentSection className="ProjectRequestSection__Content">
-                <Text className="GrantRequest__SubmissionVpNotMetText" size="lg" color="primary">
-                  {t('error.grant.submission_vp_not_met', { threshold: SUBMISSION_THRESHOLD_GRANT })}
-                </Text>
-              </ContentSection>
-            )}
             <ContentSection className="ProjectRequestSection__Content">
               <div>
                 <Button
@@ -325,6 +318,15 @@ export default function SubmitGrant() {
               </div>
             </ContentSection>
           </Container>
+          <Container className="ContentLayout__Container">
+            {submissionVpNotMet && (
+              <ContentSection className="ProjectRequestSection__Content">
+                <Text className="GrantRequest__SubmissionVpNotMetText" size="lg" color="primary">
+                  {t('error.grant.submission_vp_not_met', { threshold: SUBMISSION_THRESHOLD_GRANT })}
+                </Text>
+              </ContentSection>
+            )}
+          </Container>
         </>
       )}
       {!!submitError && (