diff --git a/app/[locale]/(protected)/contributor/task-ta/components/columns.tsx b/app/[locale]/(protected)/contributor/task-ta/components/columns.tsx
index 7397b64c..0213be3c 100644
--- a/app/[locale]/(protected)/contributor/task-ta/components/columns.tsx
+++ b/app/[locale]/(protected)/contributor/task-ta/components/columns.tsx
@@ -159,7 +159,7 @@ const useTableColumns = () => {
               </Button>
             </DropdownMenuTrigger>
             <DropdownMenuContent className="p-0" align="end">
-              {roleId == 11 && (
+              {(roleId == 11 || roleId == 12) && (
                 <Link href={`/contributor/task-ta/detail/${row.original.id}`}>
                   <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
                     <Eye className="w-4 h-4 me-1.5" />
diff --git a/app/[locale]/(protected)/contributor/task-ta/components/task-ta-table.tsx b/app/[locale]/(protected)/contributor/task-ta/components/task-ta-table.tsx
index f2815af2..4f5cddb7 100644
--- a/app/[locale]/(protected)/contributor/task-ta/components/task-ta-table.tsx
+++ b/app/[locale]/(protected)/contributor/task-ta/components/task-ta-table.tsx
@@ -73,7 +73,7 @@ const TaskTaTable = () => {
   const [columnVisibility, setColumnVisibility] =
     React.useState<VisibilityState>({});
   const [rowSelection, setRowSelection] = React.useState({});
-  const [showData, setShowData] = React.useState("50");
+  const [showData, setShowData] = React.useState("10");
   const [pagination, setPagination] = React.useState<PaginationState>({
     pageIndex: 0,
     pageSize: Number(showData),
diff --git a/components/form/task-ta/task-ta-detail-form.tsx b/components/form/task-ta/task-ta-detail-form.tsx
index 475d74d6..a5a96ed5 100644
--- a/components/form/task-ta/task-ta-detail-form.tsx
+++ b/components/form/task-ta/task-ta-detail-form.tsx
@@ -907,7 +907,7 @@ export default function FormTaskTaDetail() {
         <div className="px-6 py-6">
           <div className="flex flex-col sm:flex-row lg:flex-row justify-between">
             <p className="text-lg font-semibold mb-3">{t("detail-task")}</p>
-            <div
+            {/* <div
               className="flex  gap-3"
               style={
                 detail?.createdBy?.id === Number(userId)
@@ -950,7 +950,7 @@ export default function FormTaskTaDetail() {
                   </DialogContent>
                 </Dialog>
               </div>
-            </div>
+            </div> */}
           </div>
 
           <form>
@@ -1320,7 +1320,7 @@ export default function FormTaskTaDetail() {
               </div>
             </div>
             <div className="flex flex-wrap lg:flex-row  justify-between gap-3 my-3">
-              <div className="lg:px-1">
+              {/* <div className="lg:px-1">
                 {detail?.isDone !== true &&
                 (Number(userLevelNumber) !== 3 ||
                   Number(userLevelNumber) == 2) ? (
@@ -1336,9 +1336,9 @@ export default function FormTaskTaDetail() {
                 ) : (
                   ""
                 )}
-              </div>
+              </div> */}
               <div className="flex flex-wrap gap-2">
-                <div className="">
+                {/* <div className="">
                   <Button
                     type="button"
                     color="primary"
@@ -1347,8 +1347,8 @@ export default function FormTaskTaDetail() {
                   >
                     Beri Tanggapan
                   </Button>
-                </div>
-                <div className="">
+                </div> */}
+                {/* <div className="">
                   <Button
                     type="button"
                     className="btn btn-primary lg:mx-3"
@@ -1364,9 +1364,9 @@ export default function FormTaskTaDetail() {
                   >
                     Terima Tugas
                   </Button>
-                </div>
+                </div> */}
                 <div
-                  className="task-response w-100 lg:px-3 "
+                  className="task-response w-100 lg:px-3"
                   // style={
                   //   Number(detail?.createdBy?.id) == Number(userId)
                   //     ? {}
@@ -1384,7 +1384,7 @@ export default function FormTaskTaDetail() {
                       if (!isTableResult) fetchAllData(); // Panggil API saat tombol diklik
                     }}
                   >
-                    Hasil Upload {Number(userId)}
+                    Hasil Upload
                   </Button>
                 </div>
               </div>
@@ -1406,7 +1406,7 @@ export default function FormTaskTaDetail() {
                       />
                     </InputGroup>
                   </div>
-                  <Dialog>
+                  {/* <Dialog>
                     <DialogTrigger asChild>
                       <Button variant="outline" size="md" color="primary">
                         Filter Polda/Polres
@@ -1486,7 +1486,7 @@ export default function FormTaskTaDetail() {
                         ))}
                       </div>
                     </DialogContent>
-                  </Dialog>
+                  </Dialog> */}
                 </div>
                 <div className="overflow-x-auto">
                   <table className="min-w-full border-collapse border border-gray-300">
diff --git a/components/form/task-ta/task-ta-form.tsx b/components/form/task-ta/task-ta-form.tsx
index 113a72ee..eb407f3c 100644
--- a/components/form/task-ta/task-ta-form.tsx
+++ b/components/form/task-ta/task-ta-form.tsx
@@ -157,7 +157,7 @@ export default function FormTaskTa() {
   const [isAudioUploadFinish, setIsAudioUploadFinish] = useState(false);
   const [voiceNoteLink, setVoiceNoteLink] = useState("");
   const [date, setDate] = React.useState<DateRange | undefined>({
-    from: new Date(2024, 0, 1),
+    from: new Date(),
   });
 
   const [platformTypeVisible, setPlatformTypeVisible] = useState(false);
@@ -400,7 +400,7 @@ export default function FormTaskTa() {
     fileTypeId: string,
     duration: string
   ) {
-    console.log(idx, id, file, fileTypeId, duration);
+    console.log("Tus Upload : ", idx, id, file, fileTypeId, duration);
 
     const resCsrf = await getCsrfToken();
     const csrfToken = resCsrf?.data?.token;
@@ -631,7 +631,10 @@ export default function FormTaskTa() {
                               }
                               className="mr-3"
                             />
-                            {expert.fullname}
+                            <div className="flex flex-col gap-2">
+                              <div className="font-bold">{expert.fullname}</div>
+                              <div className="italic">({expert.username})</div>
+                            </div>
                           </Label>
                         </div>
                       ))}
@@ -639,6 +642,36 @@ export default function FormTaskTa() {
                   </DialogContent>
                 </Dialog>
               </div>
+              {checkedLevels.size > 0 && (
+                <div className="mt-3">
+                  <Label className="text-sm text-gray-600 mb-2 block">
+                    Tenaga Ahli Terpilih ({checkedLevels.size})
+                  </Label>
+                  <div className="flex flex-wrap gap-2">
+                    {Array.from(checkedLevels).map((expertId) => {
+                      const expert = listExpert?.find((exp: any) => exp.id === expertId);
+                      return expert ? (
+                        <div
+                          key={expert.id}
+                          className="inline-flex items-center gap-2 bg-blue-100 text-blue-800 text-sm font-medium px-3 py-1.5 rounded-full border border-blue-200"
+                        >
+                          <span>{expert.fullname}</span>
+                          <button
+                            type="button"
+                            onClick={() => handleCheckboxChange(expert.id)}
+                            className="ml-1 text-blue-600 hover:text-blue-800 hover:bg-blue-200 rounded-full p-0.5 transition-colors"
+                            title="Remove expert"
+                          >
+                            <svg className="w-3 h-3" fill="currentColor" viewBox="0 0 20 20">
+                              <path fillRule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clipRule="evenodd" />
+                            </svg>
+                          </button>
+                        </div>
+                      ) : null;
+                    })}
+                  </div>
+                </div>
+              )}
             </div>
             <div className="mt-5 space-y-2">
               <Label>{t("description")}</Label>
diff --git a/messages/in.json b/messages/in.json
index e0af7ea4..a7720cdc 100644
--- a/messages/in.json
+++ b/messages/in.json
@@ -690,7 +690,7 @@
     "type-task": "Tipe Penugasan",
     "category-task": "Kategori Penugasan",
     "areas-expertise": "Bidang Keahlian",
-    "choose-expert": "Pilih Tenaga Ahli",
+    "choose-expert": "Tenaga Ahli",
     "code": "Kode",
     "start-date": "Tanggal Mulai",
     "end-date": "Tanggal Selesai",
diff --git a/service/task.ts b/service/task.ts
index a103a2e3..8c853a34 100644
--- a/service/task.ts
+++ b/service/task.ts
@@ -146,7 +146,7 @@ export async function listTaskTa(
   }
 
   return httpGetInterceptor(
-    `assignment-expert/pagination?enablePage=1&size=${size}&page=${page}&title=${title}&taskType=${taskType}&uniqueCode=${code}&createdAt=${createdAt}${statusQuery}`
+    `assignment-expert/pagination?enablePage=1&size=${size}&page=${page}&title=${title}&assignmentType=${taskType}&uniqueCode=${code}&createdAt=${createdAt}${statusQuery}`
   );
 }