merge corrections

bcgov · Apr 24, 2024 · 02a65c6 · 02a65c6
1 parent a3b9513
commit 02a65c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/source/frontend/src/features/mapSideBar/disposition/form/DispositionForm.tsx b/source/frontend/src/features/mapSideBar/disposition/form/DispositionForm.tsx
@@ -212,12 +212,12 @@ const DispositionForm: React.FC<IDispositionFormProps> = props => {
             <Section header="Disposition Team">
               <DispositionTeamSubForm />
             </Section>
+            <ConfirmNavigation
+              shouldBlockNavigation={() => {
+                return formikProps.dirty && !formikProps.isSubmitting;
+              }}
+            />
           </Container>
-              <ConfirmNavigation
-                shouldBlockNavigation={() => {
-                  return formikProps.dirty && !formikProps.isSubmitting;
-                }}
-              />
         );
       }}
     </Formik>

diff --git a/source/frontend/src/features/mapSideBar/research/add/AddResearchContainer.tsx b/source/frontend/src/features/mapSideBar/research/add/AddResearchContainer.tsx
@@ -12,6 +12,7 @@ import { usePimsPropertyRepository } from '@/hooks/repositories/usePimsPropertyR
 import { usePropertyAssociations } from '@/hooks/repositories/usePropertyAssociations';
 import useApiUserOverride from '@/hooks/useApiUserOverride';
 import { useInitialMapSelectorProperties } from '@/hooks/useInitialMapSelectorProperties';
+import { useModalContext } from '@/hooks/useModalContext';
 import { ApiGen_Concepts_ResearchFile } from '@/models/api/generated/ApiGen_Concepts_ResearchFile';
 import { UserOverrideCode } from '@/models/api/UserOverrideCode';
 import { exists, isValidId, isValidString } from '@/utils';
@@ -34,6 +35,7 @@ export const AddResearchContainer: React.FunctionComponent<IAddResearchContainer
   const formikRef = useRef<FormikProps<ResearchForm>>(null);
   const mapMachine = useMapStateMachine();
   const selectedFeatureDataset = mapMachine.selectedFeatureDataset;
+  const { setModalContent, setDisplayModal } = useModalContext();
   const { execute: getPropertyAssociations } = usePropertyAssociations();
   const {
     getPropertyByPidWrapper: { execute: getPropertyByPid },