diff --git a/src/app/report/marketing/page.tsx b/src/app/report/marketing/page.tsx
index 87ed7a1a..57035844 100644
--- a/src/app/report/marketing/page.tsx
+++ b/src/app/report/marketing/page.tsx
@@ -1,11 +1,7 @@
 import MarketingReportContent from '@/components/pages/report/marketing/MarketingReportContent';
 
 const MarketingReportPage = () => {
-  return (
-    <section className='w-full p-4'>
-      <MarketingReportContent />
-    </section>
-  );
+  return <MarketingReportContent />;
 };
 
 export default MarketingReportPage;
diff --git a/src/components/pages/report/marketing/MarketingReportContent.tsx b/src/components/pages/report/marketing/MarketingReportContent.tsx
index e38a39d4..9277311f 100644
--- a/src/components/pages/report/marketing/MarketingReportContent.tsx
+++ b/src/components/pages/report/marketing/MarketingReportContent.tsx
@@ -1,47 +1,42 @@
 'use client';
 
-import { JSX, useState } from 'react';
-
+import { useState } from 'react';
 import Tabs from '@/components/Tabs';
 import DailyMarketingReportContent from '@/components/pages/report/marketing/tab/DailyMarketingReportContent';
 import HppPerKandangTab from '@/components/pages/report/marketing/tab/HppPerKandangTab';
-
-type MarketingReportTabType =
-  | 'daily'
-  | 'transaction'
-  | 'hpp-comparison'
-  | 'daily-hpp';
-
-const marketingReportTabs: {
-  id: MarketingReportTabType;
-  label: string;
-  content: JSX.Element;
-}[] = [
-  {
-    id: 'daily',
-    label: 'Penjualan Harian',
-    content: <DailyMarketingReportContent />,
-  },
-  {
-    id: 'daily-hpp',
-    label: 'HPP Harian Kandang',
-    content: <HppPerKandangTab />,
-  },
-];
+import { useMarketingTabStore } from '@/stores/marketing-tab/marketing-tab.store';
 
 const MarketingReportContent = () => {
-  const [activeTab, setActiveTab] = useState<string>('daily');
+  const [activeTabId, setActiveTabId] = useState<string>('1');
+  const tabActions = useMarketingTabStore((state) => state.tabActions);
+
+  const tabs = [
+    {
+      id: '1',
+      label: 'Penjualan Harian',
+      content: <DailyMarketingReportContent />,
+    },
+    {
+      id: '2',
+      label: 'HPP Harian Kandang',
+      content: <HppPerKandangTab tabId={'2'} />,
+    },
+  ];
 
   return (
-    <section className='w-full max-w-full pb-16'>
+    <section className='w-full'>
       <Tabs
-        activeTabId={activeTab}
-        onTabChange={setActiveTab}
-        tabs={marketingReportTabs}
-        variant='lifted'
+        tabs={tabs}
+        variant='boxed'
+        activeTabId={activeTabId}
+        onTabChange={setActiveTabId}
         className={{
-          content: '-m-px pl-px',
+          tabHeaderWrapper:
+            'justify-between items-center p-3 border-b border-base-content/10',
+          tab: 'w-fit',
+          content: 'p-0 m-0',
         }}
+        sideContent={tabActions[activeTabId] || null}
       />
     </section>
   );
diff --git a/src/components/pages/report/marketing/filter/HppPerKandangFilter.ts b/src/components/pages/report/marketing/filter/HppPerKandangFilter.ts
new file mode 100644
index 00000000..57d2dcd2
--- /dev/null
+++ b/src/components/pages/report/marketing/filter/HppPerKandangFilter.ts
@@ -0,0 +1,40 @@
+import * as yup from 'yup';
+
+export type HppPerKandangFilterType = {
+  area_id: string | null;
+  location_id: string | null;
+  kandang_id: string | null;
+  weight_min: string | null;
+  weight_max: string | null;
+  period: string | null;
+  sort_by: string | null;
+  show_unrecorded: boolean | null;
+};
+
+export const HppPerKandangFilterSchema = yup.object({
+  area_id: yup.string().nullable(),
+  location_id: yup.string().nullable(),
+  kandang_id: yup.string().nullable(),
+  weight_min: yup.string().nullable(),
+  weight_max: yup
+    .string()
+    .nullable()
+    .test(
+      'is-greater-than-min',
+      'Rentang bobot max tidak boleh lebih kecil dari min',
+      function (value) {
+        const { weight_min } = this.parent;
+        if (!weight_min || !value) return true;
+        const weightMinNum = parseFloat(weight_min) || 0;
+        const weightMaxNum = parseFloat(value) || 0;
+        return weightMaxNum >= weightMinNum;
+      }
+    ),
+  period: yup.string().required('Periode wajib diisi'),
+  sort_by: yup.string().nullable(),
+  show_unrecorded: yup.boolean().nullable(),
+});
+
+export type HppPerKandangFilterValues = yup.InferType<
+  typeof HppPerKandangFilterSchema
+>;
diff --git a/src/components/pages/report/marketing/skeleton/HppPerKandangSkeleton.tsx b/src/components/pages/report/marketing/skeleton/HppPerKandangSkeleton.tsx
new file mode 100644
index 00000000..42a6cf56
--- /dev/null
+++ b/src/components/pages/report/marketing/skeleton/HppPerKandangSkeleton.tsx
@@ -0,0 +1,37 @@
+import DataStateSkeleton from '@/components/helper/skeleton/DataStateSkeleton';
+import Table from '@/components/Table';
+import { HppPerKandangReport } from '@/types/api/report/hpp-per-kandang';
+import { ColumnDef } from '@tanstack/react-table';
+
+const HppPerKandangSkeleton = ({
+  columns,
+  icon,
+  title,
+  subtitle,
+}: {
+  columns: ColumnDef<HppPerKandangReport['rows'][0]>[];
+  icon: React.ReactNode;
+  title: string;
+  subtitle: string;
+}) => {
+  return (
+    <div className='relative size-full'>
+      <Table
+        data={[]}
+        columns={columns}
+        isLoading={true}
+        className={{
+          skeletonCellClassName: 'animate-none w-full h-5 bg-base-content/4',
+          headerColumnClassName: 'whitespace-nowrap',
+          containerClassName: 'mb-0 overflow-hidden',
+          tableWrapperClassName: 'overflow-hidden',
+        }}
+      />
+      <div className='absolute inset-0 flex items-center justify-center'>
+        <DataStateSkeleton icon={icon} title={title} description={subtitle} />
+      </div>
+    </div>
+  );
+};
+
+export default HppPerKandangSkeleton;
diff --git a/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx b/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx
index c0371abf..514edcb9 100644
--- a/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx
+++ b/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx
@@ -1,11 +1,6 @@
 import { useState, useMemo, useCallback } from 'react';
-import { ChangeEventHandler } from 'react';
 import useSWR from 'swr';
-import Card from '@/components/Card';
-import SelectInput, {
-  useSelect,
-  OptionType,
-} from '@/components/input/SelectInput';
+import { useSelect } from '@/components/input/SelectInput';
 import DateInput from '@/components/input/DateInput';
 import NumberInput from '@/components/input/NumberInput';
 import { AreaApi } from '@/services/api/master-data';
@@ -21,7 +16,6 @@ import {
   HppPerKandangPerWeightRange,
 } from '@/types/api/report/hpp-per-kandang';
 import { isResponseSuccess } from '@/lib/api-helper';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
 import Button from '@/components/Button';
 import Dropdown from '@/components/Dropdown';
 import MenuItem from '@/components/menu/MenuItem';
@@ -30,8 +24,35 @@ import { generateHppPerKandangPDF } from '@/components/pages/report/marketing/ex
 import { generateHppPerKandangExcel } from '@/components/pages/report/marketing/export/HppPerkandangExportXLSX';
 import toast from 'react-hot-toast';
 import { Icon } from '@iconify/react';
+import { useFormik } from 'formik';
+import {
+  HppPerKandangFilterSchema,
+  HppPerKandangFilterType,
+} from '@/components/pages/report/marketing/filter/HppPerKandangFilter';
+import SelectInputCheckbox from '@/components/input/SelectInputCheckbox';
+import SelectInputRadio from '@/components/input/SelectInputRadio';
+import Modal, { useModal } from '@/components/Modal';
+import { cn } from '@/lib/helper';
+import { useMarketingTabStore } from '@/stores/marketing-tab/marketing-tab.store';
+import HppPerKandangSkeleton from '@/components/pages/report/marketing/skeleton/HppPerKandangSkeleton';
+import { useEffect as useEffectHook } from 'react';
 
-const HppPerKandangTab = () => {
+interface HppPerKandangTabProps {
+  tabId: string;
+}
+
+interface FilterParams {
+  area_id?: string;
+  location_id?: string;
+  kandang_id?: string;
+  weight_min?: string;
+  weight_max?: string;
+  period?: string;
+  sort_by?: string;
+  show_unrecorded?: boolean;
+}
+
+const HppPerKandangTab = ({ tabId }: HppPerKandangTabProps) => {
   // ===== STATE MANAGEMENT =====
   const [isPdfExportLoading, setIsPdfExportLoading] = useState(false);
   const [isExcelExportLoading, setIsExcelExportLoading] = useState(false);
@@ -42,190 +63,229 @@ const HppPerKandangTab = () => {
 
   // ===== VALIDATION STATE =====
   const [weightMaxError, setWeightMaxError] = useState<string>('');
+  const [dateErrorShown, setDateErrorShown] = useState(false);
 
-  // ===== TABLE FILTER STATE =====
-  const { state: tableFilterState, updateFilter } = useTableFilter({
-    initial: {
-      area_id: [] as string[],
-      location_id: [] as string[],
-      kandang_id: [] as string[],
-      weight_min: '',
-      weight_max: '',
-      period: '',
-      sort_by: '',
-      show_unrecorded: false,
-    },
-    paramMap: {
-      page: 'page',
-      pageSize: 'limit',
-    },
-  });
+  // ===== FILTER STATE =====
+  const [filterParams, setFilterParams] = useState<FilterParams>({});
 
-  const {
-    setInputValue: setAreaInputValue,
-    options: areaOptions,
-    isLoadingOptions: isLoadingAreas,
-    loadMore: loadMoreAreas,
-  } = useSelect(AreaApi.basePath, 'id', 'name', 'search');
+  const filterModal = useModal();
 
-  const {
-    setInputValue: setLocationInputValue,
-    options: locationOptions,
-    isLoadingOptions: isLoadingLocations,
-    loadMore: loadMoreLocations,
-  } = useSelect(LocationApi.basePath, 'id', 'name', 'search');
-
-  const {
-    setInputValue: setKandangInputValue,
-    options: kandangOptions,
-    isLoadingOptions: isLoadingKandangs,
-    loadMore: loadMoreKandangs,
-  } = useSelect(
-    ProjectFlockKandangApi.basePath,
+  // ===== OPTIONS =====
+  const { options: areaOptions, isLoadingOptions: isLoadingAreas } = useSelect(
+    AreaApi.basePath,
     'id',
-    'name_with_period',
+    'name',
     'search'
   );
 
-  const showUnrecordedOptions: OptionType[] = [
-    { value: 'false', label: 'Sembunyikan' },
-    { value: 'true', label: 'Tampilkan' },
-  ];
+  const { options: locationOptions, isLoadingOptions: isLoadingLocations } =
+    useSelect(LocationApi.basePath, 'id', 'name', 'search');
 
-  const areaChangeHandler = useCallback(
-    (val: OptionType | OptionType[] | null) => {
-      const arr = Array.isArray(val) ? val : val ? [val] : [];
-      updateFilter(
-        'area_id',
-        arr.map((v) => String((v as OptionType).value))
-      );
-      setIsSubmitted(false);
-    },
-    [updateFilter]
+  const { options: kandangOptions, isLoadingOptions: isLoadingKandangs } =
+    useSelect(
+      ProjectFlockKandangApi.basePath,
+      'id',
+      'name_with_period',
+      'search'
+    );
+
+  const showUnrecordedOptions = useMemo(
+    () => [
+      { value: 'false', label: 'Sembunyikan' },
+      { value: 'true', label: 'Tampilkan' },
+    ],
+    []
   );
 
-  const locationChangeHandler = useCallback(
-    (val: OptionType | OptionType[] | null) => {
-      const arr = Array.isArray(val) ? val : val ? [val] : [];
-      updateFilter(
-        'location_id',
-        arr.map((v) => String((v as OptionType).value))
-      );
-      setIsSubmitted(false);
+  const handleFilterModalOpen = () => {
+    filterModal.openModal();
+    formik.validateForm();
+  };
+
+  // ===== FORMIK SETUP =====
+  const formik = useFormik<HppPerKandangFilterType>({
+    initialValues: {
+      area_id: null,
+      location_id: null,
+      kandang_id: null,
+      weight_min: null,
+      weight_max: null,
+      period: null,
+      sort_by: null,
+      show_unrecorded: null,
     },
-    [updateFilter]
-  );
-
-  const kandangChangeHandler = useCallback(
-    (val: OptionType | OptionType[] | null) => {
-      const arr = Array.isArray(val) ? val : val ? [val] : [];
-      updateFilter(
-        'kandang_id',
-        arr.map((v) => String((v as OptionType).value))
-      );
-      setIsSubmitted(false);
+    validationSchema: HppPerKandangFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      setFilterParams({
+        area_id: values.area_id || undefined,
+        location_id: values.location_id || undefined,
+        kandang_id: values.kandang_id || undefined,
+        weight_min: values.weight_min || undefined,
+        weight_max: values.weight_max || undefined,
+        period: values.period || undefined,
+        sort_by: values.sort_by || undefined,
+        show_unrecorded:
+          values.show_unrecorded !== null ? values.show_unrecorded : undefined,
+      });
+      filterModal.closeModal();
+      setIsSubmitted(true);
+      setSubmitting(false);
     },
-    [updateFilter]
-  );
-
-  const weightMinChangeHandler = useCallback<
-    ChangeEventHandler<HTMLInputElement>
-  >(
-    (e) => {
-      const val = e.target.value;
-      updateFilter('weight_min', val ? String(parseFloat(val) || 0) : '');
+    onReset: () => {
+      setFilterParams({});
       setIsSubmitted(false);
+      setWeightMaxError('');
+      if (dateErrorShown) {
+        toast.dismiss();
+        setDateErrorShown(false);
+      }
+    },
+  });
 
-      if (weightMaxError) {
+  // ===== WEIGHT CHANGE HANDLERS =====
+  const handleWeightMinChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const value = e.target.value;
+      formik.setFieldValue('weight_min', value || null);
+
+      if (value && formik.values.weight_max) {
+        const weightMin = parseFloat(value) || 0;
+        const weightMax = parseFloat(formik.values.weight_max) || 0;
+
+        if (weightMax < weightMin) {
+          setWeightMaxError(
+            'Rentang bobot max tidak boleh lebih kecil dari min'
+          );
+          if (!dateErrorShown) {
+            toast.error('Rentang bobot max tidak boleh lebih kecil dari min', {
+              duration: Infinity,
+            });
+            setDateErrorShown(true);
+          }
+        } else {
+          setWeightMaxError('');
+          if (dateErrorShown) {
+            toast.dismiss();
+            setDateErrorShown(false);
+          }
+        }
+      } else {
         setWeightMaxError('');
       }
     },
-    [updateFilter, weightMaxError]
+    [formik, dateErrorShown]
   );
 
-  const weightMaxChangeHandler = useCallback<
-    ChangeEventHandler<HTMLInputElement>
-  >(
-    (e) => {
-      const val = e.target.value;
-      const weightMax = val ? parseFloat(val) || 0 : 0;
-      const weightMin = tableFilterState.weight_min
-        ? parseFloat(tableFilterState.weight_min)
-        : 0;
+  const handleWeightMaxChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const value = e.target.value;
+      formik.setFieldValue('weight_max', value || null);
 
-      if (weightMax < weightMin) {
-        setWeightMaxError('Rentang bobot max tidak boleh lebih kecil dari min');
-        toast.error('Rentang bobot max tidak boleh lebih kecil dari min');
-        return;
+      if (value && formik.values.weight_min) {
+        const weightMin = parseFloat(formik.values.weight_min) || 0;
+        const weightMax = parseFloat(value) || 0;
+
+        if (weightMax < weightMin) {
+          setWeightMaxError(
+            'Rentang bobot max tidak boleh lebih kecil dari min'
+          );
+          if (!dateErrorShown) {
+            toast.error('Rentang bobot max tidak boleh lebih kecil dari min', {
+              duration: Infinity,
+            });
+            setDateErrorShown(true);
+          }
+          return;
+        }
       }
 
       setWeightMaxError('');
-      updateFilter('weight_max', val ? String(weightMax) : '');
-      setIsSubmitted(false);
+      if (dateErrorShown) {
+        toast.dismiss();
+        setDateErrorShown(false);
+      }
     },
-    [updateFilter, tableFilterState.weight_min]
+    [formik, dateErrorShown]
   );
 
-  const periodChangeHandler = useCallback<ChangeEventHandler<HTMLInputElement>>(
-    (e) => {
-      const val = e.target.value;
-      updateFilter('period', val || '');
-      setIsSubmitted(false);
-    },
-    [updateFilter]
-  );
+  // ===== DERIVED VALUES =====
+  const areaIdsValue = useMemo(() => {
+    if (!formik.values.area_id) return [];
+    const ids = formik.values.area_id.split(',');
+    return areaOptions.filter((opt) => ids.includes(String(opt.value)));
+  }, [formik.values.area_id, areaOptions]);
 
-  const showUnrecordedChangeHandler = useCallback(
-    (val: OptionType | OptionType[] | null) => {
-      const newVal = val as OptionType;
-      updateFilter('show_unrecorded', newVal?.value === 'true');
-      setIsSubmitted(false);
-    },
-    [updateFilter]
-  );
+  const locationIdsValue = useMemo(() => {
+    if (!formik.values.location_id) return [];
+    const ids = formik.values.location_id.split(',');
+    return locationOptions.filter((opt) => ids.includes(String(opt.value)));
+  }, [formik.values.location_id, locationOptions]);
 
-  const resetFilters = useCallback(() => {
-    updateFilter('area_id', []);
-    updateFilter('location_id', []);
-    updateFilter('kandang_id', []);
-    updateFilter('weight_min', '');
-    updateFilter('weight_max', '');
-    updateFilter('period', '');
-    updateFilter('sort_by', '');
-    updateFilter('show_unrecorded', false);
-    setIsSubmitted(false);
-  }, [updateFilter]);
+  const kandangIdsValue = useMemo(() => {
+    if (!formik.values.kandang_id) return [];
+    const ids = formik.values.kandang_id.split(',');
+    return kandangOptions.filter((opt) => ids.includes(String(opt.value)));
+  }, [formik.values.kandang_id, kandangOptions]);
 
-  const handleSubmit = useCallback(() => {
-    if (!tableFilterState.period) {
-      toast.error('Periode wajib diisi');
-      return;
+  const showUnrecordedValue = useMemo(() => {
+    if (formik.values.show_unrecorded === null) return null;
+    return (
+      showUnrecordedOptions.find(
+        (opt) => opt.value === String(formik.values.show_unrecorded)
+      ) || null
+    );
+  }, [formik.values.show_unrecorded, showUnrecordedOptions]);
+
+  // ===== ACTIVE FILTERS COUNT =====
+  const activeFiltersCount = useMemo(() => {
+    let count = 0;
+
+    if (filterParams.period) {
+      count += 1;
     }
-    setIsSubmitted(true);
-  }, [tableFilterState.period]);
+
+    if (filterParams.area_id) {
+      count += 1;
+    }
+
+    if (filterParams.location_id) {
+      count += 1;
+    }
+
+    if (filterParams.kandang_id) {
+      count += 1;
+    }
+
+    if (filterParams.weight_min || filterParams.weight_max) {
+      count += 1;
+    }
+
+    if (filterParams.show_unrecorded !== undefined) {
+      count += 1;
+    }
+
+    if (filterParams.sort_by) {
+      count += 1;
+    }
+
+    return count;
+  }, [filterParams]);
+
+  const hasFilters = activeFiltersCount > 0;
 
   // ===== DATA FETCHING =====
   const { data: hppPerKandang, isLoading } = useSWR(
     isSubmitted
       ? () => {
           const params = {
-            area_id:
-              tableFilterState.area_id.length > 0
-                ? tableFilterState.area_id.join(',')
-                : undefined,
-            location_id:
-              tableFilterState.location_id.length > 0
-                ? tableFilterState.location_id.join(',')
-                : undefined,
-            kandang_id:
-              tableFilterState.kandang_id.length > 0
-                ? tableFilterState.kandang_id.join(',')
-                : undefined,
-            weight_min: tableFilterState.weight_min || undefined,
-            weight_max: tableFilterState.weight_max || undefined,
-            period: tableFilterState.period || undefined,
-            sort_by: tableFilterState.sort_by || undefined,
-            show_unrecorded: tableFilterState.show_unrecorded,
+            area_id: filterParams.area_id,
+            location_id: filterParams.location_id,
+            kandang_id: filterParams.kandang_id,
+            weight_min: filterParams.weight_min,
+            weight_max: filterParams.weight_max,
+            period: filterParams.period,
+            sort_by: filterParams.sort_by,
+            show_unrecorded: filterParams.show_unrecorded,
           };
 
           return ['hpp-per-kandang-report', params];
@@ -275,23 +335,14 @@ const HppPerKandangTab = () => {
   const hppPerKandangExport =
     useCallback(async (): Promise<HppPerKandangReport | null> => {
       const params = {
-        area_id:
-          tableFilterState.area_id.length > 0
-            ? tableFilterState.area_id.join(',')
-            : undefined,
-        location_id:
-          tableFilterState.location_id.length > 0
-            ? tableFilterState.location_id.join(',')
-            : undefined,
-        kandang_id:
-          tableFilterState.kandang_id.length > 0
-            ? tableFilterState.kandang_id.join(',')
-            : undefined,
-        weight_min: tableFilterState.weight_min || undefined,
-        weight_max: tableFilterState.weight_max || undefined,
-        period: tableFilterState.period || undefined,
-        sort_by: tableFilterState.sort_by || undefined,
-        show_unrecorded: tableFilterState.show_unrecorded,
+        area_id: filterParams.area_id,
+        location_id: filterParams.location_id,
+        kandang_id: filterParams.kandang_id,
+        weight_min: filterParams.weight_min,
+        weight_max: filterParams.weight_max,
+        period: filterParams.period,
+        sort_by: filterParams.sort_by,
+        show_unrecorded: filterParams.show_unrecorded,
         limit: 10000,
         page: 1,
       };
@@ -308,7 +359,7 @@ const HppPerKandangTab = () => {
       );
 
       return isResponseSuccess(response) ? response.data : null;
-    }, [tableFilterState]);
+    }, [filterParams]);
 
   // ===== TABLE COLUMNS DEFINITION =====
   const allFeedSuppliers = useMemo(() => {
@@ -373,38 +424,32 @@ const HppPerKandangTab = () => {
         return;
       }
 
-      const areaName =
-        tableFilterState.area_id.length > 0
-          ? tableFilterState.area_id
-              .map(
-                (id) =>
-                  areaOptions.find((opt) => opt.value === Number(id))?.label
-              )
-              .filter(Boolean)
-              .join(', ') || 'Semua Area'
-          : 'Semua Area';
+      const areaName = filterParams.area_id
+        ? areaOptions
+            .filter((opt) =>
+              filterParams.area_id?.split(',').includes(String(opt.value))
+            )
+            .map((opt) => opt.label)
+            .join(', ') || 'Semua Area'
+        : 'Semua Area';
 
-      const locationName =
-        tableFilterState.location_id.length > 0
-          ? tableFilterState.location_id
-              .map(
-                (id) =>
-                  locationOptions.find((opt) => opt.value === Number(id))?.label
-              )
-              .filter(Boolean)
-              .join(', ') || 'Semua Lokasi'
-          : 'Semua Lokasi';
+      const locationName = filterParams.location_id
+        ? locationOptions
+            .filter((opt) =>
+              filterParams.location_id?.split(',').includes(String(opt.value))
+            )
+            .map((opt) => opt.label)
+            .join(', ') || 'Semua Lokasi'
+        : 'Semua Lokasi';
 
-      const kandangName =
-        tableFilterState.kandang_id.length > 0
-          ? tableFilterState.kandang_id
-              .map(
-                (id) =>
-                  kandangOptions.find((opt) => opt.value === Number(id))?.label
-              )
-              .filter(Boolean)
-              .join(', ') || 'Semua Kandang'
-          : 'Semua Kandang';
+      const kandangName = filterParams.kandang_id
+        ? kandangOptions
+            .filter((opt) =>
+              filterParams.kandang_id?.split(',').includes(String(opt.value))
+            )
+            .map((opt) => opt.label)
+            .join(', ') || 'Semua Kandang'
+        : 'Semua Kandang';
 
       await generateHppPerKandangPDF(
         {
@@ -413,11 +458,12 @@ const HppPerKandangTab = () => {
             area_name: areaName,
             location_name: locationName,
             kandang_name: kandangName,
-            period: tableFilterState.period,
-            weight_min: tableFilterState.weight_min,
-            weight_max: tableFilterState.weight_max,
-            show_unrecorded: tableFilterState.show_unrecorded.toString(),
-            sort_by: tableFilterState.sort_by,
+            period: filterParams.period,
+            weight_min: filterParams.weight_min,
+            weight_max: filterParams.weight_max,
+            show_unrecorded:
+              filterParams.show_unrecorded?.toString() || 'false',
+            sort_by: filterParams.sort_by,
           },
         },
         allFeedSuppliers,
@@ -432,7 +478,7 @@ const HppPerKandangTab = () => {
     }
   }, [
     hppPerKandangExport,
-    tableFilterState,
+    filterParams,
     areaOptions,
     locationOptions,
     kandangOptions,
@@ -440,6 +486,91 @@ const HppPerKandangTab = () => {
     allDocSuppliers,
   ]);
 
+  // ===== REGISTER TAB ACTIONS TO STORE =====
+  const setTabActions = useMarketingTabStore((state) => state.setTabActions);
+  const clearTabActions = useMarketingTabStore(
+    (state) => state.clearTabActions
+  );
+
+  useEffectHook(() => {
+    setTabActions(
+      tabId,
+      <div className='flex flex-row gap-3'>
+        <Button
+          variant='outline'
+          color='none'
+          onClick={handleFilterModalOpen}
+          className={cn(
+            'px-3 py-2.5',
+            'rounded-lg! font-semibold text-sm gap-1.5',
+            'text-sm text-base-content/50 border border-base-content/10 shadow-button-soft',
+            hasFilters && 'border-primary-gradient text-primary'
+          )}
+        >
+          <Icon icon='heroicons:funnel' width={18} height={18} />
+          Filter
+          {hasFilters && (
+            <span className='w-5 h-5 text-white bg-[#FF3535] rounded-lg border border-base-300 flex items-center justify-center text-xs'>
+              {activeFiltersCount}
+            </span>
+          )}
+        </Button>
+
+        <Dropdown
+          trigger={
+            <Button
+              variant='outline'
+              color='none'
+              isLoading={isAnyExportLoading}
+              className={cn(
+                'px-3 py-2.5',
+                'rounded-lg font-semibold text-sm gap-1.5',
+                'text-sm text-base-content/50 border border-base-content/10 shadow-button-soft'
+              )}
+            >
+              <Icon icon='heroicons:cloud-arrow-down' width={20} height={20} />
+              Export
+              <div className='w-6.5 h-5 flex items-center justify-center border-l border-base-content/10'>
+                <Icon width={14} height={14} icon='heroicons:chevron-down' />
+              </div>
+            </Button>
+          }
+          align='end'
+          className={{
+            content:
+              'mt-1 p-0 w-full shadow-button-soft border border-base-content/10 rounded-lg',
+          }}
+        >
+          <Menu className='p-0 w-full'>
+            <MenuItem
+              className='text-sm p-3'
+              title='Excel'
+              onClick={handleExportExcel}
+            />
+            <MenuItem
+              className='text-sm p-3'
+              title='PDF'
+              onClick={handleExportPDF}
+            />
+          </Menu>
+        </Dropdown>
+      </div>
+    );
+  }, [
+    tabId,
+    hasFilters,
+    activeFiltersCount,
+    isAnyExportLoading,
+    filterModal.open,
+    setTabActions,
+  ]);
+
+  useEffectHook(() => {
+    return () => {
+      clearTabActions(tabId);
+    };
+  }, [tabId, clearTabActions]);
+
   const getTableColumns = (): ColumnDef<HppPerKandangReport['rows'][0]>[] => {
     const tableColumns: ColumnDef<HppPerKandangReport['rows'][0]>[] = [
       {
@@ -682,161 +813,50 @@ const HppPerKandangTab = () => {
   );
 
   return (
-    <div className='w-full p-0 sm:p-4'>
-      <Card
-        subtitle={
-          period
-            ? `Laporan > HPP Harian Kandang (${period})`
-            : 'Laporan > HPP Harian Kandang'
-        }
-        className={{ wrapper: 'w-full', body: 'p-1!' }}
-      >
-        <div className='grid md:grid-cols-3 grid-cols-1 gap-4'>
-          <SelectInput
-            label='Area'
-            placeholder='Pilih Area'
-            isMulti
-            options={areaOptions}
-            value={areaOptions.filter((opt) =>
-              (tableFilterState.area_id || [])
-                .map(String)
-                .includes(String(opt.value))
-            )}
-            onChange={areaChangeHandler}
-            onInputChange={setAreaInputValue}
-            onMenuScrollToBottom={loadMoreAreas}
-            isLoading={isLoadingAreas}
-            closeMenuOnSelect={false}
-            hideSelectedOptions={false}
-            isClearable
-          />
-          <SelectInput
-            label='Lokasi'
-            placeholder='Pilih Lokasi'
-            isMulti
-            options={locationOptions}
-            value={locationOptions.filter((opt) =>
-              (tableFilterState.location_id || [])
-                .map(String)
-                .includes(String(opt.value))
-            )}
-            onChange={locationChangeHandler}
-            onInputChange={setLocationInputValue}
-            onMenuScrollToBottom={loadMoreLocations}
-            isLoading={isLoadingLocations}
-            closeMenuOnSelect={false}
-            hideSelectedOptions={false}
-            isClearable
-          />
-          <SelectInput
-            label='Kandang'
-            placeholder='Pilih Kandang'
-            isMulti
-            options={kandangOptions}
-            value={kandangOptions.filter((opt) =>
-              (tableFilterState.kandang_id || [])
-                .map(String)
-                .includes(String(opt.value))
-            )}
-            onChange={kandangChangeHandler}
-            onInputChange={setKandangInputValue}
-            onMenuScrollToBottom={loadMoreKandangs}
-            isLoading={isLoadingKandangs}
-            closeMenuOnSelect={false}
-            hideSelectedOptions={false}
-            isClearable
-          />
-        </div>
-
-        <div className='grid md:grid-cols-3 grid-cols-1 gap-4'>
-          <div className='flex flex-row gap-4'>
-            <NumberInput
-              label='Rentang Bobot Min (Kg)'
-              name='weight_min'
-              placeholder='Masukkan bobot minimum'
-              value={tableFilterState.weight_min}
-              onChange={weightMinChangeHandler}
-            />
-            <NumberInput
-              label='Rentang Bobot Max (Kg)'
-              name='weight_max'
-              placeholder='Masukkan bobot maximum'
-              value={tableFilterState.weight_max}
-              onChange={weightMaxChangeHandler}
-              isError={!!weightMaxError}
-              errorMessage={weightMaxError}
-            />
-          </div>
-          <DateInput
-            label='Periode'
-            name='period'
-            placeholder='Pilih Periode'
-            value={tableFilterState.period}
-            onChange={periodChangeHandler}
-            required
-          />
-          <SelectInput
-            label='Tampilkan Kandang Tanpa Recording'
-            placeholder='Pilih Opsi'
-            options={showUnrecordedOptions}
-            value={
-              tableFilterState.show_unrecorded
-                ? showUnrecordedOptions.find((opt) => opt.value === 'true') ||
-                  null
-                : showUnrecordedOptions.find((opt) => opt.value === 'false') ||
-                  null
-            }
-            onChange={showUnrecordedChangeHandler}
-          />
-        </div>
-
-        <div className='mt-4 flex justify-end gap-2 [&_button]:px-4'>
-          <Button
-            color='primary'
-            onClick={handleSubmit}
-            disabled={!!weightMaxError}
-          >
-            <Icon icon='heroicons:magnifying-glass' width={20} height={20} />
-            Cari
-          </Button>
-          <Button color='warning' onClick={resetFilters}>
-            <Icon icon='heroicons-outline:refresh' width={20} height={20} />
-            Reset
-          </Button>
-          <Dropdown
-            trigger={
-              <Button color='success' isLoading={isAnyExportLoading}>
-                Export
-                <Icon
-                  icon='heroicons-outline:download'
-                  width={20}
-                  height={20}
-                />
-              </Button>
-            }
-            align='end'
-          >
-            <Menu className='w-32'>
-              <MenuItem title='Excel' onClick={handleExportExcel} />
-              <MenuItem title='PDF' onClick={handleExportPDF} />
-            </Menu>
-          </Dropdown>
-        </div>
-
-        <div className='divider'></div>
-
+    <>
+      <div className='w-full p-0 sm:p-3 flex flex-col gap-3'>
         {!isSubmitted ? (
-          <div className='mt-6 text-center text-gray-500'>
-            Silakan pilih filter dan klik tombol Cari untuk menampilkan data.
-          </div>
+          <HppPerKandangSkeleton
+            columns={getTableColumns()}
+            icon={
+              <Icon
+                icon='heroicons:funnel'
+                className='text-white'
+                width={20}
+                height={20}
+              />
+            }
+            title='No Filters Selected'
+            subtitle='Please choose filters to narrow down your results and make your search easier.'
+          />
         ) : isLoading ? (
-          <div className='w-full flex flex-row justify-center items-center p-4'>
-            <span className='loading loading-spinner loading-xl' />
-          </div>
+          <HppPerKandangSkeleton
+            columns={getTableColumns()}
+            icon={
+              <Icon
+                icon='heroicons:document-report'
+                className='text-white'
+                width={20}
+                height={20}
+              />
+            }
+            title='Memuat Data HPP Per Kandang'
+            subtitle='Silakan tunggu sebentar...'
+          />
         ) : data.length === 0 ? (
-          <div className='mt-6 text-center text-gray-500'>
-            Tidak ada data yang dapat ditampilkan...
-          </div>
+          <HppPerKandangSkeleton
+            columns={getTableColumns()}
+            icon={
+              <Icon
+                icon='heroicons:chart-bar'
+                className='text-white'
+                width={20}
+                height={20}
+              />
+            }
+            title='Data Not Yet Available'
+            subtitle='Please change your filters to get the data.'
+          />
         ) : (
           <Table
             data={data}
@@ -844,8 +864,8 @@ const HppPerKandangTab = () => {
             renderFooter={data.length > 0}
             renderCustomRow={renderCustomRow}
             className={{
-              containerClassName: 'w-full mt-6',
-              tableWrapperClassName: 'overflow-x-auto mt-4',
+              containerClassName: 'w-full mb-0!',
+              tableWrapperClassName: 'overflow-x-auto',
               tableClassName: 'w-full table-auto text-sm',
               headerRowClassName: 'border-b border-b-gray-200 bg-gray-50',
               headerColumnClassName:
@@ -862,8 +882,175 @@ const HppPerKandangTab = () => {
             }}
           />
         )}
-      </Card>
-    </div>
+      </div>
+
+      {/* Filter Modal */}
+      <Modal
+        ref={filterModal.ref}
+        className={{
+          modal: 'p-0',
+          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
+        }}
+      >
+        {/* Modal Header */}
+        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+          <div className='flex items-center gap-2 text-primary'>
+            <Icon icon='heroicons:funnel' width={20} height={20} />
+            <h3 className='font-medium text-sm'>Filter Data</h3>
+          </div>
+          <Button
+            variant='link'
+            onClick={filterModal.closeModal}
+            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+          >
+            <Icon icon='heroicons:x-mark' width={20} height={20} />
+          </Button>
+        </div>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          <div className='p-4 flex flex-col gap-3'>
+            {/* Period Filter */}
+            <div>
+              <DateInput
+                label='Periode'
+                name='period'
+                value={formik.values.period || ''}
+                onChange={(e) => {
+                  formik.setFieldValue('period', e.target.value || null);
+                }}
+                className={{ wrapper: 'w-full' }}
+                isNestedModal
+                required={true}
+                isError={!!formik.errors.period && formik.touched.period}
+              />
+              {formik.errors.period && formik.touched.period && (
+                <div className='text-error text-xs mt-1'>
+                  {formik.errors.period}
+                </div>
+              )}
+            </div>
+
+            {/* Area Filter */}
+            <SelectInputCheckbox
+              label='Area'
+              placeholder='Pilih Area'
+              options={areaOptions}
+              value={areaIdsValue}
+              onChange={(val) => {
+                formik.setFieldValue(
+                  'area_id',
+                  Array.isArray(val) && val.length > 0
+                    ? val.map((v) => String(v.value)).join(',')
+                    : null
+                );
+              }}
+              isLoading={isLoadingAreas}
+              isClearable
+              className={{ wrapper: 'w-full' }}
+            />
+
+            {/* Location Filter */}
+            <SelectInputCheckbox
+              label='Lokasi'
+              placeholder='Pilih Lokasi'
+              options={locationOptions}
+              value={locationIdsValue}
+              onChange={(val) => {
+                formik.setFieldValue(
+                  'location_id',
+                  Array.isArray(val) && val.length > 0
+                    ? val.map((v) => String(v.value)).join(',')
+                    : null
+                );
+              }}
+              isLoading={isLoadingLocations}
+              isClearable
+              className={{ wrapper: 'w-full' }}
+            />
+
+            {/* Kandang Filter */}
+            <SelectInputCheckbox
+              label='Kandang'
+              placeholder='Pilih Kandang'
+              options={kandangOptions}
+              value={kandangIdsValue}
+              onChange={(val) => {
+                formik.setFieldValue(
+                  'kandang_id',
+                  Array.isArray(val) && val.length > 0
+                    ? val.map((v) => String(v.value)).join(',')
+                    : null
+                );
+              }}
+              isLoading={isLoadingKandangs}
+              isClearable
+              className={{ wrapper: 'w-full' }}
+            />
+
+            {/* Weight Range Filter */}
+            <div>
+              <label className='block text-xs font-semibold text-base-content py-2'>
+                Rentang Bobot (Kg)
+              </label>
+              <div className='flex flex-row gap-1.5 items-center justify-between'>
+                <NumberInput
+                  name='weight_min'
+                  placeholder='Min'
+                  value={formik.values.weight_min || ''}
+                  onChange={handleWeightMinChange}
+                  className={{ wrapper: 'w-full' }}
+                />
+                <hr className='w-full max-w-3 h-px border-base-content/10' />
+                <NumberInput
+                  name='weight_max'
+                  placeholder='Max'
+                  value={formik.values.weight_max || ''}
+                  onChange={handleWeightMaxChange}
+                  isError={!!weightMaxError}
+                  errorMessage={weightMaxError}
+                  className={{ wrapper: 'w-full' }}
+                />
+              </div>
+            </div>
+
+            {/* Show Unrecorded Filter */}
+            <SelectInputRadio
+              label='Tampilkan Kandang Tanpa Recording'
+              placeholder='Pilih Opsi'
+              options={showUnrecordedOptions}
+              value={showUnrecordedValue}
+              onChange={(val) => {
+                if (!Array.isArray(val)) {
+                  formik.setFieldValue(
+                    'show_unrecorded',
+                    val?.value === 'true' || null
+                  );
+                }
+              }}
+              className={{ wrapper: 'w-full' }}
+              isClearable={true}
+            />
+          </div>
+
+          {/* Modal Footer */}
+          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
+            <Button
+              type='reset'
+              variant='soft'
+              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+            >
+              Reset Filter
+            </Button>
+            <Button
+              type='submit'
+              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
+              disabled={!!weightMaxError || formik.isSubmitting}
+            >
+              Apply Filter
+            </Button>
+          </div>
+        </form>
+      </Modal>
+    </>
   );
 };