diff --git a/apps/frontend/src/routes/_dashboardLayout/assessmentRequestManagements/index.lazy.tsx b/apps/frontend/src/routes/_dashboardLayout/assessmentRequestManagements/index.lazy.tsx
index fcdb037..d03232f 100644
--- a/apps/frontend/src/routes/_dashboardLayout/assessmentRequestManagements/index.lazy.tsx
+++ b/apps/frontend/src/routes/_dashboardLayout/assessmentRequestManagements/index.lazy.tsx
@@ -3,7 +3,8 @@ import PageTemplate from "@/components/PageTemplate";
 import { createLazyFileRoute } from "@tanstack/react-router";
 import ExtractQueryDataType from "@/types/ExtractQueryDataType";
 import { createColumnHelper } from "@tanstack/react-table";
-import { Badge, Flex } from "@mantine/core";
+import { Flex } from "@mantine/core";
+import { Badge } from "@/shadcn/components/ui/badge";
 import createActionButtons from "@/utils/createActionButton";
 import { TbEye } from "react-icons/tb";
 import AssessmentRequestManagementFormModal from "@/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal";
@@ -88,33 +89,18 @@ export default function AssessmentRequestManagementsPage() {
 					header: "Status",
 					cell: (props) => {
 						const status = props.row.original.status;
-						let statusLabel;
-						let color;
-					
 						switch (status) {
 							case "menunggu konfirmasi":
-								statusLabel = "Menunggu Konfirmasi";
-								color = "yellow";
-								break;
+								return <Badge variant={"waiting"}>Menunggu Konfirmasi</Badge>;
 							case "diterima":
-								statusLabel = "Diterima";
-								color = "green";
-								break;
+								return <Badge variant={"accepted"}>Diterima</Badge>;
 							case "ditolak":
-								statusLabel = "Ditolak";
-								color = "red";
-								break;
+								return <Badge variant={"rejected"}>Ditolak</Badge>;
 							case "selesai":
-								statusLabel = "Selesai";
-								color = "blue";
-								break;
+								return <Badge variant={"completed"}>Selesai</Badge>;
 							default:
-								statusLabel = "Tidak Diketahui";
-								color = "gray";
-								break;
+								return <Badge variant={"outline"}>Tidak diketahui</Badge>;
 						}
-					
-						return <Badge color={color}>{statusLabel}</Badge>;
 					},
 				}),