diff --git a/src/app/api/announcement/route.ts b/src/app/api/announcement/route.ts
index 63270d1..0829e49 100644
--- a/src/app/api/announcement/route.ts
+++ b/src/app/api/announcement/route.ts
@@ -184,7 +184,7 @@ export async function POST(request: Request) {
             category: 'announcement',
             idContent: data.id,
             title: 'Pengumuman Baru',
-            desc: 'Anda memiliki pengumuman baru. Silahkan periksa detailnya.'
+            desc: title
         }))
 
         const dataPush = memberNotif.map((v: any) => ({
@@ -217,7 +217,7 @@ export async function POST(request: Request) {
                 category: 'announcement',
                 idContent: data.id,
                 title: 'Pengumuman Baru',
-                desc: 'Anda memiliki pengumuman baru. Silahkan periksa detailnya.'
+                desc: title
             })
 
             dataPush.push({
@@ -229,7 +229,7 @@ export async function POST(request: Request) {
 
         const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Pengumuman Baru', body: 'Anda memiliki pengumuman baru. Silahkan periksa detailnya.' } })
+        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Pengumuman Baru', body: title } })
         const insertNotif = await prisma.notifications.createMany({
             data: dataNotif
         })
diff --git a/src/app/api/discussion-general/route.ts b/src/app/api/discussion-general/route.ts
index 45ad8c2..c3489e0 100644
--- a/src/app/api/discussion-general/route.ts
+++ b/src/app/api/discussion-general/route.ts
@@ -147,7 +147,7 @@ export async function POST(request: Request) {
          category: 'discussion',
          idContent: data.id,
          title: 'Diskusi Umum Baru',
-         desc: 'Terdapat diskusi umum baru. Silahkan periksa detailnya.'
+         desc: title
       }))
 
       if (userRoleLogin != "supadmin") {
@@ -173,7 +173,7 @@ export async function POST(request: Request) {
             category: 'discussion',
             idContent: data.id,
             title: 'Diskusi Umum Baru',
-            desc: 'Terdapat diskusi umum baru. Silahkan periksa detailnya.'
+            desc: title
          })
       }
 
diff --git a/src/app/api/discussion/route.ts b/src/app/api/discussion/route.ts
index b3e4531..cc59f3d 100644
--- a/src/app/api/discussion/route.ts
+++ b/src/app/api/discussion/route.ts
@@ -146,6 +146,8 @@ export async function POST(request: Request) {
          }
       })
 
+      const descNotif = desc.length > 300 ? desc.substring(0, 300) + '...' : desc
+
 
       // mengirim notifikasi
       // datanotif untuk realtime notifikasi
@@ -157,7 +159,7 @@ export async function POST(request: Request) {
          category: 'division/' + idDivision + '/discussion',
          idContent: data.id,
          title: 'Diskusi Baru',
-         desc: 'Terdapat diskusi baru. Silahkan periksa detailnya.'
+         desc: descNotif
       }))
 
       const dataPush = memberDivision.map((v: any) => ({
@@ -189,7 +191,7 @@ export async function POST(request: Request) {
             category: 'division/' + idDivision + '/discussion',
             idContent: data.id,
             title: 'Diskusi Baru',
-            desc: 'Terdapat diskusi baru. Silahkan periksa detailnya.'
+            desc: descNotif
          })
 
          dataPush.push({
@@ -221,7 +223,7 @@ export async function POST(request: Request) {
             category: 'division/' + idDivision + '/discussion',
             idContent: data.id,
             title: 'Diskusi Baru',
-            desc: 'Terdapat diskusi baru. Silahkan periksa detailnya.'
+            desc: descNotif
          })
 
          dataPush.push({
@@ -232,7 +234,7 @@ export async function POST(request: Request) {
 
       const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: 'Terdapat diskusi baru. Silahkan periksa detailnya.', title: 'Diskusi Baru' } })
+      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: descNotif, title: 'Diskusi Baru' } })
       const insertNotif = await prisma.notifications.createMany({
          data: dataNotif
       })
diff --git a/src/app/api/division/route.ts b/src/app/api/division/route.ts
index 51d2e5f..bd6c9d5 100644
--- a/src/app/api/division/route.ts
+++ b/src/app/api/division/route.ts
@@ -174,7 +174,7 @@ export async function POST(request: Request) {
          category: 'division',
          idContent: data.id,
          title: 'Divisi Baru',
-         desc: 'Terdapat divisi baru. Silahkan periksa detailnya.'
+         desc: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.`
       }))
 
       const selectUser = await prisma.divisionMember.findMany({
@@ -225,7 +225,7 @@ export async function POST(request: Request) {
             category: 'division',
             idContent: data.id,
             title: 'Divisi Baru',
-            desc: 'Terdapat divisi baru. Silahkan periksa detailnya.'
+            desc: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.`
          })
 
          dataPush.push({
@@ -262,7 +262,7 @@ export async function POST(request: Request) {
             category: 'division',
             idContent: data.id,
             title: 'Divisi Baru',
-            desc: 'Terdapat divisi baru. Silahkan periksa detailnya.'
+            desc: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.`
          }))
 
          const omitPush = atasanGroup.map((v: any) => ({
@@ -279,7 +279,7 @@ export async function POST(request: Request) {
 
       const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Divisi Baru', body: 'Terdapat divisi baru. Silahkan periksa detailnya.' } })
+      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Divisi Baru', body: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.` } })
       const insertNotif = await prisma.notifications.createMany({
          data: dataNotif
       })
diff --git a/src/app/api/mobile/announcement/route.ts b/src/app/api/mobile/announcement/route.ts
index 83b2c88..c5b0764 100644
--- a/src/app/api/mobile/announcement/route.ts
+++ b/src/app/api/mobile/announcement/route.ts
@@ -203,7 +203,7 @@ export async function POST(request: Request) {
             category: 'announcement',
             idContent: data.id,
             title: 'Pengumuman Baru',
-            desc: 'Anda memiliki pengumuman baru. Silahkan periksa detailnya.'
+            desc: title
         }))
 
 
@@ -244,7 +244,7 @@ export async function POST(request: Request) {
                 category: 'announcement',
                 idContent: data.id,
                 title: 'Pengumuman Baru',
-                desc: 'Anda memiliki pengumuman baru. Silahkan periksa detailnya.'
+                desc: title
             })
 
             dataPush.push({
@@ -258,7 +258,7 @@ export async function POST(request: Request) {
 
         const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Pengumuman Baru', body: 'Anda memiliki pengumuman baru. Silahkan periksa detailnya.' } })
+        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Pengumuman Baru', body: title } })
         const insertNotif = await prisma.notifications.createMany({
             data: dataNotifFilter
         })
@@ -267,7 +267,7 @@ export async function POST(request: Request) {
         await sendFCMNotificationMany({
             token: tokenUnique,
             title: "Pengumuman Baru",
-            body: "Anda memiliki pengumuman baru. Silahkan periksa detailnya.",
+            body: title,
             data: { id: data.id, category: "announcement", content: data.id }
         })
 
diff --git a/src/app/api/mobile/discussion-general/[id]/comment/route.ts b/src/app/api/mobile/discussion-general/[id]/comment/route.ts
index 0ce9d22..34f78a2 100644
--- a/src/app/api/mobile/discussion-general/[id]/comment/route.ts
+++ b/src/app/api/mobile/discussion-general/[id]/comment/route.ts
@@ -103,11 +103,13 @@ export async function POST(request: Request, context: { params: { id: string } }
          tokenDup.push(perbekel?.TokenDeviceUser.map((v: any) => v.token).flat())
       }
 
+      const commentNotif = data.comment.length > 300 ? data.comment.substring(0, 300) + '...' : data.comment;
+
       const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
       await sendFCMNotificationMany({
          token: tokenUnique,
          title: "Komentar Baru",
-         body: `${userSent?.name}: ${data.comment}`,
+         body: `${userSent?.name}: ${commentNotif}`,
          data: { id: data.id, category: "discussion-general", content: id }
       })
 
diff --git a/src/app/api/mobile/discussion-general/route.ts b/src/app/api/mobile/discussion-general/route.ts
index 285ef8f..556a2c4 100644
--- a/src/app/api/mobile/discussion-general/route.ts
+++ b/src/app/api/mobile/discussion-general/route.ts
@@ -172,7 +172,7 @@ export async function POST(request: Request) {
          category: 'discussion',
          idContent: data.id,
          title: 'Diskusi Umum Baru',
-         desc: 'Terdapat diskusi umum baru. Silahkan periksa detailnya.'
+         desc: title
       }))
 
       if (userRoleLogin != "supadmin") {
@@ -205,7 +205,7 @@ export async function POST(request: Request) {
             category: 'discussion',
             idContent: data.id,
             title: 'Diskusi Umum Baru',
-            desc: 'Terdapat diskusi umum baru. Silahkan periksa detailnya.'
+            desc: title
          })
       }
 
@@ -219,7 +219,7 @@ export async function POST(request: Request) {
       await sendFCMNotificationMany({
          token: tokenUnique,
          title: "Diskusi Umum Baru",
-         body: "Anda memiliki diskusi umum baru. Silahkan periksa detailnya.",
+         body: title,
          data: { id: data.id, category: "discussion", content: data.id }
       })
 
diff --git a/src/app/api/mobile/discussion/[id]/comment/route.ts b/src/app/api/mobile/discussion/[id]/comment/route.ts
index 77ddd80..b205fcb 100644
--- a/src/app/api/mobile/discussion/[id]/comment/route.ts
+++ b/src/app/api/mobile/discussion/[id]/comment/route.ts
@@ -119,11 +119,13 @@ export async function POST(request: Request, context: { params: { id: string } }
             tokenDup.push(perbekel?.TokenDeviceUser.map((v: any) => v.token).flat())
         }
 
+        const commentNotif = comment.length > 300 ? comment.substring(0, 300) + '...' : comment;
+
         const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
         await sendFCMNotificationMany({
             token: tokenUnique,
             title: "Komentar Baru",
-            body: `${userSent?.name}: ${comment}`,
+            body: `${userSent?.name}: ${commentNotif}`,
             data: { id: data.id, category: `division/${dataDivision?.idDivision}/discussion`, content: id }
         })
 
diff --git a/src/app/api/mobile/discussion/route.ts b/src/app/api/mobile/discussion/route.ts
index e32d27d..38c2176 100644
--- a/src/app/api/mobile/discussion/route.ts
+++ b/src/app/api/mobile/discussion/route.ts
@@ -155,6 +155,8 @@ export async function POST(request: Request) {
          }
       })
 
+      const deskripsiNotif = desc.length > 300 ? desc.substring(0, 300) + '...' : desc;
+
 
       // mengirim notifikasi
       // dataFCM untuk push notifikasi mobile
@@ -173,7 +175,7 @@ export async function POST(request: Request) {
          category: 'division/' + idDivision + '/discussion',
          idContent: data.id,
          title: 'Diskusi Baru',
-         desc: 'Terdapat diskusi baru. Silahkan periksa detailnya.'
+         desc: deskripsiNotif
       }))
 
       const dataPush = memberDivision.map((v: any) => ({
@@ -212,7 +214,7 @@ export async function POST(request: Request) {
             category: 'division/' + idDivision + '/discussion',
             idContent: data.id,
             title: 'Diskusi Baru',
-            desc: 'Terdapat diskusi baru. Silahkan periksa detailnya.'
+            desc: deskripsiNotif
          })
 
          dataPush.push({
@@ -251,7 +253,7 @@ export async function POST(request: Request) {
             category: 'division/' + idDivision + '/discussion',
             idContent: data.id,
             title: 'Diskusi Baru',
-            desc: 'Terdapat diskusi baru. Silahkan periksa detailnya.'
+            desc: deskripsiNotif
          })
 
          dataPush.push({
@@ -264,7 +266,7 @@ export async function POST(request: Request) {
 
       const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: 'Terdapat diskusi baru. Silahkan periksa detailnya.', title: 'Diskusi Baru' } })
+      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: deskripsiNotif, title: 'Diskusi Baru' } })
       const insertNotif = await prisma.notifications.createMany({
          data: dataNotifFilter
       })
@@ -274,7 +276,7 @@ export async function POST(request: Request) {
       await sendFCMNotificationMany({
          token: tokenUnique,
          title: "Diskusi Baru",
-         body: "Anda memiliki diskusi baru. Silahkan periksa detailnya.",
+         body: deskripsiNotif,
          data: { id: data.id, category: "division/" + idDivision + "/discussion", content: data.id }
       })
 
diff --git a/src/app/api/mobile/division/route.ts b/src/app/api/mobile/division/route.ts
index 5803958..4a8638d 100644
--- a/src/app/api/mobile/division/route.ts
+++ b/src/app/api/mobile/division/route.ts
@@ -183,7 +183,7 @@ export async function POST(request: Request) {
          category: 'division',
          idContent: data.id,
          title: 'Divisi Baru',
-         desc: 'Terdapat divisi baru. Silahkan periksa detailnya.'
+         desc: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.`
       }))
 
       const selectUser = await prisma.divisionMember.findMany({
@@ -252,7 +252,7 @@ export async function POST(request: Request) {
             category: 'division',
             idContent: data.id,
             title: 'Divisi Baru',
-            desc: 'Terdapat divisi baru. Silahkan periksa detailnya.'
+            desc: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.`
          })
 
          dataPush.push({
@@ -299,7 +299,7 @@ export async function POST(request: Request) {
             category: 'division',
             idContent: data.id,
             title: 'Divisi Baru',
-            desc: 'Terdapat divisi baru. Silahkan periksa detailnya.'
+            desc: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.`
          }))
 
          const omitPush = atasanGroup.map((v: any) => ({
@@ -317,7 +317,7 @@ export async function POST(request: Request) {
 
       const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Divisi Baru', body: 'Terdapat divisi baru. Silahkan periksa detailnya.' } })
+      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Divisi Baru', body: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.` } })
       const insertNotif = await prisma.notifications.createMany({
          data: dataNotifFilter
       })
@@ -326,7 +326,7 @@ export async function POST(request: Request) {
       await sendFCMNotificationMany({
          token: tokenUnique,
          title: "Divisi Baru",
-         body: "Anda memiliki divisi baru. Silahkan periksa detailnya.",
+         body: `Divisi ${sent.data.name} telah dibuat. Silakan periksa detailnya.`,
          data: { id: data.id, category: "division", content: data.id }
       })
 
diff --git a/src/app/api/mobile/project/route.ts b/src/app/api/mobile/project/route.ts
index 0ed08bc..d0ed52f 100644
--- a/src/app/api/mobile/project/route.ts
+++ b/src/app/api/mobile/project/route.ts
@@ -284,7 +284,7 @@ export async function POST(request: Request) {
             category: 'project',
             idContent: data.id,
             title: 'Kegiatan Baru',
-            desc: 'Terdapat kegiatan baru. Silahkan periksa detailnya.'
+            desc: title
         }))
 
         const dataPush = memberNotif.map((v: any) => ({
@@ -323,7 +323,7 @@ export async function POST(request: Request) {
                 category: 'project',
                 idContent: data.id,
                 title: 'Kegiatan Baru',
-                desc: 'Terdapat kegiatan baru. Silahkan periksa detailnya.'
+                desc: title
             })
 
             dataPush.push({
@@ -370,7 +370,7 @@ export async function POST(request: Request) {
                 category: 'project',
                 idContent: data.id,
                 title: 'Kegiatan Baru',
-                desc: 'Terdapat kegiatan baru. Silahkan periksa detailnya.'
+                desc: title
             }))
 
             const omitPush = atasanGroup.map((v: any) => ({
@@ -387,7 +387,7 @@ export async function POST(request: Request) {
         const dataNotifFilter = dataNotif.filter((item) => item.idUserTo != undefined && item.idUserTo != null && item.idUserTo != "" && item.idUserTo != userId)
         const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Kegiatan Baru', body: 'Terdapat kegiatan baru. Silahkan periksa detailnya.' } })
+        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Kegiatan Baru', body: title } })
         const insertNotif = await prisma.notifications.createMany({
             data: dataNotifFilter
         })
@@ -396,7 +396,7 @@ export async function POST(request: Request) {
         await sendFCMNotificationMany({
             token: tokenUnique,
             title: "Kegiatan Baru",
-            body: "Anda memiliki kegiatan baru. Silahkan periksa detailnya.",
+            body: title,
             data: { id: data.id, category: "project", content: data.id }
         })
 
diff --git a/src/app/api/mobile/task/route.ts b/src/app/api/mobile/task/route.ts
index e5cea77..5d36a81 100644
--- a/src/app/api/mobile/task/route.ts
+++ b/src/app/api/mobile/task/route.ts
@@ -267,8 +267,8 @@ export async function POST(request: Request) {
          idUserFrom: String(userMobile.id),
          category: 'division/' + idDivision + '/task',
          idContent: data.id,
-         title: 'Tugas Baru',
-         desc: 'Terdapat tugas baru. Silahkan periksa detailnya.'
+         title: 'Tugas Divisi Baru',
+         desc: title
       }))
 
       const dataPush = memberDivision.map((v: any) => ({
@@ -306,8 +306,8 @@ export async function POST(request: Request) {
             idUserFrom: userId,
             category: 'division/' + idDivision + '/task',
             idContent: data.id,
-            title: 'Tugas Baru',
-            desc: 'Terdapat tugas baru. Silahkan periksa detailnya.'
+            title: 'Tugas Divisi Baru',
+            desc: title
          })
 
          dataPush.push({
@@ -345,8 +345,8 @@ export async function POST(request: Request) {
             idUserFrom: userId,
             category: 'division/' + idDivision + '/task',
             idContent: data.id,
-            title: 'Tugas Baru',
-            desc: 'Terdapat tugas baru. Silahkan periksa detailnya.'
+            title: 'Tugas Divisi Baru',
+            desc: title
          })
 
          dataPush.push({
@@ -358,7 +358,7 @@ export async function POST(request: Request) {
       const dataNotifFilter = dataNotif.filter((v: any) => v.idUserTo != undefined && v.idUserTo != null && v.idUserTo != "" && v.idUserTo != userId)
       const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: 'Terdapat tugas baru. Silahkan periksa detailnya.', title: 'Tugas Baru' } })
+      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: title, title: 'Tugas Divisi Baru' } })
       const insertNotif = await prisma.notifications.createMany({
          data: dataNotifFilter
       })
@@ -366,8 +366,8 @@ export async function POST(request: Request) {
       const tokenUnique = [...new Set(tokenDup.flat())].filter((v: any) => v != undefined && v != null && v != "");
       await sendFCMNotificationMany({
          token: tokenUnique,
-         title: "Tugas Baru",
-         body: "Anda memiliki tugas baru. Silahkan periksa detailnya.",
+         title: "Tugas Divisi Baru",
+         body: title,
          data: { id: data.id, category: 'division/' + idDivision + '/task', content: data.id }
       })
 
diff --git a/src/app/api/project/route.ts b/src/app/api/project/route.ts
index d4e6652..2f05c5a 100644
--- a/src/app/api/project/route.ts
+++ b/src/app/api/project/route.ts
@@ -262,7 +262,7 @@ export async function POST(request: Request) {
             category: 'project',
             idContent: data.id,
             title: 'Kegiatan Baru',
-            desc: 'Terdapat kegiatan baru. Silahkan periksa detailnya.'
+            desc: title
         }))
 
         const dataPush = memberNotif.map((v: any) => ({
@@ -294,7 +294,7 @@ export async function POST(request: Request) {
                 category: 'project',
                 idContent: data.id,
                 title: 'Kegiatan Baru',
-                desc: 'Terdapat kegiatan baru. Silahkan periksa detailnya.'
+                desc: title
             })
 
             dataPush.push({
@@ -330,7 +330,7 @@ export async function POST(request: Request) {
                 category: 'project',
                 idContent: data.id,
                 title: 'Kegiatan Baru',
-                desc: 'Terdapat kegiatan baru. Silahkan periksa detailnya.'
+                desc: title
             }))
 
             const omitPush = atasanGroup.map((v: any) => ({
@@ -346,7 +346,7 @@ export async function POST(request: Request) {
 
         const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Kegiatan Baru', body: 'Terdapat kegiatan baru. Silahkan periksa detailnya.' } })
+        const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { title: 'Kegiatan Baru', body: title } })
         const insertNotif = await prisma.notifications.createMany({
             data: dataNotif
         })
diff --git a/src/app/api/task/route.ts b/src/app/api/task/route.ts
index 976b941..ba4d224 100644
--- a/src/app/api/task/route.ts
+++ b/src/app/api/task/route.ts
@@ -253,8 +253,8 @@ export async function POST(request: Request) {
          idUserFrom: String(user.id),
          category: 'division/' + idDivision + '/task',
          idContent: data.id,
-         title: 'Tugas Baru',
-         desc: 'Terdapat tugas baru. Silahkan periksa detailnya.'
+         title: 'Tugas Divisi Baru',
+         desc: title
       }))
 
       const dataPush = memberDivision.map((v: any) => ({
@@ -285,8 +285,8 @@ export async function POST(request: Request) {
             idUserFrom: userId,
             category: 'division/' + idDivision + '/task',
             idContent: data.id,
-            title: 'Tugas Baru',
-            desc: 'Terdapat tugas baru. Silahkan periksa detailnya.'
+            title: 'Tugas Divisi Baru',
+            desc: title
          })
 
          dataPush.push({
@@ -317,8 +317,8 @@ export async function POST(request: Request) {
             idUserFrom: userId,
             category: 'division/' + idDivision + '/task',
             idContent: data.id,
-            title: 'Tugas Baru',
-            desc: 'Terdapat tugas baru. Silahkan periksa detailnya.'
+            title: 'Tugas Divisi Baru',
+            desc: title
          })
 
          dataPush.push({
@@ -329,13 +329,12 @@ export async function POST(request: Request) {
 
       const pushNotif = dataPush.filter((item) => item.subscription != undefined)
 
-      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: 'Terdapat tugas baru. Silahkan periksa detailnya.', title: 'Tugas Baru' } })
+      const sendWebPush = await funSendWebPush({ sub: pushNotif, message: { body: title, title: 'Tugas Divisi Baru' } })
       const insertNotif = await prisma.notifications.createMany({
          data: dataNotif
       })
 
-
-      // create log user
+      // create log userc
       const log = await createLogUser({ act: 'CREATE', desc: 'User membuat tugas divisi baru', table: 'divisionProject', data: data.id })
 
 
diff --git a/src/app/api/version-app/route.ts b/src/app/api/version-app/route.ts
index 33baf80..eca496f 100644
--- a/src/app/api/version-app/route.ts
+++ b/src/app/api/version-app/route.ts
@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 
 export async function GET(request: Request) {
    try {
-      return NextResponse.json({ success: true, version: "2.0.3", tahap: "beta", update: "-api mobile; -login tanpa otp (mobile app); -tambah laporan pada project dan tugas divisi; -tambah upload link pada project dan tugas divisi; -tambah detail tanggal dan jam pada project dan tugas divisi; -api jenna ai; -privacy policy" }, { status: 200 });
+      return NextResponse.json({ success: true, version: "2.0.4", tahap: "beta", update: "-api mobile; -login tanpa otp (mobile app); -tambah laporan pada project dan tugas divisi; -tambah upload link pada project dan tugas divisi; -tambah detail tanggal dan jam pada project dan tugas divisi; -api jenna ai; -privacy policy" }, { status: 200 });
    } catch (error) {
       console.error(error);
       return NextResponse.json({ success: false, version: "Gagal mendapatkan version, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });
diff --git a/src/module/announcement/lib/api_announcement.ts b/src/module/announcement/lib/api_announcement.ts
index 58e95f5..ef3f11b 100644
--- a/src/module/announcement/lib/api_announcement.ts
+++ b/src/module/announcement/lib/api_announcement.ts
@@ -12,10 +12,10 @@ export const funGetAnnouncementById = async (path: string) => {
 
 export const funCreateAnnouncement = async (data: IFormCreateAnnouncement) => {
     if (data.title == "" || data.desc == "")
-        return { success: false, message: 'Silahkan lengkapi form tambah pengumuman' }
+        return { success: false, message: 'Silakan lengkapi form tambah pengumuman' }
 
     if (data.groups.length == 0)
-        return { success: false, message: 'Silahkan pilih divisi penerima pengumuman' }
+        return { success: false, message: 'Silakan pilih divisi penerima pengumuman' }
 
     const response = await fetch("/api/announcement", {
         method: "POST",
@@ -39,10 +39,10 @@ export const funDeleteAnnouncement = async (path: string) => {
 
 export const funEditAnnouncement = async (path: string, data: IFormCreateAnnouncement) => {
     if (data.title == "" || data.desc == "")
-        return { success: false, message: 'Silahkan lengkapi form edit pengumuman' }
+        return { success: false, message: 'Silakan lengkapi form edit pengumuman' }
 
     if (data.groups.length == 0)
-        return { success: false, message: 'Silahkan pilih divisi penerima pengumuman' }
+        return { success: false, message: 'Silakan pilih divisi penerima pengumuman' }
 
     const response = await fetch(`/api/announcement/${path}`, {
         method: "PUT",
diff --git a/src/module/announcement/ui/create_announcement.tsx b/src/module/announcement/ui/create_announcement.tsx
index 8163b82..3b48a36 100644
--- a/src/module/announcement/ui/create_announcement.tsx
+++ b/src/module/announcement/ui/create_announcement.tsx
@@ -102,7 +102,7 @@ export default function CreateAnnouncement() {
             return false
 
          if (memberValue.length == 0)
-            return toast.error("Error! silahkan pilih divisi")
+            return toast.error("Error! Silakan pilih divisi")
 
          setOpen(true)
       }, 500)
diff --git a/src/module/banner/ui/create_banner.tsx b/src/module/banner/ui/create_banner.tsx
index 0364387..db83e09 100644
--- a/src/module/banner/ui/create_banner.tsx
+++ b/src/module/banner/ui/create_banner.tsx
@@ -180,7 +180,7 @@ function CreateBanner() {
           <Box mt={10}>
             {touched.image && !imgForm && (
               <Text size='sm' c={'red'}>
-                Silahkan Pilih Gambar
+                Silakan Pilih Gambar
               </Text>
             )}
           </Box>
diff --git a/src/module/calender/ui/create_calender_division_caleder.tsx b/src/module/calender/ui/create_calender_division_caleder.tsx
index f92c985..30e996b 100644
--- a/src/module/calender/ui/create_calender_division_caleder.tsx
+++ b/src/module/calender/ui/create_calender_division_caleder.tsx
@@ -135,7 +135,7 @@ export default function CreateCalenderDivisionCaleder() {
             return false
 
         if (memberValue.length == 0)
-            return toast.error("Error! silahkan pilih anggota")
+            return toast.error("Error! Silakan pilih anggota")
 
         setModal(true)
     }
diff --git a/src/module/calender/ui/create_user_calender.tsx b/src/module/calender/ui/create_user_calender.tsx
index 32edcea..789b1f5 100644
--- a/src/module/calender/ui/create_user_calender.tsx
+++ b/src/module/calender/ui/create_user_calender.tsx
@@ -79,7 +79,7 @@ export default function CreateUserCalender({ onClose }: { onClose: (val: any) =>
 
   function onSubmit() {
     if (selectedFiles.length == 0) {
-      return toast.error("Error! silahkan pilih anggota")
+      return toast.error("Error! Silakan pilih anggota")
     }
     member.set(selectedFiles)
     onClose(true)
diff --git a/src/module/calender/ui/create_user_detail_calender.tsx b/src/module/calender/ui/create_user_detail_calender.tsx
index 1d57395..74e09f0 100644
--- a/src/module/calender/ui/create_user_detail_calender.tsx
+++ b/src/module/calender/ui/create_user_detail_calender.tsx
@@ -92,7 +92,7 @@ export default function CreateUserDetailCalender() {
   async function onSubmit() {
     try {
       if (selectedFiles.length == 0) {
-        return toast.error("Error! silahkan pilih anggota")
+        return toast.error("Error! Silakan pilih anggota")
       }
       setLoadingSubmit(true)
       const res = await funAddMemberCalender(String(isDataCalender?.idCalendar), selectedFiles)
diff --git a/src/module/calender/ui/update_division_calender.tsx b/src/module/calender/ui/update_division_calender.tsx
index 9a53bed..70de11d 100644
--- a/src/module/calender/ui/update_division_calender.tsx
+++ b/src/module/calender/ui/update_division_calender.tsx
@@ -43,7 +43,7 @@ export default function UpdateDivisionCalender() {
       }
     } catch (error) {
       console.error(error)
-      toast.error("Terjadi kesalahan! Silahkan coba kembali");
+      toast.error("Terjadi kesalahan! Silakan coba kembali");
     } finally {
       setLoading(false)
     }
@@ -84,7 +84,7 @@ export default function UpdateDivisionCalender() {
       }
     } catch (error) {
       console.error(error)
-      toast.error("Terjadi kesalahan! Silahkan coba kembali");
+      toast.error("Terjadi kesalahan! Silakan coba kembali");
     } finally {
       setModal(false)
       setLoadingModal(false)
diff --git a/src/module/calender/ui/update_list_users.tsx b/src/module/calender/ui/update_list_users.tsx
index c59a38b..d7aeef4 100644
--- a/src/module/calender/ui/update_list_users.tsx
+++ b/src/module/calender/ui/update_list_users.tsx
@@ -82,7 +82,7 @@ export default function UpdateListUsers({ onClose }: { onClose: (val: any) => vo
 
   function onSubmit() {
     if (selectedFiles.length == 0) {
-      return toast.error("Error! silahkan pilih anggota")
+      return toast.error("Error! Silakan pilih anggota")
     }
     member.set(selectedFiles)
     onClose(true)
diff --git a/src/module/discussion_general/ui/add_member.tsx b/src/module/discussion_general/ui/add_member.tsx
index 11a7b8a..da0d615 100644
--- a/src/module/discussion_general/ui/add_member.tsx
+++ b/src/module/discussion_general/ui/add_member.tsx
@@ -101,7 +101,7 @@ export default function AddMemberDiscussionGeneral() {
 
   function onCheck() {
     if (selectedFiles.length == 0) {
-      return toast.error("Error! silahkan pilih anggota")
+      return toast.error("Error! Silakan pilih anggota")
     }
     setOpen(true)
   }
diff --git a/src/module/discussion_general/ui/choose_user.tsx b/src/module/discussion_general/ui/choose_user.tsx
index e8c7c41..f45a613 100644
--- a/src/module/discussion_general/ui/choose_user.tsx
+++ b/src/module/discussion_general/ui/choose_user.tsx
@@ -57,7 +57,7 @@ export default function ChooseUsersDiscussion({ grup, onClose }: { grup?: string
 
   function onSubmit() {
     if (selectedFiles.length == 0) {
-      return toast.error("Error! silahkan pilih anggota")
+      return toast.error("Error! Silakan pilih anggota")
     }
     member.set(selectedFiles)
     onClose(true)
diff --git a/src/module/discussion_general/ui/create_discussion.tsx b/src/module/discussion_general/ui/create_discussion.tsx
index 87e3c3a..0ac648f 100644
--- a/src/module/discussion_general/ui/create_discussion.tsx
+++ b/src/module/discussion_general/ui/create_discussion.tsx
@@ -74,7 +74,7 @@ export default function FormCreateDiscussionGeneral() {
          return false
 
       if (memberValue.length <= 1)
-         return toast.error("Error! Silahkan pilih anggota lebih dari 1")
+         return toast.error("Error! Silakan pilih anggota lebih dari 1")
 
       setModal(true)
    }
diff --git a/src/module/division_new/ui/create_anggota_division.tsx b/src/module/division_new/ui/create_anggota_division.tsx
index 91ba45b..dbb74d7 100644
--- a/src/module/division_new/ui/create_anggota_division.tsx
+++ b/src/module/division_new/ui/create_anggota_division.tsx
@@ -99,7 +99,7 @@ export default function CreateAnggotaDivision() {
 
   function onCheck() {
     if (selectedFiles.length == 0) {
-      return toast.error("Error! silahkan pilih anggota")
+      return toast.error("Error! Silakan pilih anggota")
     }
     setOpen(true)
   }
diff --git a/src/module/division_new/ui/create_division.tsx b/src/module/division_new/ui/create_division.tsx
index ec73fac..e02ec8f 100644
--- a/src/module/division_new/ui/create_division.tsx
+++ b/src/module/division_new/ui/create_division.tsx
@@ -51,9 +51,9 @@ export default function CreateDivision() {
             return false
 
         if (member.length == 0)
-            return toast.error("Error! Silahkan pilih anggota")
+            return toast.error("Error! Silakan pilih anggota")
         // if (member.length <= 1)
-        //     return toast.error("Error! Silahkan pilih anggota lebih dari 1")
+        //     return toast.error("Error! Silakan pilih anggota lebih dari 1")
 
         setChooseAdmin(true)
     }
diff --git a/src/module/division_new/ui/navbar_admin_division.tsx b/src/module/division_new/ui/navbar_admin_division.tsx
index 09e8bc4..8b5c362 100644
--- a/src/module/division_new/ui/navbar_admin_division.tsx
+++ b/src/module/division_new/ui/navbar_admin_division.tsx
@@ -24,7 +24,7 @@ export default function NavbarAdminDivision({ data, onSuccess }: { data: any, on
 
   async function onSubmit() {
     if (value.length === 0) {
-      return toast.error("Error! Silahkan pilih admin divisi")
+      return toast.error("Error! Silakan pilih admin divisi")
     }
 
     try {
diff --git a/src/module/division_new/ui/navbar_create_users.tsx b/src/module/division_new/ui/navbar_create_users.tsx
index 83e61de..1571f20 100644
--- a/src/module/division_new/ui/navbar_create_users.tsx
+++ b/src/module/division_new/ui/navbar_create_users.tsx
@@ -53,7 +53,7 @@ export default function NavbarCreateUsers({ grup, onClose }: { grup?: string, on
 
   function onSubmit() {
     if (selectedFiles.length == 0) {
-      return toast.error("Error! silahkan pilih anggota")
+      return toast.error("Error! Silakan pilih anggota")
     }
     member.set(selectedFiles)
     onClose(true)
diff --git a/src/module/project/ui/add_file_detail_project.tsx b/src/module/project/ui/add_file_detail_project.tsx
index f557e4b..9f447cf 100644
--- a/src/module/project/ui/add_file_detail_project.tsx
+++ b/src/module/project/ui/add_file_detail_project.tsx
@@ -171,7 +171,7 @@ export default function AddFileDetailProject() {
                   if (fileForm.length > 0) {
                      setOpenModal(true)
                   } else {
-                     toast.error("Silahkan pilih file yang akan diupload")
+                     toast.error("Silakan pilih file yang akan diupload")
                   }
                }}>
                Simpan
diff --git a/src/module/project/ui/add_member_detail_project.tsx b/src/module/project/ui/add_member_detail_project.tsx
index 0f50504..a448424 100644
--- a/src/module/project/ui/add_member_detail_project.tsx
+++ b/src/module/project/ui/add_member_detail_project.tsx
@@ -91,7 +91,7 @@ export default function AddMemberDetailProject() {
 
   function onVerifikasi() {
     if (selectedFiles.length == 0) {
-      return toast.error("Error! silahkan pilih anggota")
+      return toast.error("Error! Silakan pilih anggota")
     }
 
     setOpenModal(true)
diff --git a/src/module/project/ui/create_project.tsx b/src/module/project/ui/create_project.tsx
index 069536a..0f68d9a 100644
--- a/src/module/project/ui/create_project.tsx
+++ b/src/module/project/ui/create_project.tsx
@@ -142,10 +142,10 @@ export default function CreateProject() {
       return false
 
     if (dataTask.length == 0)
-      return toast.error("Error! silahkan tambahkan tugas")
+      return toast.error("Error! Silakan tambahkan tugas")
 
     if (memberValue.length <= 1)
-      return toast.error("Error! Silahkan pilih anggota lebih dari 1")
+      return toast.error("Error! Silakan pilih anggota lebih dari 1")
 
     setModal(true)
   }
diff --git a/src/module/project/ui/create_users_project.tsx b/src/module/project/ui/create_users_project.tsx
index ced2c48..bd726db 100644
--- a/src/module/project/ui/create_users_project.tsx
+++ b/src/module/project/ui/create_users_project.tsx
@@ -57,7 +57,7 @@ export default function CreateUsersProject({ grup, onClose }: { grup?: string, o
 
   function onSubmit() {
     if (selectedFiles.length == 0) {
-      return toast.error("Error! silahkan pilih anggota")
+      return toast.error("Error! Silakan pilih anggota")
     }
     member.set(selectedFiles)
     onClose(true)
diff --git a/src/module/task/ui/add_file_detail_task.tsx b/src/module/task/ui/add_file_detail_task.tsx
index f252803..dcdcb3a 100644
--- a/src/module/task/ui/add_file_detail_task.tsx
+++ b/src/module/task/ui/add_file_detail_task.tsx
@@ -171,7 +171,7 @@ export default function AddFileDetailTask() {
                   if (fileForm.length > 0) {
                      setOpenModal(true)
                   } else {
-                     toast.error("Silahkan pilih file yang akan diupload")
+                     toast.error("Silakan pilih file yang akan diupload")
                   }
                }}>
                Simpan
diff --git a/src/module/task/ui/add_member_detail_task.tsx b/src/module/task/ui/add_member_detail_task.tsx
index 8d7a859..b69575f 100644
--- a/src/module/task/ui/add_member_detail_task.tsx
+++ b/src/module/task/ui/add_member_detail_task.tsx
@@ -98,7 +98,7 @@ export default function AddMemberDetailTask() {
 
    function onVerifikasi() {
       if (selectedFiles.length == 0) {
-         return toast.error("Error! silahkan pilih anggota")
+         return toast.error("Error! Silakan pilih anggota")
       }
 
       setOpenModal(true)
diff --git a/src/module/task/ui/create_task.tsx b/src/module/task/ui/create_task.tsx
index b8cc5f4..038a905 100644
--- a/src/module/task/ui/create_task.tsx
+++ b/src/module/task/ui/create_task.tsx
@@ -105,10 +105,10 @@ export default function CreateTask() {
       return false
 
     if (dataTask.length == 0)
-      return toast.error("Error! silahkan tambahkan tugas")
+      return toast.error("Error! Silakan tambahkan tugas")
 
     if (memberValue.length <= 1)
-      return toast.error("Error! silahkan pilih anggota lebih dari 1")
+      return toast.error("Error! Silakan pilih anggota lebih dari 1")
 
     setOpenModal(true)
   }
diff --git a/src/module/task/ui/create_users_project.tsx b/src/module/task/ui/create_users_project.tsx
index 93eb957..307dcd6 100644
--- a/src/module/task/ui/create_users_project.tsx
+++ b/src/module/task/ui/create_users_project.tsx
@@ -82,7 +82,7 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
 
   function onSubmit() {
     if (selectedFiles.length == 0) {
-      return toast.error("Error! silahkan pilih anggota")
+      return toast.error("Error! Silakan pilih anggota")
     }
     member.set(selectedFiles)
     onClose(true)