fix: prevent duplicate requests to api on forms

Chia-Network · Apr 21, 2022 · d4291b8 · d4291b8
1 parent 30529e0
commit d4291b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/components/forms/CreateUnitsForm.js b/src/components/forms/CreateUnitsForm.js
@@ -28,7 +28,7 @@ const StyledFormContainer = styled('div')`
 `;
 
 const CreateUnitsForm = ({ onClose, modalSizeAndPosition }) => {
-  const { notification } = useSelector(state => state.app);
+  const { notification, showProgressOverlay } = useSelector(state => state.app);
   const [tabValue, setTabValue] = useState(0);
   const dispatch = useDispatch();
   const intl = useIntl();
@@ -82,10 +82,12 @@ const CreateUnitsForm = ({ onClose, modalSizeAndPosition }) => {
       isMandatoryIssuanceChecked
     ) {
       dispatch(setValidateForm(false));
-      if (desiredStep >= stepperStepsTranslationIds.length) {
+      if (
+        desiredStep >= stepperStepsTranslationIds.length &&
+        !showProgressOverlay
+      ) {
         handleSubmitUnit();
       } else {
-        dispatch(setValidateForm(false));
         setTabValue(desiredStep);
         dispatch(setForm(stepperStepsTranslationIds[desiredStep]));
       }

diff --git a/src/components/forms/EditUnitsForm.js b/src/components/forms/EditUnitsForm.js
@@ -32,7 +32,7 @@ const StyledFormContainer = styled('div')`
 const EditUnitsForm = ({ onClose, record, modalSizeAndPosition }) => {
   const { organizations } = useSelector(store => store.climateWarehouse);
   const myOrgUid = getMyOrgUid(organizations);
-  const { notification } = useSelector(state => state.app);
+  const { notification, showProgressOverlay } = useSelector(state => state.app);
   const [unit, setUnit] = useState([]);
   const [tabValue, setTabValue] = useState(0);
   const dispatch = useDispatch();
@@ -80,7 +80,10 @@ const EditUnitsForm = ({ onClose, record, modalSizeAndPosition }) => {
       isMandatoryIssuanceChecked
     ) {
       dispatch(setValidateForm(false));
-      if (desiredStep >= stepperStepsTranslationIds.length) {
+      if (
+        desiredStep >= stepperStepsTranslationIds.length &&
+        !showProgressOverlay
+      ) {
         handleUpdateUnit();
       } else {
         dispatch(setValidateForm(false));