fix: prevent navigation on submit

decentraland · Apr 25, 2024 · ce3e6c5 · ce3e6c5
1 parent f3de8cc
commit ce3e6c5
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 22 deletions.
diff --git a/src/components/Proposal/Submit/ProposalSubmitCatalystPage.tsx b/src/components/Proposal/Submit/ProposalSubmitCatalystPage.tsx
@@ -113,8 +113,8 @@ export default function ProposalSubmitCatalystPage({ catalystType }: Props) {
   const setCoAuthors = (addresses?: string[]) => setValue('coAuthors', addresses)
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   const onSubmit: SubmitHandler<NewProposalCatalyst> = async (data) => {
     const errors = [isErrorOnContentStatus, isErrorOnLambdasStatus].filter(Boolean)

diff --git a/src/components/Proposal/Submit/ProposalSubmitHiringPage.tsx b/src/components/Proposal/Submit/ProposalSubmitHiringPage.tsx
@@ -99,8 +99,8 @@ export default function ProposalSubmitHiringPage({ type, committees, isCommittee
   }, [committees, setValue, type])
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   const onSubmit: SubmitHandler<HiringState> = async (data) => {
     setFormDisabled(true)

diff --git a/src/components/Proposal/Submit/ProposalSubmitPoiPage.tsx b/src/components/Proposal/Submit/ProposalSubmitPoiPage.tsx
@@ -93,7 +93,7 @@ export default function ProposalSubmitPoiPage({ poiType }: Props) {
 
   const {
     handleSubmit,
-    formState: { isDirty, errors },
+    formState: { isDirty, errors, isSubmitting },
     control,
     setValue,
     watch,
@@ -138,8 +138,8 @@ export default function ProposalSubmitPoiPage({ poiType }: Props) {
   const setCoAuthors = (addresses?: string[]) => setValue('coAuthors', addresses)
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   if (accountState.loading) {
     return <LoadingView />

diff --git a/src/pages/submit/ban-name.tsx b/src/pages/submit/ban-name.tsx
@@ -51,8 +51,8 @@ export default function SubmitBanName() {
   const setCoAuthors = (addresses?: string[]) => setValue('coAuthors', addresses)
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   const onSubmit: SubmitHandler<NewProposalBanName> = async (data) => {
     setFormDisabled(true)

diff --git a/src/pages/submit/bid.tsx b/src/pages/submit/bid.tsx
@@ -129,6 +129,7 @@ export default function SubmitBid() {
 
   const submit = useCallback(async () => {
     if (allSectionsValid) {
+      preventNavigation.current = false
       setIsFormDisabled(true)
       setIsLoading(true)
       const bidRequestParsed = parseStringsAsNumbers(bidRequest as BidRequest)
@@ -141,6 +142,7 @@ export default function SubmitBid() {
         setSubmitError(error.body?.error || error.message)
         setIsLoading(false)
         setIsFormDisabled(false)
+        preventNavigation.current = true
       }
     }
   }, [allSectionsValid, bidRequest, navigate])

diff --git a/src/pages/submit/draft.tsx b/src/pages/submit/draft.tsx
@@ -68,8 +68,8 @@ export default function SubmitDraftProposal() {
   const setCoAuthors = (addresses?: string[]) => setValue('coAuthors', addresses)
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   useEffect(() => {
     if (preselectedLinkedProposalId) {

diff --git a/src/pages/submit/governance.tsx b/src/pages/submit/governance.tsx
@@ -74,8 +74,8 @@ export default function SubmitGovernanceProposal() {
   const setCoAuthors = (addresses?: string[]) => setValue('coAuthors', addresses)
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   useEffect(() => {
     if (preselectedLinkedProposalId) {

diff --git a/src/pages/submit/grant.tsx b/src/pages/submit/grant.tsx
@@ -150,6 +150,7 @@ export default function SubmitGrant() {
 
   const submit = useCallback(() => {
     if (allSectionsValid) {
+      preventNavigation.current = false
       setIsFormDisabled(true)
       Promise.resolve()
         .then(async () => {
@@ -163,6 +164,7 @@ export default function SubmitGrant() {
           console.error(err, { ...err })
           setSubmitError(err.body?.error || err.message)
           setIsFormDisabled(false)
+          preventNavigation.current = true
         })
     }
   }, [allSectionsValid, grantRequest, navigate])

diff --git a/src/pages/submit/linked-wearables.tsx b/src/pages/submit/linked-wearables.tsx
@@ -126,8 +126,8 @@ export default function SubmitLinkedWearables() {
   const setCoAuthors = (addresses?: string[]) => setValue('coAuthors', addresses)
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   const handleAddOption = (e: React.MouseEvent<HTMLButtonElement>, field: ListSectionType['section']) => {
     e.preventDefault()

diff --git a/src/pages/submit/pitch.tsx b/src/pages/submit/pitch.tsx
@@ -53,7 +53,7 @@ export default function SubmitPitchProposal() {
 
   const {
     handleSubmit,
-    formState: { isDirty, errors },
+    formState: { isDirty, isSubmitting, errors },
     control,
     setValue,
     watch,
@@ -62,8 +62,8 @@ export default function SubmitPitchProposal() {
   const setCoAuthors = (addresses?: string[]) => setValue('coAuthors', addresses)
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   const onSubmit: SubmitHandler<NewProposalPitch> = async (data) => {
     setFormDisabled(true)

diff --git a/src/pages/submit/poll.tsx b/src/pages/submit/poll.tsx
@@ -106,8 +106,8 @@ export default function SubmitPoll() {
   }
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   const isValidChoices = useCallback(
     (choices: Record<string, string>) => {

diff --git a/src/pages/submit/tender.tsx b/src/pages/submit/tender.tsx
@@ -87,8 +87,8 @@ export default function SubmitTenderProposal() {
   const setCoAuthors = (addresses?: string[]) => setValue('coAuthors', addresses)
 
   useEffect(() => {
-    preventNavigation.current = isDirty
-  }, [isDirty])
+    preventNavigation.current = isDirty && !isSubmitting
+  }, [isDirty, isSubmitting])
 
   useEffect(() => {
     if (preselectedLinkedProposalId) {