Merge branch 'main' into feat/408-waitlist-api

Author: tyler-dane

packages/web/src/views/Calendar/components/Sidebar/SomedayTab/MonthSection/MonthSection.tsx

@@ -27,14 +27,18 @@ export const MonthSection: FC<Props> = ({
 }) => {
   const monthLabel = getMonthListLabel(viewStart);
 
+  const currentMonth = new Date().toLocaleString("default", { month: "long" });
+
+  const isCurrentMonth = monthLabel === currentMonth;
+
   return (
     <SidebarSection>
       <SidebarHeader
         alignItems={AlignItems.CENTER}
         justifyContent={JustifyContent.SPACE_BETWEEN}
       >
         <Text role="heading" size="xl">
-          {monthLabel}
+          {isCurrentMonth ? "This Month" : monthLabel}
         </Text>
       </SidebarHeader>
 

packages/web/src/views/Calendar/components/Sidebar/SomedayTab/WeekSection/WeekSection.tsx

@@ -26,14 +26,31 @@ export const WeekSection: FC<Props> = ({
   weekLabel,
   gridRefs,
 }) => {
+  const isCurrentWeek = (label: String): boolean => {
+    const [start, end] = label.split(" - ");
+    const [month, startDay] = start.split(".").map(Number);
+    const endDay = Number(end);
+    const now = new Date();
+    const year = now.getFullYear();
+
+    const startDate = new Date(year, month - 1, startDay);
+    const endDate = new Date(year, month - 1, endDay);
+
+    now.setHours(0, 0, 0, 0);
+    startDate.setHours(0, 0, 0, 0);
+    endDate.setHours(0, 0, 0, 0);
+
+    return now >= startDate && now <= endDate;
+  };
+
   return (
     <SidebarSection>
       <SidebarHeader
         alignItems={AlignItems.CENTER}
         justifyContent={JustifyContent.SPACE_BETWEEN}
       >
         <Text role="heading" size="xl">
-          {weekLabel}
+          {isCurrentWeek(weekLabel) ? "This Week" : weekLabel}
         </Text>
       </SidebarHeader>
 

packages/web/src/views/Forms/EventForm/SaveSection/SaveSection.tsx

@@ -41,7 +41,6 @@ export const SaveSection: React.FC<Props> = ({
           role="tab"
           tabIndex={0}
           title="Save event"
-          onClick={_onSubmit}
         >
           Save
         </StyledSaveBtn>