diff --git a/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx b/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
index 50b258fb..47491dfa 100644
--- a/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
+++ b/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
@@ -4,12 +4,7 @@ import Card from '@/components/Card';
 import { RadioGroup, RadioGroupItem } from '@/components/input/RadioInput';
 import Tooltip from '@/components/Tooltip';
 import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
-import {
-  formatCurrency,
-  formatDate,
-  formatNumber,
-  formatTitleCase,
-} from '@/lib/helper';
+import { cn, formatCurrency, formatDate, formatNumber } from '@/lib/helper';
 import { ProjectFlock } from '@/types/api/production/project-flock';
 import { Icon } from '@iconify/react';
 import Link from 'next/link';
@@ -20,16 +15,15 @@ import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import { ProjectFlockApi } from '@/services/api/production/project-flock';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import toast from 'react-hot-toast';
-import ApprovalSteps, {
-  useApprovalSteps,
-} from '@/components/pages/ApprovalSteps';
-import {
-  PROJECT_FLOCK_APPROVAL_LINE,
-  PROJECT_FLOCK_KANDANGS_APPROVAL_LINE,
-} from '@/config/approval-line';
 import useSWR from 'swr';
-import { ProjectFlockKandangApi } from '@/services/api/production';
 import RequirePermission from '@/components/helper/RequirePermission';
+import ApprovalStepsV2 from '@/components/helper/ApprovalStepsV2';
+import { APPROVAL_WORKFLOWS } from '@/config/constant';
+import Table from '@/components/Table';
+import { ProjectFlockFormConfirmationTableType } from '../form/ProjectFlockForm';
+import { ColumnDef } from '@tanstack/react-table';
+import StatusBadge from '@/components/helper/StatusBadge';
+import { ProjectFlockKandangApi } from '@/services/api/production/project-flock-kandang';
 
 const ProjectFlockDetail = ({
   projectFlock,
@@ -40,7 +34,7 @@ const ProjectFlockDetail = ({
   const deleteModal = useModal();
   const [isDeleteLoading, setIsDeleteLoading] = useState(false);
   const [openBudgets, setOpenBudget] = useState(false);
-  const [selectedKandangId, setSelectedKamdangId] = useState<string | null>(
+  const [selectedKandangId, setSelectedKandangId] = useState<string | null>(
     null
   );
 
@@ -61,30 +55,94 @@ const ProjectFlockDetail = ({
         : null
     );
 
-  const {
-    approvals,
-    isLoading: approvalsLoading,
-    refresh: refreshApprovals,
-  } = useApprovalSteps({
-    latestApproval: projectFlock?.approval,
-    approvalLines: PROJECT_FLOCK_APPROVAL_LINE,
-    moduleName: 'PROJECT_FLOCKS',
-    moduleId: projectFlock?.id?.toString() ?? '',
-  });
+  const { data: projectFlockApprovalResponse } = useSWR(
+    projectFlock.id ? ['approval-project-flock', projectFlock.id] : undefined,
+    ([, id]) => ProjectFlockApi.getApprovalLineHistory(Number(id))
+  );
 
-  const { approvals: kandangApprovals, isLoading: kandangApprovalsLoading } =
-    useApprovalSteps({
-      latestApproval:
-        selectedKandangId && isResponseSuccess(projectFlockKandang)
-          ? projectFlockKandang?.data?.approval
-          : undefined,
-      approvalLines: PROJECT_FLOCK_KANDANGS_APPROVAL_LINE,
-      moduleName: 'PROJECT_FLOCK_KANDANGS',
-      moduleId:
-        selectedKandangId && isResponseSuccess(projectFlockKandang)
-          ? projectFlockKandang?.data?.id?.toString()
-          : '',
-    });
+  const projectFlockApproval = isResponseSuccess(projectFlockApprovalResponse)
+    ? projectFlockApprovalResponse.data
+    : undefined;
+
+  const { data: projectFlockKandangApprovalResponse } = useSWR(
+    selectedKandang?.project_flock_kandang_id
+      ? [
+          'approval-project-flock-kandang',
+          selectedKandang?.project_flock_kandang_id,
+        ]
+      : undefined,
+    ([, id]) => ProjectFlockKandangApi.getApprovalLineHistory(Number(id))
+  );
+
+  const projectFlockKandangApproval = isResponseSuccess(
+    projectFlockKandangApprovalResponse
+  )
+    ? projectFlockKandangApprovalResponse.data
+    : undefined;
+
+  const confirmationTableColumns: ColumnDef<ProjectFlockFormConfirmationTableType>[] =
+    [
+      {
+        header: 'Label',
+        accessorKey: 'label',
+        enableSorting: false,
+        cell: ({ row }) => {
+          const isSubRow = row.depth > 0;
+
+          return (
+            <>
+              {!isSubRow && row.original.label}
+
+              {isSubRow && (
+                <div
+                  className={cn('w-full min-h-full flex items-stretch gap-0')}
+                >
+                  <div className='w-px mx-4 bg-base-content/10' />
+                  <span className='p-3'>{row.original.label}</span>
+                </div>
+              )}
+            </>
+          );
+        },
+      },
+      {
+        header: 'Value',
+        accessorKey: 'value',
+        enableSorting: false,
+        cell: ({ row }) => row.original.value,
+      },
+    ];
+
+  const confirmationTableData: ProjectFlockFormConfirmationTableType[] = [
+    {
+      label: 'Tanggal',
+      value: formatDate(projectFlock.created_at, 'DD MMMM YYYY'),
+    },
+    {
+      label: 'Area',
+      value: projectFlock.area.name ?? '-',
+    },
+    {
+      label: 'Lokasi',
+      value: projectFlock.location.name ?? '-',
+    },
+    {
+      label: 'Flock',
+      value: projectFlock.flock_name ?? '-',
+    },
+    {
+      label: 'Kategori',
+      value: projectFlock.category ?? '-',
+    },
+    {
+      label: 'Standar Produksi',
+      value: projectFlock.production_standard.name ?? '-',
+    },
+    {
+      label: 'Periode',
+      value: projectFlock.period ?? '-',
+    },
+  ];
 
   const confirmationModalDeleteClickHandler = async () => {
     setIsDeleteLoading(true);
@@ -104,12 +162,14 @@ const ProjectFlockDetail = ({
 
   return (
     <>
-      <div className='h-full w-full flex flex-col gap-4'>
+      <div className='h-full w-full flex flex-col overflow-x-hidden overflow-y-auto'>
         {/* Header */}
         <DrawerHeader
-          leftIcon='mdi:close'
+          leftIcon='heroicons:chevron-left'
           leftIconHref='/production/project-flock'
-          subtitle={`Created On ${formatDate(projectFlock.created_at, 'MMM DD, YYYY')}`}
+          leftIconClassName='hover:text-gray-400'
+          subtitle='Detail Flock'
+          className='sticky top-0 z-10 bg-base-100'
         >
           <RequirePermission permissions='lti.production.project_flocks.update'>
             <Link
@@ -118,7 +178,7 @@ const ProjectFlockDetail = ({
             >
               <Tooltip content='Edit' position='bottom'>
                 <Button variant='link' className='p-0 text-neutral'>
-                  <Icon icon='mdi:square-edit-outline' width={20} height={20} />
+                  <Icon icon='heroicons:pencil-square' width={20} height={20} />
                 </Button>
               </Tooltip>
             </Link>
@@ -132,332 +192,224 @@ const ProjectFlockDetail = ({
               }}
             >
               <Tooltip content='Hapus' position='bottom'>
-                <Icon icon='mdi:trash-can-outline' width={20} height={20} />
+                <Icon icon='heroicons:trash' width={20} height={20} />
               </Tooltip>
             </Button>
           </RequirePermission>
         </DrawerHeader>
 
-        {/* Informasi Umum */}
-        <div className='border-t-1 border-gray-300'>
-          <div className='p-4 flex flex-col gap-4'>
-            <h2 className='text-2xl font-semibold'>Informasi Umum</h2>
-            {/* Status Approval */}
-            {approvals && !approvalsLoading && (
-              <div className='text-sm my-3'>
-                <ApprovalSteps approvals={approvals} />
-              </div>
-            )}
-            {/* Badge Row  */}
-            <div className='flex flex-row gap-2'>
-              <Badge
-                variant='soft'
-                color={
-                  projectFlock.approval?.step_number == 1
-                    ? 'neutral'
-                    : projectFlock.approval?.step_number == 2
-                      ? 'primary'
-                      : projectFlock.approval?.step_number == 3
-                        ? 'success'
-                        : undefined
-                }
-                className={{
-                  badge: 'rounded-lg px-2',
-                }}
-              >
-                <Icon
-                  icon='mdi:circle'
-                  width={12}
-                  height={12}
-                  color={
-                    projectFlock.approval?.step_number == 1
-                      ? 'neutral'
-                      : projectFlock.approval?.step_number == 2
-                        ? 'primary'
-                        : projectFlock.approval?.step_number == 3
-                          ? 'success'
-                          : undefined
-                  }
-                />{' '}
-                {projectFlock.approval?.step_name}
-              </Badge>
-              <div className='divider divider-horizontal p-0 m-0'></div>
-              <Badge
-                color='neutral'
-                variant='soft'
-                className={{ badge: 'rounded-lg px-2' }}
-              >
-                <Icon icon='mdi:bookmark' width={12} height={12} />
-                {` ${formatTitleCase(projectFlock.category ?? '')}`}
-              </Badge>
-            </div>
-            {/* Information Grid */}
-            <div className='grid grid-cols-3 gap-4'>
-              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
-                <Icon width={14} height={14} icon='mdi:account' /> Submitted
-              </div>
-              <div className='col-span-2'>
-                <Badge
-                  variant='soft'
-                  color='neutral'
-                  className={{
-                    badge: 'rounded-lg px-2',
-                  }}
-                >
-                  <Icon icon='mdi:account-circle' width={14} height={14} />{' '}
-                  {projectFlock.created_user?.name}
-                </Badge>
-              </div>
+        <ApprovalStepsV2
+          approvals={projectFlockApproval}
+          steps={APPROVAL_WORKFLOWS.PROJECT_FLOCKS}
+        />
 
-              {/* BARIS 1 */}
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
-              </div>
-              <div className='col-span-2'>{projectFlock?.area?.name}</div>
+        <div className='w-full p-4 flex flex-col gap-3 border-b border-base-content/10'>
+          <h4 className='text-base font-medium text-base-content/50 font-roboto'>
+            Informasi Umum
+          </h4>
 
-              {/* BARIS 2 */}
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <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-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> FCR
-              </div>
-              <div className='col-span-2'>{projectFlock?.fcr?.name}</div>
-
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' />{' '}
-                Standard
-              </div>
-              <div className='col-span-2'>
-                {projectFlock?.production_standard?.name ?? '-'}
-              </div>
-
-              {/* BARIS 3 (Terakhir - TIDAK PERLU garis di bawahnya) */}
-              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' />{' '}
-                Kategori
-              </div>
-              <div className='col-span-2'>
-                {formatTitleCase(projectFlock.category ?? '')}
-              </div>
-            </div>
-          </div>
+          <Table<ProjectFlockFormConfirmationTableType>
+            columns={confirmationTableColumns}
+            data={confirmationTableData}
+            withPagination={false}
+            pageSize={10000}
+            expanded={true}
+            getSubRows={(row) => row.subRows}
+            className={{
+              headerRowClassName: 'border-b border-base-content/10',
+              bodyRowClassName: 'border-none',
+              bodySubRowClassName: () => 'border-none',
+              bodySubRowColumnClassName: () => 'first:p-0',
+            }}
+          />
         </div>
 
-        {/* Kandang Aktif */}
-        <div className='border-t-1 border-gray-300'>
-          <div className='p-4 flex flex-col gap-4'>
-            <h2 className='text-2xl font-semibold'>Kandang Aktif</h2>
-            {kandangApprovals && !kandangApprovalsLoading && (
-              <ApprovalSteps approvals={kandangApprovals} />
-            )}
-            {/* Badge Row  */}
-            <div className='flex flex-row gap-2'>
-              <Badge
-                variant='soft'
-                color={'primary'}
-                className={{
-                  badge: 'rounded-lg px-2',
-                }}
-              >
-                <Icon
-                  icon='mdi:circle'
-                  width={12}
-                  height={12}
-                  color={'primary'}
-                />{' '}
-                Kandang Aktif ({projectFlock.kandangs?.length})
-              </Badge>
-              <div className='divider divider-horizontal p-0 m-0'></div>
-              <Badge
-                color='neutral'
-                variant='soft'
-                className={{ badge: 'rounded-lg px-2 cursor-pointer' }}
-                onClick={() => {
-                  setOpenBudget(!openBudgets);
-                }}
-              >
-                {` ${formatCurrency(
-                  (projectFlock.project_budgets ?? []).reduce(
-                    (acc, curr) => acc + curr.price * curr.qty,
-                    0
-                  )
-                )}`}
-                <Icon
-                  icon={`mdi:${openBudgets ? 'eye' : 'eye-off'}`}
-                  width={12}
-                  height={12}
-                />
-              </Badge>
-            </div>
+        <div className='w-full p-4 flex flex-col gap-3 border-b border-base-content/10'>
+          <h4 className='text-base font-medium text-base-content/50 font-roboto'>
+            Kandang Aktif
+          </h4>
 
-            {/* Card List Project Budgets */}
-            {openBudgets &&
-              (projectFlock.project_budgets ?? []).map((budget) => (
-                <Card
-                  key={budget.id}
-                  variant='bordered'
-                  className={{
-                    wrapper: 'w-full',
-                    body: 'p-3',
-                  }}
-                >
-                  <div className='flex flex-col gap-6'>
-                    <div className='flex flex-row justify-between items-center'>
-                      <div className='flex flex-row gap-2 items-center text-gray-400'>
-                        <Icon icon={'mdi:tag'} width={14} height={14} />{' '}
-                        <span>Jenis Produk</span>
-                      </div>
-                      <div className='text-end text-gray-500'>
-                        {budget?.nonstock?.name}
-                      </div>
-                    </div>
-                    <div className='flex flex-row justify-between items-center'>
-                      <div className='flex flex-row gap-2 items-center text-gray-400'>
-                        <Icon icon={'mdi:tag'} width={14} height={14} />{' '}
-                        <span>Nama Satuan</span>
-                      </div>
-                      <div className='text-end text-gray-500'>
-                        {budget?.nonstock?.uom?.name}
-                      </div>
-                    </div>
-                    <div className='flex flex-row justify-between items-center'>
-                      <div className='flex flex-row gap-2 items-center text-gray-400'>
-                        <Icon
-                          icon={'mdi:file-multiple'}
-                          width={14}
-                          height={14}
-                        />{' '}
-                        <span>Jumlah Pembelian</span>
-                      </div>
-                      <div className='text-end text-gray-500'>
-                        {formatNumber(budget.qty)}
-                      </div>
-                    </div>
-                    <div className='flex flex-row justify-between items-center'>
-                      <div className='flex flex-row gap-2 items-center text-gray-400'>
-                        <Icon icon={'mdi:file'} width={14} height={14} />{' '}
-                        <span>Harga Satuan</span>
-                      </div>
-                      <div className='text-end text-gray-500'>
-                        {formatCurrency(budget.price)}
-                      </div>
-                    </div>
-                    <div className='flex flex-row justify-between items-center'>
-                      <div className='flex flex-row gap-2 items-center text-gray-400'>
-                        <Icon icon={'mdi:calculator'} width={14} height={14} />{' '}
-                        <span>Total Harga</span>
-                      </div>
-                      <div className='text-end text-gray-500'>
-                        {formatCurrency(budget.price * budget.qty)}
-                      </div>
-                    </div>
-                  </div>
-                </Card>
-              ))}
+          <div className='flex flex-row gap-2'>
+            <StatusBadge
+              color='info'
+              text={`Kandang Aktif (${projectFlock.kandangs?.length})`}
+              className={{ badge: 'w-fit text-nowrap' }}
+            />
 
-            {/* Card Kandangs */}
-            <Card
-              variant='bordered'
-              className={{
-                wrapper: 'w-full',
-                body: 'p-3',
+            <StatusBadge
+              color='neutral'
+              onClick={() => {
+                setOpenBudget(!openBudgets);
               }}
-            >
-              <RadioGroup
-                name='gender'
+              text={
+                <>
+                  {` ${formatCurrency(
+                    (projectFlock.project_budgets ?? []).reduce(
+                      (acc, curr) => acc + curr.price * curr.qty,
+                      0
+                    )
+                  )}`}
+                  <Icon
+                    icon={`mdi:${openBudgets ? 'eye' : 'eye-off'}`}
+                    width={12}
+                    height={12}
+                  />
+                </>
+              }
+              className={{ badge: 'w-fit text-nowrap cursor-pointer' }}
+            />
+          </div>
+
+          {/* Card List Project Budgets */}
+          {openBudgets &&
+            (projectFlock.project_budgets ?? []).map((budget) => (
+              <Card
+                key={budget.id}
+                variant='bordered'
                 className={{
-                  radioWrapper: 'grid grid-cols-1 gap-6',
+                  wrapper: 'w-full rounded-lg',
+                  body: 'p-3',
                 }}
-                onChange={(e) => setSelectedKamdangId(e.target.value)}
-                value={selectedKandangId?.toString()}
-                size='md'
-                color='neutral'
-                disabled={projectFlock?.approval?.step_number == 1}
               >
-                {projectFlock.kandangs?.map((kandang) => (
-                  <div
-                    key={kandang.id}
-                    className={`grid grid-cols-2 gap-6 cursor-pointer hover:text-gray-800`}
-                    onClick={() =>
-                      projectFlock?.approval?.step_number > 1 &&
-                      setSelectedKamdangId(kandang?.id?.toString())
-                    }
-                  >
-                    <RadioGroupItem
-                      value={kandang?.id?.toString()}
-                      label={kandang?.name}
-                      disabled={projectFlock?.approval?.step_number == 1}
-                    />
-                    <div className='text-end'>
-                      <Badge
-                        className={{
-                          badge: 'rounded-lg',
-                        }}
-                      >
-                        Kapasitas {kandang?.capacity} Ekor
-                      </Badge>
+                <div className='flex flex-col gap-6'>
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='flex flex-row gap-2 items-center text-gray-400'>
+                      <Icon icon={'mdi:tag'} width={14} height={14} />{' '}
+                      <span>Jenis Produk</span>
+                    </div>
+                    <div className='text-end text-gray-500'>
+                      {budget?.nonstock?.name}
                     </div>
                   </div>
-                ))}
-              </RadioGroup>
-            </Card>
-            <div className='grid grid-cols-4 gap-3'>
-              <RequirePermission permissions='lti.production.chickins.detail'>
-                <Link
-                  href={`/production/project-flock/chickin/add/kandang?projectFlockKandangId=${selectedKandang?.project_flock_kandang_id}&projectFlockId=${projectFlock.id}`}
-                  className='m-0 p-0'
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='flex flex-row gap-2 items-center text-gray-400'>
+                      <Icon icon={'mdi:tag'} width={14} height={14} />{' '}
+                      <span>Nama Satuan</span>
+                    </div>
+                    <div className='text-end text-gray-500'>
+                      {budget?.nonstock?.uom?.name}
+                    </div>
+                  </div>
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='flex flex-row gap-2 items-center text-gray-400'>
+                      <Icon icon={'mdi:file-multiple'} width={14} height={14} />{' '}
+                      <span>Jumlah Pembelian</span>
+                    </div>
+                    <div className='text-end text-gray-500'>
+                      {formatNumber(budget.qty)}
+                    </div>
+                  </div>
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='flex flex-row gap-2 items-center text-gray-400'>
+                      <Icon icon={'mdi:file'} width={14} height={14} />{' '}
+                      <span>Harga Satuan</span>
+                    </div>
+                    <div className='text-end text-gray-500'>
+                      {formatCurrency(budget.price)}
+                    </div>
+                  </div>
+                  <div className='flex flex-row justify-between items-center'>
+                    <div className='flex flex-row gap-2 items-center text-gray-400'>
+                      <Icon icon={'mdi:calculator'} width={14} height={14} />{' '}
+                      <span>Total Harga</span>
+                    </div>
+                    <div className='text-end text-gray-500'>
+                      {formatCurrency(budget.price * budget.qty)}
+                    </div>
+                  </div>
+                </div>
+              </Card>
+            ))}
+
+          {/* Card Kandangs */}
+          <Card
+            variant='bordered'
+            className={{
+              wrapper: 'w-full rounded-lg',
+              body: 'p-3',
+            }}
+          >
+            <RadioGroup
+              name='gender'
+              className={{
+                radioWrapper: 'grid grid-cols-1 gap-6',
+              }}
+              onChange={(e) => setSelectedKandangId(e.target.value)}
+              value={selectedKandangId?.toString()}
+              size='md'
+              color='neutral'
+              disabled={projectFlock?.approval?.step_number == 1}
+            >
+              {projectFlock.kandangs?.map((kandang) => (
+                <div
+                  key={kandang.id}
+                  className={`grid grid-cols-2 gap-6 cursor-pointer hover:text-gray-800`}
+                  onClick={() =>
+                    projectFlock?.approval?.step_number > 1 &&
+                    setSelectedKandangId(kandang?.id?.toString())
+                  }
                 >
-                  <Button
-                    className='w-full px-2 py-1 text-sm'
-                    variant='outline'
-                    color='success'
-                    disabled={
-                      !selectedKandangId ||
-                      projectFlock?.approval?.step_number == 1
-                    }
-                  >
-                    Chickin <Icon icon='mdi:checkbox-marked-outline' />
-                  </Button>
-                </Link>
-              </RequirePermission>
-              <RequirePermission permissions='lti.production.project_flock_kandangs.closing.detail'>
-                <Link
-                  href={`/production/project-flock/closing?projectFlockId=${projectFlock.id}&projectFlockKandangId=${selectedKandang?.project_flock_kandang_id}`}
-                  className='m-0 p-0'
+                  <RadioGroupItem
+                    value={kandang?.id?.toString()}
+                    label={kandang?.name}
+                    disabled={projectFlock?.approval?.step_number == 1}
+                  />
+                  <div className='text-end'>
+                    <Badge
+                      className={{
+                        badge: 'rounded-lg',
+                      }}
+                    >
+                      Kapasitas {kandang?.capacity} Ekor
+                    </Badge>
+                  </div>
+                </div>
+              ))}
+            </RadioGroup>
+          </Card>
+
+          <ApprovalStepsV2
+            approvals={projectFlockKandangApproval}
+            steps={APPROVAL_WORKFLOWS.PROJECT_FLOCK_KANDANGS}
+          />
+
+          <div className='grid grid-cols-4 gap-3'>
+            <RequirePermission permissions='lti.production.chickins.detail'>
+              <Link
+                href={`/production/project-flock/chickin/add/kandang?projectFlockKandangId=${selectedKandang?.project_flock_kandang_id}&projectFlockId=${projectFlock.id}`}
+                className='m-0 p-0'
+              >
+                <Button
+                  className='w-full px-2 py-1 text-sm'
+                  variant='outline'
+                  color='success'
+                  disabled={
+                    !selectedKandangId ||
+                    projectFlock?.approval?.step_number == 1
+                  }
                 >
-                  <Button
-                    className='w-full px-2 py-1 text-sm'
-                    variant='outline'
-                    color='error'
-                    disabled={
-                      !selectedKandangId ||
-                      projectFlock?.approval?.step_number == 1
-                    }
-                  >
-                    Close <Icon icon='mdi:checkbox-marked-circle-outline' />
-                  </Button>
-                </Link>
-              </RequirePermission>
-            </div>
+                  Chickin <Icon icon='mdi:checkbox-marked-outline' />
+                </Button>
+              </Link>
+            </RequirePermission>
+            <RequirePermission permissions='lti.production.project_flock_kandangs.closing.detail'>
+              <Link
+                href={`/production/project-flock/closing?projectFlockId=${projectFlock.id}&projectFlockKandangId=${selectedKandang?.project_flock_kandang_id}`}
+                className='m-0 p-0'
+              >
+                <Button
+                  className='w-full px-2 py-1 text-sm'
+                  variant='outline'
+                  color='error'
+                  disabled={
+                    !selectedKandangId ||
+                    projectFlock?.approval?.step_number == 1
+                  }
+                >
+                  Close <Icon icon='mdi:checkbox-marked-circle-outline' />
+                </Button>
+              </Link>
+            </RequirePermission>
           </div>
         </div>
       </div>