Revert "Revert "align with main branch""

This reverts commit 0958bdf6f3.

src/components/TimesheetAmendment/TimesheetAmendment.tsx

@@ -313,7 +313,8 @@ const TimesheetAmendment: React.FC<Props> = ({
     ({ event }: EventClickArg) => {
       const dayJsObj = dayjs(event.startStr);
       const holiday = getHolidayForDate(event.startStr, companyHolidays);
-      const isHoliday = holiday || dayJsObj.day() === 0 || dayJsObj.day() === 6;
+      const isWeekend = !isSaturdayWorker ? dayJsObj.day() === 0 || dayJsObj.day() === 6 : dayJsObj.day() === 0;
+      const isHoliday = holiday || isWeekend;
 
       if (
         event.extendedProps.calendar === "timeEntry" &&
@@ -342,7 +343,8 @@ const TimesheetAmendment: React.FC<Props> = ({
     (e: { dateStr: string; dayEl: HTMLElement }) => {
       const dayJsObj = dayjs(e.dateStr);
       const holiday = getHolidayForDate(e.dateStr, companyHolidays);
-      const isHoliday = holiday || dayJsObj.day() === 0 || dayJsObj.day() === 6;
+      const isWeekend = !isSaturdayWorker ? dayJsObj.day() === 0 || dayJsObj.day() === 6 : dayJsObj.day() === 0;
+      const isHoliday = holiday || isWeekend;
       setSelectedDateInfo({
         dateStr: e.dateStr,
         isHoliday: Boolean(isHoliday),
@@ -359,7 +361,8 @@ const TimesheetAmendment: React.FC<Props> = ({
       }
       const dayJsObj = dayjs(date);
       const holiday = getHolidayForDate(date, companyHolidays);
-      const isHoliday = holiday || dayJsObj.day() === 0 || dayJsObj.day() === 6;
+      const isWeekend = !isSaturdayWorker ? dayJsObj.day() === 0 || dayJsObj.day() === 6 : dayJsObj.day() === 0;
+      const isHoliday = holiday || isWeekend;
 
       const intStaffId = parseInt(selectedStaff.id);
       const leaves = localTeamLeaves[intStaffId].leaveEntries[date] || [];

src/components/TimesheetAmendment/TimesheetAmendmentModal.tsx

@@ -27,6 +27,7 @@ const modalSx: SxProps = {
 interface Props extends TimesheetAmendmentProps {
   open: boolean;
   onClose: () => void;
+  isSaturdayWorker: boolean;
 }
 
 export const TimesheetAmendmentModal: React.FC<Props> = ({

src/components/UserWorkspacePage/UserWorkspacePage.tsx

@@ -200,6 +200,7 @@ const UserWorkspacePage: React.FC<Props> = ({
         leaveRecords={defaultLeaveRecords}
         isFullTime={isFullTime}
         joinDate={dayjs(joinDate)}
+        isSaturdayWorker={isSaturdayWorker}
         miscTasks={miscTasks}
       />
       <LeaveModal
@@ -212,6 +213,7 @@ const UserWorkspacePage: React.FC<Props> = ({
         timesheetRecords={defaultTimesheets}
         isFullTime={isFullTime}
         joinDate={dayjs(joinDate)}
+        isSaturdayWorker={isSaturdayWorker}
       />
       {assignedProjects.length > 0 ? (
         <AssignedProjects

src/components/UserWorkspacePage/UserWorkspaceWrapper.tsx

@@ -16,6 +16,7 @@ import {
   MAINTAIN_TIMESHEET_FAST_TIME_ENTRY,
   MAINTAIN_NORMAL_STAFF_WORKSPACE,
   MAINTAIN_MANAGEMENT_STAFF_WORKSPACE,
+  SATURDAY_WORKERS,
 } from "@/middleware";
 import { fetchAllTasks } from "@/app/api/tasks";