diff --git a/src/components/pages/production/chickin/form/ChickinForm.tsx b/src/components/pages/production/chickin/form/ChickinForm.tsx
index d7210c8b..84c5b5a5 100644
--- a/src/components/pages/production/chickin/form/ChickinForm.tsx
+++ b/src/components/pages/production/chickin/form/ChickinForm.tsx
@@ -26,7 +26,6 @@ const ChickinFormKandang = ({
   initialValues: ProjectFlockKandang;
   afterSubmit?: () => void;
 }) => {
-  const [activeTabId, setActiveTabId] = useState<string>('formChickIn');
   const [openChickin, setOpenChickin] = useState<boolean>(false);
 
   const {
@@ -41,7 +40,7 @@ const ChickinFormKandang = ({
   });
 
   const afterSubmitFormChickin = () => {
-    setActiveTabId('logsChickIn');
+    setOpenChickin(true);
     afterSubmit && afterSubmit();
     refreshApprovals();
   };
diff --git a/src/components/pages/production/project-flock/closing/ProjectFlockClosingForm.tsx b/src/components/pages/production/project-flock/closing/ProjectFlockClosingForm.tsx
index a12e7369..7d5f1f9b 100644
--- a/src/components/pages/production/project-flock/closing/ProjectFlockClosingForm.tsx
+++ b/src/components/pages/production/project-flock/closing/ProjectFlockClosingForm.tsx
@@ -28,7 +28,7 @@ const ProjectFlockClosingForm = ({
   projectFlockKandang: ProjectFlockKandang;
 }) => {
   const closeModal = useModal();
-  const isCanClose = projectFlock.approval.step_number <= 2;
+  const isCanClose = projectFlock.approval?.step_number <= 1;
   const [isClosingLoading, setIsClosingLoading] = useState(false);
 
   const { data: closingData, isLoading } = useSWR(
@@ -116,7 +116,7 @@ const ProjectFlockClosingForm = ({
           >
             <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
           </div>
-          <div className='col-span-2'>{projectFlock.area.name}</div>
+          <div className='col-span-2'>{projectFlock.area?.name}</div>
 
           {/* Lokasi */}
           <div
@@ -126,7 +126,7 @@ const ProjectFlockClosingForm = ({
           >
             <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Lokasi
           </div>
-          <div className='col-span-2'>{projectFlock.location.name}</div>
+          <div className='col-span-2'>{projectFlock.location?.name}</div>
 
           {/* Kandang */}
           <div
@@ -136,7 +136,7 @@ const ProjectFlockClosingForm = ({
           >
             <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Kandang
           </div>
-          <div className='col-span-2'>{projectFlockKandang.kandang.name}</div>
+          <div className='col-span-2'>{projectFlockKandang.kandang?.name}</div>
 
           {/* Jumlah DOC */}
           <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
@@ -279,7 +279,11 @@ const ProjectFlockClosingForm = ({
       <ConfirmationModal
         ref={closeModal.ref}
         type='error'
-        text={`Apakah kamu yakin ingin mengakhiri project ini ? *Pastikan persediaan produk di gudang terkait sudah kosong, dan BOP sudah selesai`}
+        text={
+          projectFlock.approval?.step_number <= 1
+            ? 'Apakah kamu yakin ingin mengakhiri project ini ? *Pastikan persediaan produk di gudang terkait sudah kosong, dan BOP sudah selesai'
+            : 'Apakah kamu yakin ingin membuka kembali project ini ? *Project ini akan kembali ke status aktif'
+        }
         secondaryButton={{
           text: 'Tidak',
         }}
diff --git a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
index 208e7894..9e5eaeef 100644
--- a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
+++ b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
@@ -903,7 +903,7 @@ const ProjectFlockForm = ({
           <div className='divider'></div>
           <div className='flex flex-col gap-4 px-4 pb-4'>
             <h2 className='text-2xl font-semibold'>
-              Estimasi Aggaran Per Flock
+              Estimasi Anggaran Per Flock
             </h2>
             <div className='flex flex-col gap-4'>
               {formik.values.project_budgets &&