diff --git a/src/pages/AssessorPage/Assessor.tsx b/src/pages/AssessorPage/Assessor.tsx
index 591501a..10e4216 100644
--- a/src/pages/AssessorPage/Assessor.tsx
+++ b/src/pages/AssessorPage/Assessor.tsx
@@ -32,7 +32,7 @@ import {
   _type,
   _units,
 } from '../../stores/pdfinfo.ts';
-import { checkConnection, createPdfElectrical, createPdfOccupancy, getApi, getApiMulti, postApi, statusPopsApi, voidPopsApi, saveNewName, saveNewPassword, securePassword } from '../../utils/functions/index.ts';
+import { checkConnection, createPdfElectrical, createPdfOccupancy, getApi, getApiMulti, postApi, statusPopsApi, voidPopsApi, saveNewName, saveNewPassword, securePassword, getDateTime } from '../../utils/functions/index.ts';
 import './Assessor.sass';
 import { FaSolidUserGear } from 'solid-icons/fa'
 
@@ -399,7 +399,7 @@ export default () => {
   }
 
   const setNewStatus = async (division: string, status: string, tag: string, tagword: string, approved: number) => {
-    const today = new Date()
+    const today = await getDateTime()
     const formattedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss')
     const statusid = parseInt(applicationId().toString(), 10)
 
@@ -449,7 +449,7 @@ export default () => {
 
   const postTransaction = async (application: string) => {
     const id = await geteSignId(employeeId())
-    const today = new Date()
+    const today = await getDateTime()
     const formatedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss')
 
     await postApi('post-esigntransaction', {
diff --git a/src/pages/MainPage/Main.tsx b/src/pages/MainPage/Main.tsx
index b4ee49e..a711881 100644
--- a/src/pages/MainPage/Main.tsx
+++ b/src/pages/MainPage/Main.tsx
@@ -6,7 +6,7 @@ import { FiLogOut } from 'solid-icons/fi'
 import { VsRefresh } from 'solid-icons/vs'
 import { createSignal, onMount, createEffect } from 'solid-js'
 import { Box, Button, Clickable, Column, Link, Logo, Modal, ModalButton, Padding, Page, Row, Input } from '../../components/'
-import { checkConnection, getApi, getApiMulti, postApi, saveNewName, saveNewPassword, securePassword } from '../../utils/functions'
+import { checkConnection, getApi, getApiMulti, getDateTime, postApi, saveNewName, saveNewPassword, securePassword } from '../../utils/functions'
 import { FaSolidUserGear } from 'solid-icons/fa'
 import { Show } from 'solid-js/web'
 import './Main.sass'
@@ -182,7 +182,8 @@ export default () => {
   }
 
   const setNewStatus = async (division: string, status: string, tag: string, tagword: string, approved: number) => {
-    const today = new Date()
+    // const today = new Date()
+    const today = await getDateTime()
     const formattedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss')
     const statusid = parseInt(applicationId().toString())
 
@@ -193,6 +194,8 @@ export default () => {
     }
   }
 
+
+
   const updateOp = async (division: string) => {
     if (division === 'electrical') {
       return await postApi('update-opapproved-electrical', { data: parseInt(applicationId().toString()) })
@@ -221,7 +224,7 @@ export default () => {
     const boList = response.result8
     const codeList = response.result9
 
-    const today = new Date()
+    const today = await getDateTime()
     const formattedDate = dayjs(today).format('YYYY-MM-DD')
     const formattedDatewithTime = dayjs(today).format('YYYY-MM-DD HH:mm:ss')
 
@@ -295,7 +298,7 @@ export default () => {
 
   const postTransaction = async () => {
     const id = await geteSignId()
-    const today = new Date()
+    const today = await getDateTime()
     const formatedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss')
 
     await postApi('post-esigntransaction', { data: parseInt(id), data2: approvedApplication(), data3: formatedDate })