diff --git a/components/InstitutionTab/InstitutionTab.jsx b/components/InstitutionTab/InstitutionTab.jsx index ebb6e7b..97d4a69 100644 --- a/components/InstitutionTab/InstitutionTab.jsx +++ b/components/InstitutionTab/InstitutionTab.jsx @@ -16,7 +16,8 @@ export const InstitutionTab = forwardRef( const institutionFields = institutionsFieldArray.fields[getInstitutionIndex(institutionName)]; const institutionDefaultValues = - defaultValues.institutions[getInstitutionIndex(institutionName)]; + defaultValues.institutions?.[getInstitutionIndex(institutionName)] ?? + null; const institutionCurrentValues = useWatch({ control, name: institutionName, diff --git a/components/RecordForm/RecordForm.jsx b/components/RecordForm/RecordForm.jsx index 136b1cf..a948310 100644 --- a/components/RecordForm/RecordForm.jsx +++ b/components/RecordForm/RecordForm.jsx @@ -7,7 +7,7 @@ Root element of the form import { useForm, FormProvider, useFieldArray } from "react-hook-form"; import classes from "./RecordForm.module.css"; import { Button, Progress, useToast } from "@chakra-ui/react"; -import { useState, useEffect } from "react"; +import { useState } from "react"; import { InstitutionsList } from "components/InstitutionsList"; import { FormHeader } from "~/FormHeader"; @@ -22,7 +22,7 @@ export function RecordForm() { const [isInstitutionOpen, setIsInstitutionOpen] = useState(false); const [selectedInstitutionIndex, setSelectedInstitutionIndex] = useState(0); const [errorState, setErrorState] = useState(false); - + const toast = useToast({ position: "top" }); const router = useRouter(); const arrayName = "institutions"; @@ -88,8 +88,23 @@ export function RecordForm() { Cancel