Merge branch 'main' of https://github.com/SmartInvoiceXYZ/nouns-builder

SmartInvoiceXYZ · Dec 9, 2024 · b3f1533 · b3f1533
2 parents c96ccee + f19e204
commit b3f1533
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/apps/web/src/modules/create-proposal/components/TransactionForm/Escrow/EscrowForm.schema.ts b/apps/web/src/modules/create-proposal/components/TransactionForm/Escrow/EscrowForm.schema.ts
@@ -74,11 +74,11 @@ export const EscrowFormSchema = yup
       .required('Safety valve date is required.')
       .min(
         new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
-        'Safety valve date must be at least 30 days from today.'
+        'Safety valve date must be at least 30 days from today or the last milestone whichever is later.'
       )
       .test(
         'after-last-milestone',
-        'Safety valve date must be at least 30 days after the last milestone date',
+        'Safety valve date must be at least 30 days after the last milestone date.',
         function (value) {
           const milestones = (this.parent.milestones || []) as Milestone[]
           if (milestones.length === 0) return true

diff --git a/apps/web/src/modules/create-proposal/components/TransactionForm/Escrow/EscrowForm.tsx b/apps/web/src/modules/create-proposal/components/TransactionForm/Escrow/EscrowForm.tsx
@@ -72,8 +72,6 @@ const MilestoneForm: React.FC<{
         formik={formik}
         id={`milestones.${index}.description`}
         value={formik.values?.milestones[index]?.description}
-        onChange={formik.handleChange}
-        onBlur={formik.handleBlur}
         inputLabel="Description"
         placeholder={'Milestone description is highly encouraged'}
       />
@@ -183,7 +181,7 @@ const EscrowForm: React.FC<EscrowFormProps> = ({
                   {...formik.getFieldProps('recipientAddress')}
                   id="recipientAddress"
                   inputLabel={'Recipient'}
-                  placeholder={'0x... or .eth'}
+                  placeholder={'0x...'}
                   isAddress={true}
                   errorMessage={
                     formik.touched.recipientAddress && formik.errors.recipientAddress

diff --git a/apps/web/src/modules/proposal/components/ProposalDescription/MilestoneDetails.tsx b/apps/web/src/modules/proposal/components/ProposalDescription/MilestoneDetails.tsx
@@ -219,7 +219,8 @@ export const MilestoneDetails: React.FC<MilestoneDetailsProps> = ({
               {milestone.documents?.map((doc, index) => renderDocumentLink(doc))}
             </Stack>
 
-            {executionTransactionHash && renderMilestoneButton(index, isReleased, isNext)}
+            {!!executionTransactionHash &&
+              renderMilestoneButton(index, isReleased, isNext)}
           </Stack>
         ),
       }

diff --git a/apps/web/src/modules/proposal/components/ProposalDescription/ProposalDescription.tsx b/apps/web/src/modules/proposal/components/ProposalDescription/ProposalDescription.tsx
@@ -1,4 +1,4 @@
-import { Box, Flex, Paragraph, atoms } from '@zoralabs/zord'
+import { Box, Flex, Paragraph, Text, atoms } from '@zoralabs/zord'
 import { useEffect } from 'hono/jsx'
 import { toLower } from 'lodash'
 import Image from 'next/image'
@@ -53,6 +53,7 @@ export const ProposalDescription: React.FC<ProposalDescriptionProps> = ({
 }) => {
   const { description, proposer, calldatas, values, targets, executionTransactionHash } =
     proposal
+
   const { displayName } = useEnsData(proposer)
   const chain = useChainStore((x) => x.chain)
 
@@ -96,12 +97,19 @@ export const ProposalDescription: React.FC<ProposalDescriptionProps> = ({
             )}
           </Paragraph>
         </Section>
+
         {isEscrow && decodedTxnData && (
           <Section title="Escrow Milestones">
-            <MilestoneDetails
-              decodedTxnData={decodedTxnData}
-              executionTransactionHash={executionTransactionHash}
-            />
+            {executionTransactionHash ? (
+              <MilestoneDetails
+                decodedTxnData={decodedTxnData}
+                executionTransactionHash={executionTransactionHash}
+              />
+            ) : !decodedTxnData?._escrowData?.value ? (
+              <Text variant="code" color="negative">
+                Error Decoding Escrow Milestones
+              </Text>
+            ) : null}
           </Section>
         )}